Skip to content

Commit 5a86f9c

Browse files
committed
2.1.20
1 parent 7d50f59 commit 5a86f9c

File tree

7 files changed

+34
-32
lines changed

7 files changed

+34
-32
lines changed

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ gradlePlugin {
7171
}
7272
}
7373

74-
tasks.create("version") {
74+
tasks.register("version") {
7575
group = "publishing"
7676
val versionFileProvider = project.layout.buildDirectory.file("project-version.txt")
7777
outputs.file(versionFileProvider)
@@ -92,7 +92,7 @@ catalog.versionCatalog {
9292
mavenPublishing {
9393
configure(
9494
com.vanniktech.maven.publish.GradlePlugin(
95-
javadocJar = com.vanniktech.maven.publish.JavadocJar.Dokka("dokkaHtml"),
95+
javadocJar = com.vanniktech.maven.publish.JavadocJar.Dokka("dokkaGenerate"),
9696
sourcesJar = true,
9797
)
9898
)

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
kotlin.code.style=official
22

3-
nl.littlerobots.vcu.resolver=true
3+
nl.littlerobots.vcu.resolver=true
4+
5+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

gradle/libs.versions.toml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
[versions]
22
# @pin
3-
kotlin = "2.1.20-RC"
3+
kotlin = "2.1.20"
44
# @pin
5-
tools = "0.17.0-kotlin-2.1.20-RC"
6-
atomicfu = "0.26.1"
5+
tools = "0.17.1-kotlin-2.1.20"
6+
atomicfu = "0.27.0"
77
changelog = "2.2.1"
8-
compose = "1.7.1"
8+
compose = "1.7.3"
99
dokka = "2.0.0"
10-
jsBom = "2025.1.4"
10+
jsBom = "2025.3.17"
1111
junit = "5.10.2"
12-
kotlin-jupyter = "0.12.0-352"
12+
kotlin-jupyter = "0.12.0-388"
1313
kotlinx-benchmark = "0.4.13"
1414
kotlinx-cli = "0.3.6"
15-
kotlinx-coroutines = "1.9.0"
16-
kotlinx-datetime = "0.6.1"
17-
kotlinx-html = "0.11.0"
15+
kotlinx-coroutines = "1.10.1"
16+
kotlinx-datetime = "0.6.2"
17+
kotlinx-html = "0.12.0"
1818
kotlinx-knit = "0.5.0"
1919
kotlinx-nodejs = "0.0.7"
20-
kotlinx-serialization = "1.7.3"
21-
kotlinx-io = "0.6.0"
22-
kover = "0.8.3"
23-
ktor = "3.0.2"
24-
ksp = "2.1.0-1.0.29"
25-
logback = "1.5.12"
26-
slf4j = "2.0.16"
20+
kotlinx-serialization = "1.8.0"
21+
kotlinx-io = "0.7.0"
22+
kover = "0.9.1"
23+
ktor = "3.1.1"
24+
ksp = "2.1.10-1.0.31"
25+
logback = "1.5.18"
26+
slf4j = "2.0.17"
2727
xmlutil = "0.90.3"
2828
yamlkt = "0.13.0"
2929

3030
[plugins]
31-
maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
32-
maven-publish-base = { id = "com.vanniktech.maven.publish.base", version = "0.30.0" }
31+
maven-publish = "com.vanniktech.maven.publish:0.31.0"
32+
maven-publish-base = "com.vanniktech.maven.publish.base:0.31.0"
3333
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
3434
compose-jb = { id = "org.jetbrains.compose", version.ref = "compose" }
3535
jetbrains-changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
3636
jetbrains-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
3737
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
3838
kotlin-android-extensions = { id = "org.jetbrains.kotlin.android.extensions", version.ref = "kotlin" }
39-
kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:5.1.2"
39+
kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:5.2.0"
4040
kotlin-js = { id = "org.jetbrains.kotlin.js", version.ref = "kotlin" }
4141
kotlin-jupyter-api = { id = "org.jetbrains.kotlin.jupyter.api", version.ref = "kotlin-jupyter" }
4242
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
@@ -57,12 +57,12 @@ kscience-mpp = { id = "space.kscience.gradle.mpp", version.ref = "tools" }
5757
kscience-project = { id = "space.kscience.gradle.project", version.ref = "tools" }
5858
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
5959
ktor = { id = "io.ktor.plugin", version.ref = "ktor" }
60-
versions = "com.github.ben-manes.versions:0.51.0"
60+
versions = "com.github.ben-manes.versions:0.52.0"
6161
versions-update = "nl.littlerobots.version-catalog-update:0.8.5"
6262

6363
[libraries]
6464
atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" }
65-
freemarker = "org.freemarker:freemarker:2.3.33"
65+
freemarker = "org.freemarker:freemarker:2.3.34"
6666
kotlin-js-wrappers = { module = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom", version.ref = "jsBom" }
6767
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
6868
kotlin-sam-with-receiver-compiler-plugin-embeddable = { module = "org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable", version.ref = "kotlin" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/kotlin/space/kscience/gradle/KScienceJVMPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import space.kscience.gradle.internal.defaultKotlinJvmArgs
1616
public open class KScienceJVMPlugin : Plugin<Project> {
1717
override fun apply(project: Project): Unit = project.run {
1818

19-
logger.warn("KSCience JVM plugin is deprecated. Use MPP.")
19+
logger.warn("KScience JVM plugin is deprecated. Use MPP.")
2020
if (!plugins.hasPlugin("org.jetbrains.kotlin.jvm")) {
2121
plugins.apply("org.jetbrains.kotlin.jvm")
2222
} else {

src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public open class KScienceProjectPlugin : Plugin<Project> {
145145
val readmeExtension = KScienceReadmeExtension(this)
146146
extensions.add("readme", readmeExtension)
147147

148-
tasks.create("generateReadme") {
148+
tasks.register("generateReadme") {
149149
group = "documentation"
150150
description = "Generate a README file if stub is present"
151151

@@ -176,7 +176,7 @@ public open class KScienceProjectPlugin : Plugin<Project> {
176176
// }
177177
}
178178

179-
val generateReadme by tasks.creating {
179+
val generateReadme by tasks.registering{
180180
group = "documentation"
181181
description = "Generate a README file and a feature matrix if stub is present"
182182

@@ -246,7 +246,7 @@ public open class KScienceProjectPlugin : Plugin<Project> {
246246
dependsOn(generateReadme)
247247
}
248248

249-
tasks.create("version") {
249+
tasks.register("version") {
250250
group = "publishing"
251251
val versionFileProvider = project.layout.buildDirectory.file("project-version.txt")
252252
outputs.file(versionFileProvider)

src/main/kotlin/space/kscience/gradle/internal/publishing.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ internal fun Project.setupPublication(mavenPomConfiguration: MavenPom.() -> Unit
2626
plugins.withId("org.jetbrains.kotlin.jvm") {
2727
val kotlin = extensions.findByType<KotlinJvmProjectExtension>()!!
2828

29-
val sourcesJar by tasks.creating(Jar::class) {
29+
val sourcesJar by tasks.registering(Jar::class) {
3030
archiveClassifier.set("sources")
3131
kotlin.sourceSets.forEach {
3232
from(it.kotlin)
@@ -55,10 +55,10 @@ internal fun Project.setupPublication(mavenPomConfiguration: MavenPom.() -> Unit
5555
}
5656

5757
plugins.withId("org.jetbrains.dokka") {
58-
val dokkaJar by tasks.creating(Jar::class) {
58+
val dokkaJar by tasks.registering(Jar::class) {
5959
group = "documentation"
6060
archiveClassifier.set("javadoc")
61-
from(tasks.findByName("dokkaHtml"))
61+
from(tasks.findByName("dokkaGenerate"))
6262
}
6363
publications.withType<MavenPublication> {
6464
artifact(dokkaJar)

0 commit comments

Comments
 (0)