small improvements

.github/workflows/commit-release.yml

@@ -24,7 +24,7 @@ jobs:
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./core/build/distributions
+          publish_dir: ./core/build/dist/js/productionExecutable
           publish_branch: site
       - name: Create Release
         id: create_release

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

@@ -0,0 +1,50 @@
+package dev.inmo.kmppscriptbuilder.core.export
+
+import dev.inmo.kmppscriptbuilder.core.models.MavenConfig
+
+const val generateCentralSonatypeUploadingPartImports = """import java.nio.charset.StandardCharsets
+import java.net.http.HttpClient
+import java.net.http.HttpRequest
+import java.net.http.HttpResponse"""
+const val generateCentralSonatypeUploadingPart = """// This script work based on https://ossrh-staging-api.central.sonatype.com/swagger-ui/#/default/manual_upload_repository
+// and getting available open repos and just uploading them
+if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+    def taskName = "uploadSonatypePublication"
+    if (rootProject.tasks.names.contains(taskName) == false) {
+        rootProject.tasks.register(taskName) {
+            doLast {
+                def username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                def password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                def bearer = Base64.getEncoder().encodeToString("${"$"}username:${"$"}password".getBytes(StandardCharsets.UTF_8))
+    
+                def client = HttpClient.newHttpClient()
+                def request = HttpRequest.newBuilder()
+                        .uri(URI.create("https://ossrh-staging-api.central.sonatype.com/manual/search/repositories?state=open"))
+                        .GET()
+                        .header("Content-Type", "application/json")
+                        .header("Authorization", "Bearer ${"$"}bearer")
+                        .build()
+    
+                def response = client.send(request, HttpResponse.BodyHandlers.ofString())
+                def keys = new ArrayList<String>()
+                response.body().findAll("\"key\"[\\s]*:[\\s]*\"[^\"]+\"").forEach {
+                    def key = it.find("[^\"]+\"\$").find("[^\"]+")
+                    keys.add(key)
+                }
+                keys.forEach {
+                    println("Start uploading ${"$"}it")
+                    def uploadRequest = HttpRequest.newBuilder()
+                            .uri(URI.create("https://ossrh-staging-api.central.sonatype.com/manual/upload/repository/${"$"}it?publishing_type=user_managed"))
+                            .POST(HttpRequest.BodyPublishers.ofString(""))
+                            .header("Content-Type", "application/json")
+                            .header("Authorization", "Bearer ${"$"}bearer")
+                            .build()
+                    def uploadResponse = client.send(uploadRequest, HttpResponse.BodyHandlers.ofString())
+                    if (uploadResponse.statusCode() != 200) {
+                        throw IllegalStateException("Faced error of uploading for repo with key ${"$"}it. Response: ${"$"}uploadResponse")
+                    }
+                }
+            }
+        }
+    }
+}"""

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

@@ -8,13 +8,13 @@ fun GpgSigning.generateMavenConfig() = when (this) {
 """
 if (project.hasProperty("signing.gnupg.keyName")) {
     apply plugin: 'signing'
-    
+
     signing {
         useGpgCmd()
-    
+
         sign publishing.publications
     }
-    
+
     task signAll {
         tasks.withType(Sign).forEach {
             dependsOn(it)
@@ -26,6 +26,23 @@ if (project.hasProperty("signing.gnupg.keyName")) {
         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 ->
@@ -43,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

@@ -1,10 +1,14 @@
 package dev.inmo.kmppscriptbuilder.core.export.js_only
 
+import dev.inmo.kmppscriptbuilder.core.export.generateCentralSonatypeUploadingPart
+import dev.inmo.kmppscriptbuilder.core.export.generateCentralSonatypeUploadingPartImports
 import dev.inmo.kmppscriptbuilder.core.export.generateMavenConfig
 import dev.inmo.kmppscriptbuilder.core.models.*
 
 fun MavenConfig.buildJsOnlyMavenConfig(licenses: List<License>): String = """
+${if (includeCentralSonatypeUploadingScript) "$generateCentralSonatypeUploadingPartImports\n" else ""}
 apply plugin: 'maven-publish'
+${if (includeCentralSonatypeUploadingScript) "$generateCentralSonatypeUploadingPart\n" else ""}
 
 task javadocJar(type: Jar) {
     archiveClassifier = 'javadoc'
@@ -57,11 +61,11 @@ publishing {
                     """ }}
                 }
             }
-            repositories {
-                ${repositories.joinToString("\n                ") { it.build("                ") }}
-            }
         }
     }
+    repositories {
+        ${repositories.joinToString("\n        ") { it.build("        ") }}
+    }
 }
 ${gpgSigning.generateMavenConfig()}
 """.trimIndent()

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

@@ -1,18 +1,22 @@
 package dev.inmo.kmppscriptbuilder.core.export.jvm_only
 
+import dev.inmo.kmppscriptbuilder.core.export.generateCentralSonatypeUploadingPart
+import dev.inmo.kmppscriptbuilder.core.export.generateCentralSonatypeUploadingPartImports
 import dev.inmo.kmppscriptbuilder.core.export.generateMavenConfig
 import dev.inmo.kmppscriptbuilder.core.models.*
 
 fun MavenConfig.buildJvmOnlyMavenConfig(licenses: List<License>): String = """
+${if (includeCentralSonatypeUploadingScript) "$generateCentralSonatypeUploadingPartImports\n" else ""}
 apply plugin: 'maven-publish'
+${if (includeCentralSonatypeUploadingScript) "$generateCentralSonatypeUploadingPart\n" else ""}
 
 task javadocJar(type: Jar) {
     from javadoc
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
-    classifier = 'sources'
+    archiveClassifier = 'sources'
 }
 
 publishing {
@@ -54,11 +58,11 @@ publishing {
                     """ }}
                 }
             }
