From c68a024552781bb98ed41abf4c98df37179e3b4e Mon Sep 17 00:00:00 2001 From: rnentjes Date: Mon, 17 Mar 2025 18:20:16 +0000 Subject: [PATCH] Upgrade Kotlin version and simplify Maven signing tasks. Updated Kotlin multiplatform plugin to version 2.1.10. Removed redundant Maven publication task dependencies and streamlined the signing process for better maintainability. --- build.gradle.kts | 64 ++++++++---------------------------------------- 1 file changed, 10 insertions(+), 54 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 44bb8a1..e749cdd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl plugins { - kotlin("multiplatform") version "2.0.20" + kotlin("multiplatform") version "2.1.10" `maven-publish` signing id("org.jetbrains.dokka") version "1.5.31" @@ -19,13 +19,14 @@ repositories { kotlin { js { browser { -/* testTask { + testTask { useKarma { useChromiumHeadless() } - }*/ + } } } +/* wasmJs { //moduleName = project.name browser() @@ -35,6 +36,7 @@ kotlin { pom { name = "${project.name}-wasm-js" } } } +*/ /* @OptIn(ExperimentalKotlinGradlePluginApi::class) @@ -61,7 +63,7 @@ kotlin { implementation(kotlin("test")) } } - val wasmJsMain by getting + //val wasmJsMain by getting } } @@ -166,56 +168,10 @@ publishing { } } +tasks.withType { + dependsOn(tasks.withType()) +} + signing { sign(publishing.publications) } - -tasks.named("publishJsPublicationToReleasesRepository") { - dependsOn(tasks.named("signKotlinMultiplatformPublication")) -} - -tasks.named("publishKotlinMultiplatformPublicationToMavenLocalRepository") { - dependsOn(tasks.named("signJsPublication")) - dependsOn(tasks.named("signWasmJsPublication")) -} - -tasks.named("publishKotlinMultiplatformPublicationToReleasesRepository") { - dependsOn(tasks.named("signJsPublication")) - dependsOn(tasks.named("signWasmJsPublication")) -} - -tasks.named("publishKotlinMultiplatformPublicationToSonatypeRepository") { - dependsOn(tasks.named("signJsPublication")) - dependsOn(tasks.named("signWasmJsPublication")) -} - -tasks.named("publishJsPublicationToMavenLocalRepository") { - dependsOn(tasks.named("signWasmJsPublication")) -} - -tasks.named("publishWasmJsPublicationToMavenLocalRepository") { - dependsOn(tasks.named("signJsPublication")) -} - -tasks.named("publishWasmJsPublicationToMavenLocal") { - dependsOn(tasks.named("signJsPublication")) -} - - -tasks.named("publishJsPublicationToGiteaRepository") { - dependsOn(tasks.named("signKotlinMultiplatformPublication")) - dependsOn(tasks.named("signJsPublication")) - dependsOn(tasks.named("signWasmJsPublication")) -} - -tasks.named("publishKotlinMultiplatformPublicationToGiteaRepository") { - dependsOn(tasks.named("signKotlinMultiplatformPublication")) - dependsOn(tasks.named("signJsPublication")) - dependsOn(tasks.named("signWasmJsPublication")) -} - -tasks.named("publishWasmJsPublicationToGiteaRepository") { - dependsOn(tasks.named("signKotlinMultiplatformPublication")) - dependsOn(tasks.named("signJsPublication")) - dependsOn(tasks.named("signWasmJsPublication")) -}