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

plugins v0.1.5-kotlin-1.6.10
huanshankeji · May 28, 2022 · 3f7efb5 · 3f7efb5
2 parents cf7a27b + 2d1a136
commit 3f7efb5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/buildSrc/src/main/kotlin/plugin-conventions.gradle.kts b/buildSrc/src/main/kotlin/plugin-conventions.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
     implementation(kotlin("gradle-plugin", "1.6.10"))
 }
 
-version = "0.1.4-kotlin-1.6.10"
+version = "0.1.5-kotlin-1.6.10"
 
 pluginBundle {
     website = "https://github.com/huanshankeji/gradle-plugin"

diff --git a/common-gradle-dependencies/build.gradle.kts b/common-gradle-dependencies/build.gradle.kts
@@ -4,4 +4,4 @@ plugins {
 
 // `SNAPSHOT` means it's under development until that version,
 // and `dev` means it has been under development since that version.
-version = "0.1.1-SNAPSHOT-20220527-dev-kotlin-1.6.10"
+version = "0.1.1-20220527-kotlin-1.6.10"
diff --git a/...-common-gradle-plugins/src/main/kotlin/com/huanshankeji/sonatype-ossrh-publish.gradle.kts b/...-common-gradle-plugins/src/main/kotlin/com/huanshankeji/sonatype-ossrh-publish.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 }
 
 signing {
+    isRequired = false
     sign(publishing.publications)
 }
 
@@ -14,7 +15,7 @@ publishing.repositories.maven {
     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
+        project.findProperty("ossrhUsername")?.let { username = it as String }
+        project.findProperty("ossrhPassword")?.let { password = it as String }
     }
 }