-            repositories {
-                ${repositories.joinToString("\n                ") { it.build("                ") }}
-            }
         }
     }
+    repositories {
+        ${repositories.joinToString("\n        ") { it.build("        ") }}
+    }
 }
 ${gpgSigning.generateMavenConfig()}
 """.trimIndent()

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

@@ -1,11 +1,14 @@
 package dev.inmo.kmppscriptbuilder.core.export.mpp
 
+import dev.inmo.kmppscriptbuilder.core.export.generateCentralSonatypeUploadingPart
+import dev.inmo.kmppscriptbuilder.core.export.generateCentralSonatypeUploadingPartImports
 import dev.inmo.kmppscriptbuilder.core.export.generateMavenConfig
 import dev.inmo.kmppscriptbuilder.core.models.*
 
 fun MavenConfig.buildMultiplatformMavenConfig(licenses: List<License>): String = """
+${if (includeCentralSonatypeUploadingScript) "$generateCentralSonatypeUploadingPartImports\n" else ""}
 apply plugin: 'maven-publish'
-
+${if (includeCentralSonatypeUploadingScript) "$generateCentralSonatypeUploadingPart\n" else ""}
 task javadocsJar(type: Jar) {
     archiveClassifier = 'javadoc'
 }
@@ -24,28 +27,24 @@ publishing {
                 url = "$vcsUrl"
             }
 
-            developers {
-                ${developers.joinToString("\n") { """
-                    developer {
-                        id = "${it.id}"
-                        name = "${it.name}"
-                        email = "${it.eMail}"
-                    }
-                """ }}
+            developers {${developers.joinToString("\n") { """
+                developer {
+                    id = "${it.id}"
+                    name = "${it.name}"
+                    email = "${it.eMail}"
+                }""" }}
             }
 
-            licenses {
-                ${licenses.joinToString("\n") { """
-                    license {
-                        name = "${it.title}"
-                        url = "${it.url}"
-                    }
-                """ }}
+            licenses {${licenses.joinToString("\n") { """
+                license {
+                    name = "${it.title}"
+                    url = "${it.url}"
+                }""" }}
             }
         }
-        repositories {
-            ${repositories.joinToString("\n            ") { it.build("            ") }}
-        }
+    }
+    repositories {
+        ${repositories.joinToString("\n        ") { it.build("        ") }}
     }
 }
     ${gpgSigning.generateMavenConfig()}

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

@@ -26,6 +26,7 @@ data class MavenConfig(
     val gpgSigning: GpgSigning = GpgSigning.Disabled,
     @Deprecated("Replaced with gpgSigning")
     val includeGpgSigning: Boolean = false,
+    val includeCentralSonatypeUploadingScript: Boolean = false,
 )
 
 @Serializable
