From 71f7698633a8d9591032308336a8225b5f0e65b5 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 26 Nov 2023 09:32:31 +0300 Subject: [PATCH 1/2] kotlin 1.9.21 --- gradle/libs.versions.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 754f7d5..eae9d79 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -tools = "0.15.0-kotlin-1.9.20" -kotlin = "1.9.20" +tools = "0.15.1-kotlin-1.9.21" +kotlin = "1.9.21" # https://github.com/Kotlin/kotlinx-atomicfu atomicfu = "0.22.0" # https://github.com/Kotlin/binary-compatibility-validator @@ -10,7 +10,7 @@ changelog = "2.2.0" # https://github.com/Kotlin/dokka dokka = "1.9.10" # https://github.com/Kotlin/kotlin-jupyter -kotlin-jupyter = "0.12.0-81" +kotlin-jupyter = "0.12.0-93" # https://github.com/Kotlin/kotlinx-benchmark kotlinx-benchmark = "0.4.9" # https://github.com/Kotlin/kotlinx-cli @@ -26,18 +26,18 @@ kotlinx-knit = "0.4.0" # https://github.com/Kotlin/kotlinx-nodejs kotlinx-nodejs = "0.0.7" # https://github.com/Kotlin/kotlinx.serialization -kotlinx-serialization = "1.6.0" +kotlinx-serialization = "1.6.1" # https://ktor.io/ -ktor = "2.3.5" +ktor = "2.3.6" # https://github.com/pdvrieze/xmlutil -xmlutil = "0.86.1" +xmlutil = "0.86.2" # https://github.com/Him188/yamlkt yamlkt = "0.13.0" # https://github.com/JetBrains/kotlin-wrappers -jsBom = "1.0.0-pre.624" +jsBom = "1.0.0-pre.648" junit = "5.9.3" # https://github.com/JetBrains/compose-multiplatform -compose = "1.5.3" +compose = "1.5.11" # https://mvnrepository.com/artifact/org.slf4j/slf4j-api slf4j = "2.0.9" # https://mvnrepository.com/artifact/ch.qos.logback/logback-classic From 920385e13511e2d1b75b5371c9be6b2e39287bd6 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 5 Dec 2023 15:11:22 +0300 Subject: [PATCH 2/2] Add wasm essentials --- gradle/libs.versions.toml | 11 +++++++---- .../kotlin/space/kscience/gradle/KScienceExtension.kt | 10 +--------- src/main/resources/templates/ARTIFACT-TEMPLATE.md | 2 -- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index eae9d79..3027487 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -tools = "0.15.1-kotlin-1.9.21" +tools = "0.15.2-kotlin-1.9.21" kotlin = "1.9.21" # https://github.com/Kotlin/kotlinx-atomicfu -atomicfu = "0.22.0" +atomicfu = "0.23.1" # https://github.com/Kotlin/binary-compatibility-validator binary-compatibility-validator = "0.13.2" # https://github.com/JetBrains/gradle-changelog-plugin @@ -16,7 +16,7 @@ kotlinx-benchmark = "0.4.9" # https://github.com/Kotlin/kotlinx-cli kotlinx-cli = "0.3.6" # https://github.com/Kotlin/kotlinx.coroutines -kotlinx-coroutines = "1.7.3" +kotlinx-coroutines = "1.8.0-RC" # https://github.com/Kotlin/kotlinx-datetime kotlinx-datetime = "0.4.1" # https://github.com/Kotlin/kotlinx.html @@ -26,7 +26,7 @@ kotlinx-knit = "0.4.0" # https://github.com/Kotlin/kotlinx-nodejs kotlinx-nodejs = "0.0.7" # https://github.com/Kotlin/kotlinx.serialization -kotlinx-serialization = "1.6.1" +kotlinx-serialization = "1.6.2" # https://ktor.io/ ktor = "2.3.6" # https://github.com/pdvrieze/xmlutil @@ -110,8 +110,11 @@ logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "lo changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } + compose = { id = "org.jetbrains.compose", version.ref = "compose" } +ktor = {id = "io.ktor.plugin", version.ref = "ktor"} + gradle-common = { id = "space.kscience.gradle.common", version.ref = "tools" } gradle-project = { id = "space.kscience.gradle.project", version.ref = "tools" } gradle-mpp = { id = "space.kscience.gradle.mpp", version.ref = "tools" } diff --git a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt index 8126af9..45d4c8f 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt @@ -155,14 +155,6 @@ public open class KScienceExtension(public val project: Project) { } } - project.pluginManager.withPlugin("org.jetbrains.kotlin.js") { - project.configure { - sourceSets.getByName(sourceSet ?: "main") { - dependencies(dependencyBlock) - } - } - } - project.pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") { project.configure { sourceSets.getByName(sourceSet ?: "commonMain") { @@ -537,7 +529,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro ) } } - + applyDefaultHierarchyTemplate() } } } diff --git a/src/main/resources/templates/ARTIFACT-TEMPLATE.md b/src/main/resources/templates/ARTIFACT-TEMPLATE.md index eeb5d05..5d39742 100644 --- a/src/main/resources/templates/ARTIFACT-TEMPLATE.md +++ b/src/main/resources/templates/ARTIFACT-TEMPLATE.md @@ -6,8 +6,6 @@ The Maven coordinates of this project are `${group}:${name}:${version}`. ```kotlin repositories { maven("https://repo.kotlin.link") - //uncomment to access development builds - //maven("https://maven.pkg.jetbrains.space/spc/p/sci/dev") mavenCentral() }