diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -131,7 +131,7 @@ - export SIGNING_KEY_RING=$(mktemp) - <"$SIGNING_KEY_RING_B64" base64 -d >"$SIGNING_KEY_RING" - > - ./gradlew publishAllPublicationsToCentralRepository + ./gradlew publishAllPublicationsToSonatypeRepository -PappVersion=$project_version interruptible: false @@ -167,7 +167,7 @@ - if: $CI_COMMIT_TAG publish-maven:ios:central: - extends: [ .os.gradle ] + extends: [ .ios ] needs: [ os.version, check-jvm, check-ios, check-js ] stage: deploy diff --git a/gradle/conventions/library/src/main/kotlin/library.gradle.kts b/gradle/conventions/library/src/main/kotlin/library.gradle.kts --- a/gradle/conventions/library/src/main/kotlin/library.gradle.kts +++ b/gradle/conventions/library/src/main/kotlin/library.gradle.kts @@ -46,17 +46,12 @@ // endregion // region Maven Central repositories { - val centralUsername = System.getenv("OSSRH_USERNAME") - val centralPassword = System.getenv("OSSRH_PASSWORD") - - if (centralUsername != null && centralPassword != null) { - maven { - name = "Sonatype" - url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") - credentials { - username = centralUsername - password = centralPassword - } + maven { + name = "Sonatype" + url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") + credentials { + username = System.getenv("OSSRH_USERNAME") + password = System.getenv("OSSRH_PASSWORD") } } } @@ -95,6 +90,11 @@ ext["signing.keyId"] = System.getenv("SIGNING_KEY_ID") ?: return@run ext["signing.password"] = System.getenv("SIGNING_PASSWORD") ?: return@run ext["signing.secretKeyRingFile"] = System.getenv("SIGNING_KEY_RING") ?: return@run + + val signingTasks = tasks.withType(Sign::class) + tasks.withType(AbstractPublishToMaven::class).configureEach { + dependsOn(signingTasks) + } signing { sign(publishing.publications)