@@ -61,8 +62,7 @@ return """
         credentials {
             username = project.hasProperty('${usernameProperty}') ? project.property('${usernameProperty}') : System.getenv('${usernameProperty}')
             password = project.hasProperty('${passwordProperty}') ? project.property('${passwordProperty}') : System.getenv('${passwordProperty}')
-        }
-"""
+        }"""
             }
 
             companion object {
@@ -89,8 +89,7 @@ return """
 
         authentication {
             header(HttpHeaderAuthentication)
-        }
-"""
+        }"""
             }
 
             companion object {
@@ -119,3 +118,4 @@ ${credsType.buildCredsPart()}
 }
 
 val SonatypeRepository = MavenPublishingRepository("sonatype", "https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+val CentralSonatypeRepository = MavenPublishingRepository("sonatype", "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/ui/MavenInfoView.kt

@@ -1,6 +1,7 @@
 package dev.inmo.kmppscriptbuilder.core.ui
 
 import androidx.compose.runtime.*
+import dev.inmo.kmppscriptbuilder.core.models.CentralSonatypeRepository
 import dev.inmo.kmppscriptbuilder.core.models.GpgSigning
 import dev.inmo.kmppscriptbuilder.core.models.MavenConfig
 import dev.inmo.kmppscriptbuilder.core.models.SonatypeRepository
@@ -23,22 +24,31 @@ class MavenInfoView : VerticalView("Project information") {
     internal var projectVcsUrlProperty by mutableStateOf("")
     internal var gpgSignProperty by mutableStateOf<GpgSigning>(GpgSigning.Disabled)
     internal var publishToMavenCentralProperty by mutableStateOf(false)
+    internal var publishToCentralSonatypeProperty by mutableStateOf(false)
+    internal var includeCentralSonatypeUploadingScriptProperty by mutableStateOf(false)
     internal val developersView = DevelopersView()
     internal val repositoriesView = RepositoriesView()
 
     var mavenConfig: MavenConfig
         get() = MavenConfig(
-            projectNameProperty.ifBlank { defaultProjectName },
-            projectDescriptionProperty.ifBlank { defaultProjectDescription },
-            projectUrlProperty,
-            projectVcsUrlProperty,
-            developersView.developers,
-            repositoriesView.repositories + if (publishToMavenCentralProperty) {
-                listOf(SonatypeRepository)
+            name = projectNameProperty.ifBlank { defaultProjectName },
+            description = projectDescriptionProperty.ifBlank { defaultProjectDescription },
+            url = projectUrlProperty,
+            vcsUrl = projectVcsUrlProperty,
+            developers = developersView.developers,
+            repositories = repositoriesView.repositories + if (publishToMavenCentralProperty) {
+                listOf(
+                    if (publishToCentralSonatypeProperty) {
+                        CentralSonatypeRepository
+                    } else {
+                        SonatypeRepository
+                    }
+                )
             } else {
                 emptyList()
             },
-            gpgSignProperty
+            gpgSigning = gpgSignProperty,
+            includeCentralSonatypeUploadingScript = includeCentralSonatypeUploadingScriptProperty
         )
         set(value) {
             projectNameProperty = value.name
@@ -50,9 +60,11 @@ class MavenInfoView : VerticalView("Project information") {
             } else {
                 value.gpgSigning
             }
-            publishToMavenCentralProperty = value.repositories.any { it == SonatypeRepository }
+            publishToMavenCentralProperty = value.repositories.any { it == SonatypeRepository || it == CentralSonatypeRepository }
             developersView.developers = value.developers
-            repositoriesView.repositories = value.repositories.filter { it != SonatypeRepository }
+            repositoriesView.repositories = value.repositories.filter { it != SonatypeRepository && it != CentralSonatypeRepository }
+            publishToCentralSonatypeProperty = value.repositories.any { it == CentralSonatypeRepository }
+            includeCentralSonatypeUploadingScriptProperty = value.includeCentralSonatypeUploadingScript
         }
 
     private val gpgSigningDrawer = GpgSigningOptionDrawerWithView(this)
@@ -100,6 +112,20 @@ class MavenInfoView : VerticalView("Project information") {
             publishToMavenCentralProperty,
             placeSwitchAtTheStart = true
         ) { publishToMavenCentralProperty = it }
+        if (publishToMavenCentralProperty) {
+            SwitchWithLabel(
+                "Use Central Sonatype instead of OSSRH (OSSRH has been deprecated)",
+                publishToCentralSonatypeProperty,
+                placeSwitchAtTheStart = true
+            ) { publishToCentralSonatypeProperty = it }
+            if (publishToCentralSonatypeProperty) {
+                SwitchWithLabel(
+                    "Add 'uploadSonatypePublication' root project task (required for Central Sonatype publishing)",
+                    includeCentralSonatypeUploadingScriptProperty,
+                    placeSwitchAtTheStart = true
+                ) { includeCentralSonatypeUploadingScriptProperty = it }
+            }
+        }
         developersView.build()
         repositoriesView.build()
     }

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ kt-coroutines = "1.7.3"
 jb-compose = "1.5.10"
 jb-dokka = "1.9.10"
 microutils = "0.20.11"
-kjsuikit = "0.7.2"
+kjsuikit = "0.7.3"
 
 ktor = "2.3.5"