0.11.5-kotlin-1.7.0 #44

Merged
altavir merged 9 commits from dev into master 2022-06-09 19:44:46 +03:00
4 changed files with 18 additions and 22 deletions
Showing only changes of commit e3ecfb54c9 - Show all commits

View File

@ -12,9 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### Changed
- Separate release tasks for each target - Separate release tasks for each target
- Kotlin 1.6.20 - Kotlin 1.7.0
- Context receivers enabled - Ktor 2.0.1
- Ktor 2.0
- ExplicitAPI does not override existing value - ExplicitAPI does not override existing value
### Deprecated ### Deprecated

View File

@ -1,24 +1,23 @@
[versions] [versions]
tools = "0.11.4-kotlin-1.6.20" tools = "0.11.5-kotlin-1.6.21"
kotlin = "1.6.20" kotlin = "1.6.21"
atomicfu = "0.17.1" atomicfu = "0.17.2"
binary-compatibility-validator = "0.8.0" binary-compatibility-validator = "0.9.0"
changelog = "1.3.1" changelog = "1.3.1"
dokka = "1.6.10" dokka = "1.6.21"
kotlin-jupyter = "0.11.0-71" kotlin-jupyter = "0.11.0-89-1"
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-coroutines = "1.6.1" kotlinx-coroutines = "1.6.1"
kotlinx-datetime = "0.3.2" kotlinx-datetime = "0.3.3"
kotlinx-html = "0.7.3" kotlinx-html = "0.7.5"
kotlinx-knit = "0.3.0" kotlinx-knit = "0.4.0"
kotlinx-nodejs = "0.0.7" kotlinx-nodejs = "0.0.7"
kotlinx-serialization = "1.3.2" kotlinx-serialization = "1.3.3"
ktor = "2.0.0" ktor = "2.0.1"
xmlutil = "0.84.1" xmlutil = "0.84.2"
yamlkt = "0.10.2" yamlkt = "0.11.0"
jsBom = "0.0.1-pre.313-kotlin-1.6.10" jsBom = "1.0.0-pre.337"
junit = "5.8.2" junit = "5.8.2"
[libraries] [libraries]
@ -38,8 +37,6 @@ kotlin-jupyter-gradle = { module = "org.jetbrains.kotlin:kotlin-jupyter-api-grad
kotlinx-benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlinx-benchmark" } kotlinx-benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlinx-benchmark" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx-collections-immutable" }
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
kotlinx-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "kotlinx-coroutines" }

View File

@ -5,6 +5,6 @@ import org.gradle.api.Project
public open class KScienceCommonPlugin : Plugin<Project> { public open class KScienceCommonPlugin : Plugin<Project> {
override fun apply(project: Project): Unit = project.configureKScience( override fun apply(project: Project): Unit = project.configureKScience(
KotlinVersion(1, 6, 20) KotlinVersion(1, 6, 21)
) )
} }

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", "-Xcontext-receivers") private val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all", "-Xlambdas=indy")
public fun Project.configureKScience( public fun Project.configureKScience(
kotlinVersion: KotlinVersion, kotlinVersion: KotlinVersion,