From 1f31e3ebb7e2e6009c2cc5b1536b70e28acf3263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?=
 <ivan.canet@gmail.com>
Date: Mon, 11 Sep 2023 23:20:06 +0200
Subject: [PATCH 1/4] ci(gitlab): Rename the repository

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30fdd71..0ad45bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,7 +131,7 @@ publish-maven:central:
     - export SIGNING_KEY_RING=$(mktemp)
     - <"$SIGNING_KEY_RING_B64" base64 -d >"$SIGNING_KEY_RING"
     - >
-      ./gradlew publishAllPublicationsToCentralRepository
+      ./gradlew publishAllPublicationsToSonatypeRepository
       -PappVersion=$project_version
 
   interruptible: false
-- 
2.51.2


From 88106ec1863e174812b988bfcf0294ad49b51522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?=
 <ivan.canet@gmail.com>
Date: Mon, 11 Sep 2023 23:51:50 +0200
Subject: [PATCH 2/4] ci(gitlab): Always configure the Sonatype repository

---
 .../library/src/main/kotlin/library.gradle.kts  | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/gradle/conventions/library/src/main/kotlin/library.gradle.kts b/gradle/conventions/library/src/main/kotlin/library.gradle.kts
index c2a0666..7a3d2bd 100644
--- a/gradle/conventions/library/src/main/kotlin/library.gradle.kts
+++ b/gradle/conventions/library/src/main/kotlin/library.gradle.kts
@@ -46,17 +46,12 @@ publishing {
 	// 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")
 			}
 		}
 	}
-- 
2.51.2


From aa51ef3054bc0d376efecc358c229138ebde9230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?=
 <ivan.canet@gmail.com>
Date: Tue, 12 Sep 2023 00:04:03 +0200
Subject: [PATCH 3/4] ci(gitlab): Publish to MavenCentral using the MacOS
 runner

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ad45bc..9beb7e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -167,7 +167,7 @@ publish-maven:ios:gitlab:
     - if: $CI_COMMIT_TAG
 
 publish-maven:ios:central:
-  extends: [ .os.gradle ]
+  extends: [ .ios ]
   needs: [ os.version, check-jvm, check-ios, check-js ]
   stage: deploy
 
-- 
2.51.2


From d3ab21780f733c9921e05769b2b0911b93bcf640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?=
 <ivan.canet@gmail.com>
Date: Wed, 13 Sep 2023 15:11:31 +0200
Subject: [PATCH 4/4] ci(gitlab): Workaround for KT-61858

See https://youtrack.jetbrains.com/issue/KT-61858
---
 .../conventions/library/src/main/kotlin/library.gradle.kts   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gradle/conventions/library/src/main/kotlin/library.gradle.kts b/gradle/conventions/library/src/main/kotlin/library.gradle.kts
index 7a3d2bd..986c93e 100644
--- a/gradle/conventions/library/src/main/kotlin/library.gradle.kts
+++ b/gradle/conventions/library/src/main/kotlin/library.gradle.kts
@@ -91,6 +91,11 @@ 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)
 	}
-- 
2.51.2