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

2.1.20

Browse Source
This commit is contained in:
Alexander Nozik
2025-03-20 19:49:11 +03:00
parent 7d50f5963c
commit 5a86f9c6ee
7 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@@ -71,7 +71,7 @@ gradlePlugin {
}
}
tasks.create("version") {
tasks.register("version") {
group = "publishing"
val versionFileProvider = project.layout.buildDirectory.file("project-version.txt")
outputs.file(versionFileProvider)
@@ -92,7 +92,7 @@ catalog.versionCatalog {
mavenPublishing {
configure(
com.vanniktech.maven.publish.GradlePlugin(
javadocJar = com.vanniktech.maven.publish.JavadocJar.Dokka("dokkaHtml"),
javadocJar = com.vanniktech.maven.publish.JavadocJar.Dokka("dokkaGenerate"),
sourcesJar = true,
)
)

4
gradle.properties
View File

@@ -1,3 +1,5 @@
kotlin.code.style=official
nl.littlerobots.vcu.resolver=true
nl.littlerobots.vcu.resolver=true
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

42
gradle/libs.versions.toml
View File

@@ -1,42 +1,42 @@
[versions]
# @pin
kotlin = "2.1.20-RC"
kotlin = "2.1.20"
# @pin
tools = "0.17.0-kotlin-2.1.20-RC"
atomicfu = "0.26.1"
tools = "0.17.1-kotlin-2.1.20"
atomicfu = "0.27.0"
changelog = "2.2.1"
compose = "1.7.1"
compose = "1.7.3"
dokka = "2.0.0"
jsBom = "2025.1.4"
jsBom = "2025.3.17"
junit = "5.10.2"
kotlin-jupyter = "0.12.0-352"
kotlin-jupyter = "0.12.0-388"
kotlinx-benchmark = "0.4.13"
kotlinx-cli = "0.3.6"
kotlinx-coroutines = "1.9.0"
kotlinx-datetime = "0.6.1"
kotlinx-html = "0.11.0"
kotlinx-coroutines = "1.10.1"
kotlinx-datetime = "0.6.2"
kotlinx-html = "0.12.0"
kotlinx-knit = "0.5.0"
kotlinx-nodejs = "0.0.7"
kotlinx-serialization = "1.7.3"
kotlinx-io = "0.6.0"
kover = "0.8.3"
ktor = "3.0.2"
ksp = "2.1.0-1.0.29"
logback = "1.5.12"
slf4j = "2.0.16"
kotlinx-serialization = "1.8.0"
kotlinx-io = "0.7.0"
kover = "0.9.1"
ktor = "3.1.1"
ksp = "2.1.10-1.0.31"
logback = "1.5.18"
slf4j = "2.0.17"
xmlutil = "0.90.3"
yamlkt = "0.13.0"
[plugins]
maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
maven-publish-base = { id = "com.vanniktech.maven.publish.base", version = "0.30.0" }
maven-publish = "com.vanniktech.maven.publish:0.31.0"
maven-publish-base = "com.vanniktech.maven.publish.base:0.31.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:5.1.2"
kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:5.2.0"
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" }
@@ -57,12 +57,12 @@ kscience-mpp = { id = "space.kscience.gradle.mpp", version.ref = "tools" }
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 = "com.github.ben-manes.versions:0.52.0"
versions-update = "nl.littlerobots.version-catalog-update:0.8.5"
[libraries]
atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" }
freemarker = "org.freemarker:freemarker:2.3.33"
freemarker = "org.freemarker:freemarker:2.3.34"
kotlin-js-wrappers = { module = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom", version.ref = "jsBom" }
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
kotlin-sam-with-receiver-compiler-plugin-embeddable = { module = "org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable", version.ref = "kotlin" }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

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

2
src/main/kotlin/space/kscience/gradle/KScienceJVMPlugin.kt
View File

@@ -16,7 +16,7 @@ import space.kscience.gradle.internal.defaultKotlinJvmArgs
public open class KScienceJVMPlugin : Plugin<Project> {
override fun apply(project: Project): Unit = project.run {
logger.warn("KSCience JVM plugin is deprecated. Use MPP.")
logger.warn("KScience JVM plugin is deprecated. Use MPP.")
if (!plugins.hasPlugin("org.jetbrains.kotlin.jvm")) {
plugins.apply("org.jetbrains.kotlin.jvm")
} else {

6
src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt
View File

@@ -145,7 +145,7 @@ public open class KScienceProjectPlugin : Plugin<Project> {
val readmeExtension = KScienceReadmeExtension(this)
extensions.add("readme", readmeExtension)
tasks.create("generateReadme") {
tasks.register("generateReadme") {
group = "documentation"
description = "Generate a README file if stub is present"
@@ -176,7 +176,7 @@ public open class KScienceProjectPlugin : Plugin<Project> {
// }
}
val generateReadme by tasks.creating {
val generateReadme by tasks.registering{
group = "documentation"
description = "Generate a README file and a feature matrix if stub is present"
@@ -246,7 +246,7 @@ public open class KScienceProjectPlugin : Plugin<Project> {
dependsOn(generateReadme)
}
tasks.create("version") {
tasks.register("version") {
group = "publishing"
val versionFileProvider = project.layout.buildDirectory.file("project-version.txt")
outputs.file(versionFileProvider)

6
src/main/kotlin/space/kscience/gradle/internal/publishing.kt
View File

@@ -26,7 +26,7 @@ internal fun Project.setupPublication(mavenPomConfiguration: MavenPom.() -> Unit
plugins.withId("org.jetbrains.kotlin.jvm") {
val kotlin = extensions.findByType<KotlinJvmProjectExtension>()!!
val sourcesJar by tasks.creating(Jar::class) {
val sourcesJar by tasks.registering(Jar::class) {
archiveClassifier.set("sources")
kotlin.sourceSets.forEach {
from(it.kotlin)
@@ -55,10 +55,10 @@ internal fun Project.setupPublication(mavenPomConfiguration: MavenPom.() -> Unit
}
plugins.withId("org.jetbrains.dokka") {
val dokkaJar by tasks.creating(Jar::class) {
val dokkaJar by tasks.registering(Jar::class) {
group = "documentation"
archiveClassifier.set("javadoc")
from(tasks.findByName("dokkaHtml"))
from(tasks.findByName("dokkaGenerate"))
}
publications.withType<MavenPublication> {
artifact(dokkaJar)