Merge branch 'kotlin-1.6.10' into kotlin-1.6.10-release

v0.1.3-kotlin-1.6.10 release

buildSrc/src/main/kotlin/plugin-conventions.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     implementation(kotlin("gradle-plugin", "1.6.10"))
 }
 
-version = "0.1.2-kotlin-1.6.10"
+version = "0.1.3-kotlin-1.6.10"
 
 pluginBundle {
     website = "https://github.com/huanshankeji/gradle-plugin"

kotlin-common-gradle-plugins/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     //api(project(":common-gradle-dependencies"))
+    //implementation("io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0")
 }
 
 gradlePlugin {
@@ -38,5 +39,13 @@ gradlePlugin {
             "kotlin-multiplatform-jvm-and-js-browser-default-maven-publish-conventions",
             "Kotlin Multiplatform conventions with the JVM target and the JS browser target, and with default Maven publish"
         )
+        scriptConventionsPlugin(
+            "kotlin-jvm-library-sonatype-ossrh-publish-conventions",
+            "Kotlin/JVM library conventions with Sonatype OSSRH Maven Central publish"
+        )
+        scriptConventionsPlugin(
+            "kotlin-multiplatform-jvm-and-js-browser-sonatype-ossrh-publish-conventions",
+            "Kotlin Multiplatform conventions with the JVM target and the JS browser target, and with Sonatype OSSRH Maven Central publish"
+        )
     }
 }

kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-library-sonatype-ossrh-publish-conventions.gradle.kts

@@ -0,0 +1,6 @@
+package com.huanshankeji
+
+plugins {
+    id("com.huanshankeji.kotlin-jvm-library-default-maven-publish-conventions")
+    id("com.huanshankeji.sonatype-ossrh-publish")
+}

kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-jvm-and-js-browser-default-maven-publish-conventions.gradle.kts

@@ -5,15 +5,6 @@ plugins {
     id("com.huanshankeji.default-maven-publish")
 }
 
-val javadocJar by tasks.registering(Jar::class) {
-    archiveClassifier.set("javadoc")
-}
-
-publishing {
-    publications {
-        withType<MavenPublication> {
-            artifactId = "$defaultPrefixForPublishing-$artifactId"
-            artifact(javadocJar)
-        }
-    }
+publishing.publications.withType<MavenPublication> {
+    artifactId = "$defaultPrefixForPublishing-$artifactId"
 }

kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-jvm-and-js-browser-sonatype-ossrh-publish-conventions.gradle.kts

@@ -0,0 +1,14 @@
+package com.huanshankeji
+
+plugins {
+    id("com.huanshankeji.kotlin-multiplatform-jvm-and-js-browser-default-maven-publish-conventions")
+    id("com.huanshankeji.sonatype-ossrh-publish")
+}
+
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+}
+
+publishing.publications.withType<MavenPublication> {
+    artifact(javadocJar)
+}

kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/nexus-staging.gradle.kts

@@ -0,0 +1,14 @@
+package com.huanshankeji
+
+/* TODO: this script is not working yet.
+plugins {
+    id("io.codearte.nexus-staging")
+}
+
+group = "com.huanshankeji"
+
+nexusStaging {
+    serverUrl = "https://s01.oss.sonatype.org/service/local/"
+    // TODO
+}
+*/

kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/sonatype-ossrh-publish.gradle.kts

@@ -0,0 +1,20 @@
+package com.huanshankeji
+
+plugins {
+    id("com.huanshankeji.default-maven-publish")
+    signing
+}
+
+signing {
+    sign(publishing.publications)
+}
+
+publishing.repositories.maven {
+    val releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+    val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+    url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
+    credentials {
+        username = project.property("ossrhUsername") as String
+        password = project.property("ossrhPassword") as String
+    }
+}