From d2349c930846fec7a57c879cdacd931368dda965 Mon Sep 17 00:00:00 2001 From: rnentjes Date: Wed, 23 Oct 2024 13:50:36 +0200 Subject: [PATCH] version 1.0.10 --- build.gradle.kts | 124 ++++++++++++++++++++++++++++++++++++----------- readme.md | 2 +- 2 files changed, 98 insertions(+), 28 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4f7607c..652ff2f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,16 @@ +@file:OptIn(ExperimentalWasmDsl::class) + +import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl + plugins { - kotlin("multiplatform") version "1.9.22" + kotlin("multiplatform") version "2.0.21" `maven-publish` signing id("org.jetbrains.dokka") version "1.5.31" - id("com.adarshr.test-logger") version "4.0.0" } group = "nl.astraeus" -version = "1.0.8" +version = "1.0.10" repositories { mavenCentral() @@ -17,19 +20,28 @@ kotlin { jvm() js(IR) { browser { - testTask { +/* testTask { // work around, browser test is broken atm enabled = false - } + }*/ + } + } + + wasmJs { + //moduleName = project.name + browser() + + mavenPublication { + groupId = group as String + pom { name = "${project.name}-wasm-js" } } } sourceSets { - val commonMain by getting {} + val commonMain by getting val commonTest by getting { dependencies { - implementation(kotlin("test-common")) - implementation(kotlin("test-annotations-common")) + implementation(kotlin("test")) } } val jvmTest by getting { @@ -37,18 +49,11 @@ kotlin { implementation(kotlin("test-junit")) } } - val jsTest by getting { - dependencies { - implementation(kotlin("test-js")) - } - } + val jsMain by getting + val wasmJsMain by getting } } -testlogger { - showStandardStreams = true -} - extra["PUBLISH_GROUP_ID"] = group extra["PUBLISH_VERSION"] = version extra["PUBLISH_ARTIFACT_ID"] = name @@ -75,25 +80,25 @@ publishing { maven { name = "releases" // change to point to your repo, e.g. http://my.org/repo - url = uri("https://nexus.astraeus.nl/nexus/content/repositories/releases") + setUrl("https://reposilite.astraeus.nl/releases") credentials { - val nexusUsername: String by project - val nexusPassword: String by project + val reposiliteUsername: String? by project + val reposilitePassword: String? by project - username = nexusUsername - password = nexusPassword + username = reposiliteUsername + password = reposilitePassword } } maven { name = "snapshots" // change to point to your repo, e.g. http://my.org/repo - url = uri("https://nexus.astraeus.nl/nexus/content/repositories/snapshots") + setUrl("https://reposilite.astraeus.nl/snapshots") credentials { - val nexusUsername: String by project - val nexusPassword: String by project + val reposiliteUsername: String? by project + val reposilitePassword: String? by project - username = nexusUsername - password = nexusPassword + username = reposiliteUsername + password = reposilitePassword } } maven { @@ -104,6 +109,18 @@ publishing { password = ossrhPassword } } + maven { + name = "gitea" + setUrl("https://gitea.astraeus.nl/api/packages/rnentjes/maven") + + credentials() { + val giteaUsername: kotlin.String? by project + val giteaPassword: kotlin.String? by project + + username = giteaUsername + password = giteaPassword + } + } } // Configure all publications @@ -140,3 +157,56 @@ publishing { signing { sign(publishing.publications) } + +tasks.named("publishJsPublicationToMavenLocal") { + dependsOn(tasks.named("signJvmPublication")) + dependsOn(tasks.named("signKotlinMultiplatformPublication")) + dependsOn(tasks.named("signWasmJsPublication")) +} + +tasks.named("publishJvmPublicationToMavenLocal") { + dependsOn(tasks.named("signJsPublication")) + dependsOn(tasks.named("signKotlinMultiplatformPublication")) + dependsOn(tasks.named("signWasmJsPublication")) +} + +tasks.named("publishKotlinMultiplatformPublicationToMavenLocal") { + dependsOn(tasks.named("signJvmPublication")) + dependsOn(tasks.named("signJsPublication")) + dependsOn(tasks.named("signWasmJsPublication")) +} + +tasks.named("publishWasmJsPublicationToMavenLocal") { + dependsOn(tasks.named("signKotlinMultiplatformPublication")) + dependsOn(tasks.named("signJvmPublication")) + dependsOn(tasks.named("signJsPublication")) + dependsOn(tasks.named("signWasmJsPublication")) +} + +tasks.named("publishJsPublicationToGiteaRepository") { + dependsOn(tasks.named("signKotlinMultiplatformPublication")) + dependsOn(tasks.named("signJvmPublication")) + dependsOn(tasks.named("signJsPublication")) + dependsOn(tasks.named("signWasmJsPublication")) +} + +tasks.named("publishJvmPublicationToGiteaRepository") { + dependsOn(tasks.named("signKotlinMultiplatformPublication")) + dependsOn(tasks.named("signJvmPublication")) + dependsOn(tasks.named("signJsPublication")) + dependsOn(tasks.named("signWasmJsPublication")) +} + +tasks.named("publishKotlinMultiplatformPublicationToGiteaRepository") { + dependsOn(tasks.named("signKotlinMultiplatformPublication")) + dependsOn(tasks.named("signJvmPublication")) + dependsOn(tasks.named("signJsPublication")) + dependsOn(tasks.named("signWasmJsPublication")) +} + +tasks.named("publishWasmJsPublicationToGiteaRepository") { + dependsOn(tasks.named("signKotlinMultiplatformPublication")) + dependsOn(tasks.named("signJvmPublication")) + dependsOn(tasks.named("signJsPublication")) + dependsOn(tasks.named("signWasmJsPublication")) +} diff --git a/readme.md b/readme.md index 98a44f8..5aa8a97 100644 --- a/readme.md +++ b/readme.md @@ -17,7 +17,7 @@ Include in build.gradle.kts: val commonMain by getting { dependencies { - api("nl.astraeus:kotlin-css-generator:1.0.2") + api("nl.astraeus:kotlin-css-generator:1.0.9") } } ```