kscience/gradle-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

version update

Browse Source 
Ktor -> 3.0
Compose -> 1.7
This commit is contained in:
Alexander Nozik 2024-12-09 07:43:23 +03:00
parent 558fd695b9
commit b507cb0536
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gradle/libs.versions.toml
View File

@ -1,16 +1,16 @@
[versions] [versions]
# @pin # @pin
kotlin = "2.1.0-Beta1" kotlin = "2.1.0"
# @pin # @pin
tools = "0.15.6-kotlin-2.1.0-Beta1" tools = "0.15.7-kotlin-2.1.0"
atomicfu = "0.25.0" atomicfu = "0.26.1"
changelog = "2.2.1" changelog = "2.2.1"
compose = "1.6.11" compose = "1.7.1"
dokka = "1.9.20" dokka = "2.0.0-Beta"
jsBom = "1.0.0-pre.810" jsBom = "1.0.0-pre.847"
junit = "5.10.2" junit = "5.10.2"
kotlin-jupyter = "0.12.0-291" kotlin-jupyter = "0.12.0-352"
kotlinx-benchmark = "0.4.12" kotlinx-benchmark = "0.4.13"
kotlinx-cli = "0.3.6" kotlinx-cli = "0.3.6"
kotlinx-coroutines = "1.9.0" kotlinx-coroutines = "1.9.0"
kotlinx-datetime = "0.6.1" kotlinx-datetime = "0.6.1"
@ -19,21 +19,21 @@ kotlinx-knit = "0.5.0"
kotlinx-nodejs = "0.0.7" kotlinx-nodejs = "0.0.7"
kotlinx-serialization = "1.7.3" kotlinx-serialization = "1.7.3"
kover = "0.8.3" kover = "0.8.3"
ktor = "2.3.12" ktor = "3.0.2"
ksp = "2.0.20-1.0.25" ksp = "2.1.0-1.0.29"
logback = "1.5.8" logback = "1.5.12"
slf4j = "2.0.16" slf4j = "2.0.16"
xmlutil = "0.90.1" xmlutil = "0.90.3"
yamlkt = "0.13.0" yamlkt = "0.13.0"
[plugins] [plugins]
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
compose-jb = { id = "org.jetbrains.compose", version.ref = "compose" } compose-jb = { id = "org.jetbrains.compose", version.ref = "compose" }
jetbrains-changelog = "org.jetbrains.changelog:2.2.1" 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 = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-android-extensions = { id = "org.jetbrains.kotlin.android.extensions", 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-js = { id = "org.jetbrains.kotlin.js", version.ref = "kotlin" }
kotlin-jupyter-api = { id = "org.jetbrains.kotlin.jupyter.api", version.ref = "kotlin-jupyter" } kotlin-jupyter-api = { id = "org.jetbrains.kotlin.jupyter.api", version.ref = "kotlin-jupyter" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } 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" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
ktor = { id = "io.ktor.plugin", version.ref = "ktor" } ktor = { id = "io.ktor.plugin", version.ref = "ktor" }
versions = "com.github.ben-manes.versions:0.51.0" 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] [libraries]
atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" } 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-base = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka" }
dokka-gradle = { module = "org.jetbrains.dokka:dokka-gradle-plugin", 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" } 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" freemarker = "org.freemarker:freemarker:2.3.33"
gradle-changelog-plugin = { module = "org.jetbrains.intellij.plugins:gradle-changelog-plugin", version.ref = "changelog" } 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" } kotlin-assignment-compiler-plugin-embeddable = { module = "org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable", version.ref = "kotlin" }

9
src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt
View File

@ -41,15 +41,18 @@ public open class KScienceMPPlugin : Plugin<Project> {
} }
} }
@OptIn(ExperimentalKotlinGradlePluginApi::class) @OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions{ compilerOptions {
freeCompilerArgs.addAll(defaultKotlinCommonArgs) freeCompilerArgs.addAll(defaultKotlinCommonArgs)
} }
if (explicitApi == null) explicitApiWarning() if (explicitApi == null) explicitApiWarning()
//pass compose extension inside kscience extensions to make it available inside kscience block //pass compose extension inside kscience extensions to make it available inside kscience block
plugins.withId("org.jetbrains.compose"){ plugins.withId("org.jetbrains.compose") {
kscience.extensions.add("compose", (this@configure as org.gradle.api.plugins.ExtensionAware).extensions.getByName("compose")) kscience.extensions.add(
"compose",
(this@configure as org.gradle.api.plugins.ExtensionAware).extensions.getByName("compose")
)
} }
} }