diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml index 6b2c21d527e..207a3584fa9 100644 --- a/.github/workflows/deploy-snapshot.yaml +++ b/.github/workflows/deploy-snapshot.yaml @@ -35,4 +35,4 @@ jobs: ORG_GRADLE_PROJECT_SONATYPE_USERNAME: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_USERNAME }} ORG_GRADLE_PROJECT_SONATYPE_PASSWORD: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_PASSWORD }} with: - arguments: publishAllPublicationsToSonatypeSnapshotRepository -Dsnapshot=true --stacktrace + arguments: publishAllToSonatypeSnapshot -Dsnapshot=true --stacktrace diff --git a/build-logic/src/main/kotlin/packaging.gradle.kts b/build-logic/src/main/kotlin/packaging.gradle.kts index cef85110f42..a13ec760bfd 100644 --- a/build-logic/src/main/kotlin/packaging.gradle.kts +++ b/build-logic/src/main/kotlin/packaging.gradle.kts @@ -68,7 +68,7 @@ if (signingKey.isNullOrBlank() || signingPwd.isNullOrBlank()) { logger.info("GPG Key found - Signing enabled") signing { useInMemoryPgpKeys(signingKey, signingPwd) - sign(publishing.publications[DETEKT_PUBLICATION]) + publishing.publications.forEach(::sign) } } diff --git a/detekt-gradle-plugin/build.gradle.kts b/detekt-gradle-plugin/build.gradle.kts index f00558df732..f4c1c8b8765 100644 --- a/detekt-gradle-plugin/build.gradle.kts +++ b/detekt-gradle-plugin/build.gradle.kts @@ -6,6 +6,7 @@ plugins { `java-gradle-plugin` `java-test-fixtures` idea + signing alias(libs.plugins.pluginPublishing) // We use this published version of the Detekt plugin to self analyse this project. id("io.gitlab.arturbosch.detekt") version "1.20.0" @@ -157,3 +158,23 @@ with(components["java"] as AdhocComponentWithVariants) { withVariantsFromConfiguration(configurations["testFixturesApiElements"]) { skip() } withVariantsFromConfiguration(configurations["testFixturesRuntimeElements"]) { skip() } } + +tasks.withType().configureEach { + notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/13470") +} + +val signingKey = "SIGNING_KEY".byProperty +val signingPwd = "SIGNING_PWD".byProperty +if (signingKey.isNullOrBlank() || signingPwd.isNullOrBlank()) { + logger.info("Signing disabled as the GPG key was not found") +} else { + logger.info("GPG Key found - Signing enabled") + afterEvaluate { + signing { + useInMemoryPgpKeys(signingKey, signingPwd) + publishing.publications.forEach(::sign) + } + } +} + +val String.byProperty: String? get() = findProperty(this) as? String