From 8a864f97a30247d2dd5418e291cde543635248af Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 7 Jul 2023 21:44:38 +0300 Subject: [PATCH] 1.9.0 --- CHANGELOG.md | 1 + gradle/libs.versions.toml | 6 +++--- .../space/kscience/gradle/KScienceExtension.kt | 9 +++++---- .../space/kscience/gradle/KScienceProjectPlugin.kt | 1 - src/main/resources/templates/ARTIFACT-TEMPLATE.md | 13 ++----------- 5 files changed, 11 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b41fce7..a46c808 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Deprecated ### Removed +- Groovy gradle dependency notation. ### Fixed diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ce4862f..7274cfe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -tools = "0.14.9-kotlin-1.9.0-RC-dev-1" -kotlin = "1.9.0-RC" +tools = "0.14.9-kotlin-1.9.0" +kotlin = "1.9.0" atomicfu = "0.20.2" binary-compatibility-validator = "0.13.1" changelog = "2.0.0" @@ -8,7 +8,7 @@ dokka = "1.8.10" kotlin-jupyter = "0.11.0-360" kotlinx-benchmark = "0.4.7" kotlinx-cli = "0.3.5" -kotlinx-coroutines = "1.7.1" +kotlinx-coroutines = "1.7.2" kotlinx-datetime = "0.4.0" kotlinx-html = "0.8.0" kotlinx-knit = "0.4.0" diff --git a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt index 0762650..6e6f2df 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt @@ -1,5 +1,6 @@ package space.kscience.gradle +import org.gradle.api.Action import org.gradle.api.Project import org.gradle.api.file.DuplicatesStrategy import org.gradle.api.plugins.ApplicationPlugin @@ -434,13 +435,13 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro project.configure { wasm { browser { - testTask { + testTask(Action { useKarma { this.webpackConfig.experiments.add("topLevelAwait") useChromeHeadlessWasmGc() useConfigDirectory(project.projectDir.resolve("karma.config.d").resolve("wasm")) } - } + }) } block() } @@ -473,9 +474,9 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro js { binaries.executable() browser { - webpackTask { + webpackTask(Action { mainOutputFileName.set(bundleName) - } + }) browserConfig() } jsConfig() diff --git a/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt index 4e1dda3..fded38d 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt @@ -142,7 +142,6 @@ public open class KScienceProjectPlugin : Plugin { val readmeExtension = KScienceReadmeExtension(this) extensions.add("readme", readmeExtension) - @Suppress("UNUSED_VARIABLE") val generateReadme by tasks.creating { group = "documentation" description = "Generate a README file if stub is present" diff --git a/src/main/resources/templates/ARTIFACT-TEMPLATE.md b/src/main/resources/templates/ARTIFACT-TEMPLATE.md index 4f04b4d..eeb5d05 100644 --- a/src/main/resources/templates/ARTIFACT-TEMPLATE.md +++ b/src/main/resources/templates/ARTIFACT-TEMPLATE.md @@ -2,21 +2,12 @@ The Maven coordinates of this project are `${group}:${name}:${version}`. -**Gradle Groovy:** -```groovy -repositories { - maven { url 'https://repo.kotlin.link' } - mavenCentral() -} - -dependencies { - implementation '${group}:${name}:${version}' -} -``` **Gradle Kotlin DSL:** ```kotlin repositories { maven("https://repo.kotlin.link") + //uncomment to access development builds + //maven("https://maven.pkg.jetbrains.space/spc/p/sci/dev") mavenCentral() }