Finish update to Kotlin 2.3.0 and update dependencies

This commit is contained in:
2025-12-17 08:07:02 +03:00
parent 02d4c71978
commit 8fe715f5ec
5 changed files with 28 additions and 19 deletions

View File

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Maturity moved to kscience extension.
- Readme extension now requires kscience extension.
- Project plugin overhaul (not only publish)
- ABI validation is configurable from the root project
### Deprecated
@@ -21,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Context parameter flag
- Deploy problem with opensavvy-resources
### Security

View File

@@ -1,17 +1,17 @@
[versions]
# @pin
kotlin = "2.3.0-Beta1"
kotlin = "2.3.0"
# @pin
tools = "0.20.0-kotlin-2.3.0-Beta1"
tools = "0.20.2-kotlin-2.3.0"
atomicfu = "0.29.0"
changelog = "2.4.0"
compose = "1.9.0"
dokka = "2.0.0"
jsBom = "2025.10.3"
changelog = "2.5.0"
compose = "1.9.3"
dokka = "2.1.0"
jsBom = "2025.12.6"
junit = "5.10.2"
# @pin
kotlin-jupyter = "0.15.0-634"
kotlinx-benchmark = "0.4.14"
kotlinx-benchmark = "0.4.15"
kotlinx-cli = "0.3.6"
kotlinx-coroutines = "1.10.2"
kotlinx-datetime = "0.7.1"
@@ -19,26 +19,26 @@ kotlinx-html = "0.12.0"
kotlinx-knit = "0.5.0"
kotlinx-nodejs = "0.0.7"
kotlinx-serialization = "1.9.0"
kotlinx-io = "0.8.0"
kover = "0.9.2"
ktor = "3.3.0"
ksp = "2.2.20-2.0.4"
logback = "1.5.19"
kotlinx-io = "0.8.2"
kover = "0.9.4"
ktor = "3.3.3"
ksp = "2.3.4"
logback = "1.5.22"
slf4j = "2.0.17"
xmlutil = "0.91.2"
xmlutil = "0.91.3"
yamlkt = "0.13.0"
opensavvy-resources = "0.5.1"
opensavvy-resources = "0.6.0"
[plugins]
maven-publish = "com.vanniktech.maven.publish:0.34.0"
maven-publish-base = "com.vanniktech.maven.publish.base:0.34.0"
maven-publish = "com.vanniktech.maven.publish:0.35.0"
maven-publish-base = "com.vanniktech.maven.publish.base:0.35.0"
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
compose-jb = { id = "org.jetbrains.compose", version.ref = "compose" }
jetbrains-changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
jetbrains-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-android-extensions = { id = "org.jetbrains.kotlin.android.extensions", version.ref = "kotlin" }
kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:6.4.0"
kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:6.5.1"
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-js = { id = "org.jetbrains.kotlin.js", version.ref = "kotlin" }

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@@ -9,6 +9,6 @@ pluginManagement {
}
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version("0.9.0")
id("org.gradle.toolchains.foojay-resolver-convention") version("1.0.0")
}

View File

@@ -101,6 +101,13 @@ public abstract class KScienceProjectExtension @Inject constructor(override val
extensions.findByType<AbiValidationVariantSpec>()?.apply(block)
}
}
//
// @Suppress("UNCHECKED_CAST")
// public fun kotlinCompilerOptions(block: KotlinCommonCompilerOptions.() -> Unit): Unit = project.allprojects {
// (project.extensions.getByName("kotlin") as? HasConfigurableKotlinCompilerOptions<KotlinCommonCompilerOptions>)?.compilerOptions(
// block
// )
// }
}