From 558fd695b975823e6ad5670c585e58f42b8e4e49 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 22 Sep 2024 17:52:08 +0300 Subject: [PATCH 1/2] beta/2.1.0 --- gradle/libs.versions.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 16cdbd7..b8fa514 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,27 +1,27 @@ [versions] # @pin -kotlin = "2.0.20" +kotlin = "2.1.0-Beta1" # @pin -tools = "0.15.6-kotlin-2.0.20" +tools = "0.15.6-kotlin-2.1.0-Beta1" atomicfu = "0.25.0" changelog = "2.2.1" compose = "1.6.11" dokka = "1.9.20" -jsBom = "1.0.0-pre.798" +jsBom = "1.0.0-pre.810" junit = "5.10.2" -kotlin-jupyter = "0.12.0-275" +kotlin-jupyter = "0.12.0-291" kotlinx-benchmark = "0.4.12" kotlinx-cli = "0.3.6" -kotlinx-coroutines = "1.8.1" +kotlinx-coroutines = "1.9.0" kotlinx-datetime = "0.6.1" kotlinx-html = "0.11.0" kotlinx-knit = "0.5.0" kotlinx-nodejs = "0.0.7" -kotlinx-serialization = "1.7.1" +kotlinx-serialization = "1.7.3" kover = "0.8.3" ktor = "2.3.12" -ksp = "2.0.20-1.0.24" -logback = "1.5.7" +ksp = "2.0.20-1.0.25" +logback = "1.5.8" slf4j = "2.0.16" xmlutil = "0.90.1" yamlkt = "0.13.0" @@ -33,7 +33,7 @@ jetbrains-changelog = "org.jetbrains.changelog:2.2.1" jetbrains-dokka = "org.jetbrains.dokka:1.9.20" 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:5.1.0" +kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:5.1.1" kotlin-js = { id = "org.jetbrains.kotlin.js", version.ref = "kotlin" } kotlin-jupyter-api = { id = "org.jetbrains.kotlin.jupyter.api", version.ref = "kotlin-jupyter" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } From b507cb05363d5f3b9bec4d6470a8788863a04997 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Mon, 9 Dec 2024 07:43:23 +0300 Subject: [PATCH 2/2] version update Ktor -> 3.0 Compose -> 1.7 --- gradle/libs.versions.toml | 32 +++++++++---------- .../space/kscience/gradle/KScienceMPPlugin.kt | 9 ++++-- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b8fa514..459f01d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,16 +1,16 @@ [versions] # @pin -kotlin = "2.1.0-Beta1" +kotlin = "2.1.0" # @pin -tools = "0.15.6-kotlin-2.1.0-Beta1" -atomicfu = "0.25.0" +tools = "0.15.7-kotlin-2.1.0" +atomicfu = "0.26.1" changelog = "2.2.1" -compose = "1.6.11" -dokka = "1.9.20" -jsBom = "1.0.0-pre.810" +compose = "1.7.1" +dokka = "2.0.0-Beta" +jsBom = "1.0.0-pre.847" junit = "5.10.2" -kotlin-jupyter = "0.12.0-291" -kotlinx-benchmark = "0.4.12" +kotlin-jupyter = "0.12.0-352" +kotlinx-benchmark = "0.4.13" kotlinx-cli = "0.3.6" kotlinx-coroutines = "1.9.0" kotlinx-datetime = "0.6.1" @@ -19,21 +19,21 @@ kotlinx-knit = "0.5.0" kotlinx-nodejs = "0.0.7" kotlinx-serialization = "1.7.3" kover = "0.8.3" -ktor = "2.3.12" -ksp = "2.0.20-1.0.25" -logback = "1.5.8" +ktor = "3.0.2" +ksp = "2.1.0-1.0.29" +logback = "1.5.12" slf4j = "2.0.16" -xmlutil = "0.90.1" +xmlutil = "0.90.3" yamlkt = "0.13.0" [plugins] compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } compose-jb = { id = "org.jetbrains.compose", version.ref = "compose" } jetbrains-changelog = "org.jetbrains.changelog:2.2.1" -jetbrains-dokka = "org.jetbrains.dokka:1.9.20" +jetbrains-dokka = { module = "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:5.1.1" +kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:5.1.2" kotlin-js = { id = "org.jetbrains.kotlin.js", version.ref = "kotlin" } kotlin-jupyter-api = { id = "org.jetbrains.kotlin.jupyter.api", version.ref = "kotlin-jupyter" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } @@ -55,7 +55,7 @@ kscience-project = { id = "space.kscience.gradle.project", version.ref = "tools" ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } ktor = { id = "io.ktor.plugin", version.ref = "ktor" } versions = "com.github.ben-manes.versions:0.51.0" -versions-update = "nl.littlerobots.version-catalog-update:0.8.4" +versions-update = "nl.littlerobots.version-catalog-update:0.8.5" [libraries] atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" } @@ -65,7 +65,7 @@ changelog-gradle = { module = "org.jetbrains.intellij.plugins:gradle-changelog-p dokka-base = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka" } dokka-gradle = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" } dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" } -foojay-resolver = "org.gradle.toolchains:foojay-resolver:0.8.0" +foojay-resolver = "org.gradle.toolchains:foojay-resolver:0.9.0" freemarker = "org.freemarker:freemarker:2.3.33" gradle-changelog-plugin = { module = "org.jetbrains.intellij.plugins:gradle-changelog-plugin", version.ref = "changelog" } kotlin-assignment-compiler-plugin-embeddable = { module = "org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable", version.ref = "kotlin" } diff --git a/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt index 03cc281..8741a82 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt @@ -41,15 +41,18 @@ public open class KScienceMPPlugin : Plugin { } } @OptIn(ExperimentalKotlinGradlePluginApi::class) - compilerOptions{ + compilerOptions { freeCompilerArgs.addAll(defaultKotlinCommonArgs) } if (explicitApi == null) explicitApiWarning() //pass compose extension inside kscience extensions to make it available inside kscience block - plugins.withId("org.jetbrains.compose"){ - kscience.extensions.add("compose", (this@configure as org.gradle.api.plugins.ExtensionAware).extensions.getByName("compose")) + plugins.withId("org.jetbrains.compose") { + kscience.extensions.add( + "compose", + (this@configure as org.gradle.api.plugins.ExtensionAware).extensions.getByName("compose") + ) } }