This commit is contained in:
Alexander Nozik 2022-04-10 10:48:02 +03:00
parent 96dff3f3ee
commit 027a00a486
No known key found for this signature in database
GPG Key ID: F7FCF2DD25C71357
3 changed files with 15 additions and 7 deletions

View File

@ -7,9 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
### Added ### Added
- Coroutine tests as default dependency for tests
- Context receiver flag
### Changed ### Changed
- Separate release tasks for each target - Separate release tasks for each target
- Kotlin 1.6.20
- Context receivers enabled
- Ktor 2.0
### Deprecated ### Deprecated

View File

@ -1,22 +1,22 @@
[versions] [versions]
tools = "0.11.2-kotlin-1.6.10" tools = "0.11.3-kotlin-1.6.20"
kotlin = "1.6.10" kotlin = "1.6.20"
atomicfu = "0.17.1" atomicfu = "0.17.1"
binary-compatibility-validator = "0.8.0" binary-compatibility-validator = "0.8.0"
changelog = "1.3.1" changelog = "1.3.1"
dokka = "1.6.10" dokka = "1.6.10"
kotlin-jupyter = "0.11.0-62" kotlin-jupyter = "0.11.0-71"
kotlinx-benchmark = "0.4.2" kotlinx-benchmark = "0.4.2"
kotlinx-cli = "0.3.4" kotlinx-cli = "0.3.4"
kotlinx-collections-immutable = "0.3.5" kotlinx-collections-immutable = "0.3.5"
kotlinx-coroutines = "1.6.0" kotlinx-coroutines = "1.6.1"
kotlinx-datetime = "0.3.2" kotlinx-datetime = "0.3.2"
kotlinx-html = "0.7.3" kotlinx-html = "0.7.3"
kotlinx-knit = "0.3.0" kotlinx-knit = "0.3.0"
kotlinx-nodejs = "0.0.7" kotlinx-nodejs = "0.0.7"
kotlinx-serialization = "1.3.2" kotlinx-serialization = "1.3.2"
ktor = "1.6.7" ktor = "2.0.0"
xmlutil = "0.84.0" xmlutil = "0.84.1"
yamlkt = "0.10.2" yamlkt = "0.10.2"
jsBom = "0.0.1-pre.313-kotlin-1.6.10" jsBom = "0.0.1-pre.313-kotlin-1.6.10"
junit = "5.8.2" junit = "5.8.2"

View File

@ -15,7 +15,7 @@ import ru.mipt.npm.gradle.internal.applySettings
import ru.mipt.npm.gradle.internal.fromJsDependencies import ru.mipt.npm.gradle.internal.fromJsDependencies
private val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all", "-Xlambdas=indy") private val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all", "-Xlambdas=indy", "-Xcontext-receivers")
public fun Project.configureKScience( public fun Project.configureKScience(
kotlinVersion: KotlinVersion kotlinVersion: KotlinVersion
@ -38,6 +38,7 @@ public fun Project.configureKScience(
dependencies { dependencies {
implementation(kotlin("test-junit5")) implementation(kotlin("test-junit5"))
implementation("org.junit.jupiter:junit-jupiter:${KScienceVersions.junit}") implementation("org.junit.jupiter:junit-jupiter:${KScienceVersions.junit}")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${KScienceVersions.coroutinesVersion}")
} }
} }
} }
@ -83,6 +84,7 @@ public fun Project.configureKScience(
sourceSets["test"].apply { sourceSets["test"].apply {
dependencies { dependencies {
implementation(kotlin("test-js")) implementation(kotlin("test-js"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${KScienceVersions.coroutinesVersion}")
} }
} }
} }
@ -124,6 +126,7 @@ public fun Project.configureKScience(
dependencies { dependencies {
implementation(kotlin("test-common")) implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common")) implementation(kotlin("test-annotations-common"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${KScienceVersions.coroutinesVersion}")
} }
} }
val jvmMain by getting val jvmMain by getting