diff --git a/buildSrc/src/main/kotlin/plugin-conventions.gradle.kts b/buildSrc/src/main/kotlin/plugin-conventions.gradle.kts index 51d8218..789bb1a 100644 --- 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 index 9e2d71b..4f3e4c5 100644 --- 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/kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/sonatype-ossrh-publish.gradle.kts b/kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/sonatype-ossrh-publish.gradle.kts index 0f5151c..bbcde11 100644 --- a/kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/sonatype-ossrh-publish.gradle.kts +++ b/kotlin-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 } } }