fix of sign script generation

.github/workflows/build.yml

@@ -1,17 +0,0 @@
-on: [push]
-
-name: Build
-
-jobs:
-  build-ubuntu:
-    name: Commit release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Setup JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Build
-        run: ./gradlew build packageUberJarForCurrentOS

.github/workflows/commit-release.yml

@@ -24,7 +24,7 @@ jobs:
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./web/build/distributions
+          publish_dir: ./core/build/dist/js/productionExecutable
           publish_branch: site
       - name: Create Release
         id: create_release
@@ -44,6 +44,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: "core/build/compose/jars/*.jar"
+          asset_path: "./core/build/compose/jars/kmppscriptbuilder.core-linux-x64-${{ env.version }}${{ env.additional_version }}.jar"
           asset_name: KotlinPublicationScriptsBuilder-linux-x64.jar
           asset_content_type: application/java-archive

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/export/GpgSignMavenConfig.kt

@@ -20,6 +20,29 @@ if (project.hasProperty("signing.gnupg.keyName")) {
             dependsOn(it)
         }
     }
+
+    // Workaround to make android sign operations depend on signing tasks
+    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
+        def signingTasks = project.getTasks().withType(Sign.class)
+        mustRunAfter(signingTasks)
+    }
+    // Workaround to make test tasks use sign
+    project.getTasks().withType(Sign.class).configureEach { signTask ->
+        def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
+        def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
+        // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
+
+        // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def debugTestTask = tasks.findByName("linkDebugTest${'$'}pubName")
+        if (debugTestTask != null) {
+            signTask.mustRunAfter(debugTestTask)
+        }
+        // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def testTask = tasks.findByName("compileTestKotlin${'$'}pubName")
+        if (testTask != null) {
+            signTask.mustRunAfter(testTask)
+        }
+    }
 }
 """
     GpgSigning.Enabled ->
@@ -37,5 +60,28 @@ task signAll {
         dependsOn(it)
     }
 }
+
+// Workaround to make android sign operations depend on signing tasks
+project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
+    def signingTasks = project.getTasks().withType(Sign.class)
+    mustRunAfter(signingTasks)
+}
+// Workaround to make test tasks use sign
+project.getTasks().withType(Sign.class).configureEach { signTask ->
+    def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
+    def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
+    // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
+
+    // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+    def debugTestTask = tasks.findByName("linkDebugTest${'$'}pubName")
+    if (debugTestTask != null) {
+        signTask.mustRunAfter(debugTestTask)
+    }
+    // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+    def testTask = tasks.findByName("compileTestKotlin${'$'}pubName")
+    if (testTask != null) {
+        signTask.mustRunAfter(testTask)
+    }
+}
 """
 }

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/export/js_only/MavenTemplater.kt

@@ -7,13 +7,13 @@ fun MavenConfig.buildJsOnlyMavenConfig(licenses: List<License>): String = """
 apply plugin: 'maven-publish'
 
 task javadocJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 task sourcesJar(type: Jar) {
     kotlin.sourceSets.all {
         from(kotlin)
     }
-    classifier = 'sources'
+    archiveClassifier = 'sources'
 }
 
 publishing {

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/export/jvm_only/MavenTemplater.kt

@@ -8,11 +8,11 @@ apply plugin: 'maven-publish'
 
 task javadocJar(type: Jar) {
     from javadoc
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
-    classifier = 'sources'
+    archiveClassifier = 'sources'
 }
 
 publishing {

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/export/mpp/MavenTemplater.kt

@@ -7,7 +7,7 @@ fun MavenConfig.buildMultiplatformMavenConfig(licenses: List<License>): String =
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 
 publishing {

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/models/MavenConfig.kt

@@ -86,6 +86,10 @@ return """
             name = "$headerName"
             value = project.hasProperty('${headerValueProperty}') ? project.property('${headerValueProperty}') : System.getenv('${headerValueProperty}')
         }
+
+        authentication {
+            header(HttpHeaderAuthentication)
+        }
 """
             }
 

gradle.properties

@@ -4,18 +4,6 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true
 
-kotlin_version=1.7.20
-kotlin_coroutines_version=1.6.4
-kotlin_serialisation_core_version=1.4.1
-ktor_version=2.1.3
-micro_utils_version=0.14.2
-
-compose_version=1.2.1
-
-# Dokka
-
-dokka_version=1.7.20
-
 # Project data
 
 group=dev.inmo

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
 
-kt = "1.7.20"
+kt = "1.9.20"
-kt-serialization = "1.4.1"
+kt-serialization = "1.6.0"
-kt-coroutines = "1.6.4"
+kt-coroutines = "1.7.3"
 
-jb-compose = "1.2.1"
+jb-compose = "1.5.10"
-jb-dokka = "1.7.20"
+jb-dokka = "1.9.10"
-microutils = "0.14.2"
+microutils = "0.20.11"
-kjsuikit = "0.4.1"
+kjsuikit = "0.7.3"
 
-ktor = "2.1.3"
+ktor = "2.3.5"
 
 gh-release = "2.4.1"
 

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

mppJsProject.gradle

@@ -13,7 +13,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib')
-                api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_core_version"
+                api libs.kt.serialization
             }
         }
         commonTest {

mppProjectWithSerialization.gradle

@@ -1,4 +1,4 @@
-project.version = "$version" + System.getenv("additional_version")
+project.version = "$version" + (System.getenv("additional_version") == null ? "" : System.getenv("additional_version"))
 project.group = "$group"
 
 // apply from: "$publishGradlePath"
@@ -14,7 +14,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib')
-                api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_core_version"
+                api libs.kt.serialization
             }
         }
         commonTest {