fix release to sonatype central once again

hrach · May 17, 2024 · 8dbbfc4 · 8dbbfc4
1 parent 7fbee93
commit 8dbbfc4
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 22 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,11 +21,8 @@ jobs:
         run: |
           echo ${{ secrets.ENCRYPT_KEY }} | release/signing-unpack.sh
       - name: Deploy to Sonatype
-        env:
-          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
         run: |
-          ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
+          ./gradlew :publishAggregatedPublicationToCentralPortal --no-configuration-cache
       - name: Build AAB & APK
         run: |
           ./gradlew :demo:bundleRelease :demo:assembleRelease

diff --git a/bottomsheet/build.gradle.kts b/bottomsheet/build.gradle.kts
@@ -4,10 +4,13 @@ plugins {
 	id("com.android.library")
 	id("org.jetbrains.kotlin.android")
 	id("org.jetbrains.kotlinx.binary-compatibility-validator")
-	id("com.vanniktech.maven.publish.base")
+	id("com.vanniktech.maven.publish")
+	id("com.gradleup.nmcp")
 	id("org.jmailen.kotlinter")
 }
 
+version = property("VERSION_NAME") as String
+
 android {
 	namespace = "dev.hrach.navigation.bottomsheet"
 
@@ -45,6 +48,10 @@ android {
 	}
 }
 
+nmcp {
+	publishAllPublications {}
+}
+
 kotlinter {
 	reporters = arrayOf("json")
 }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,3 @@
-import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
-import com.vanniktech.maven.publish.MavenPublishBaseExtension
-import com.vanniktech.maven.publish.SonatypeHost
 import java.util.Properties
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
@@ -11,7 +8,8 @@ plugins {
 	id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.14.0" apply false
 	id("org.jmailen.kotlinter") version "4.3.0" apply false
 	id("com.android.application") version "8.3.0" apply false
-	id("com.vanniktech.maven.publish.base") version "0.27.0" apply false
+	id("com.vanniktech.maven.publish") version "0.27.0" apply false
+	id("com.gradleup.nmcp") version "0.0.7"
 }
 
 subprojects {
@@ -36,16 +34,21 @@ subprojects {
 			}
 		}
 	}
+}
+
+nmcp {
+	publishAggregation {
+		project(":bottomsheet")
+		project(":modalsheet")
 
-	plugins.withId("com.vanniktech.maven.publish.base") {
-		@Suppress("UnstableApiUsage")
-		configure<MavenPublishBaseExtension> {
-			group = requireNotNull(project.findProperty("GROUP"))
-			version = requireNotNull(project.findProperty("VERSION_NAME"))
-			pomFromGradleProperties()
-			publishToMavenCentral(SonatypeHost.S01, true)
-			signAllPublications()
-			configure(AndroidSingleVariantLibrary())
+		val signingPropsFile = rootProject.file("release/signing.properties")
+		val localProperties = Properties()
+		with(signingPropsFile.inputStream()) {
+			localProperties.load(this)
 		}
+
+		username = localProperties.getProperty("centralSonatypeUsername")
+		password = localProperties.getProperty("centralSonatypePassword")
+		publicationType = "AUTOMATIC"
 	}
 }
diff --git a/gradle.properties b/gradle.properties
@@ -18,3 +18,5 @@ POM_LICENCE_DIST=repo
 
 POM_DEVELOPER_ID=hrach
 POM_DEVELOPER_NAME=Jan Skrasek
+
+RELEASE_SIGNING_ENABLED=true
diff --git a/modalsheet/build.gradle.kts b/modalsheet/build.gradle.kts
@@ -4,10 +4,13 @@ plugins {
 	id("com.android.library")
 	id("org.jetbrains.kotlin.android")
 	id("org.jetbrains.kotlinx.binary-compatibility-validator")
-	id("com.vanniktech.maven.publish.base")
+	id("com.vanniktech.maven.publish")
+	id("com.gradleup.nmcp")
 	id("org.jmailen.kotlinter")
 }
 
+version = property("VERSION_NAME") as String
+
 android {
 	namespace = "dev.hrach.navigation.modalsheet"
 
@@ -45,6 +48,10 @@ android {
 	}
 }
 
+nmcp {
+	publishAllPublications {}
+}
+
 kotlinter {
 	reporters = arrayOf("json")
 }

diff --git a/release/secring.gpg.aes b/release/secring.gpg.aes
diff --git a/release/signing.properties.aes b/release/signing.properties.aes
@@ -1,3 +1 @@
-Salted__a��$��7���+����T��o�/b
-��[��y��W�?Uե���M��.�':)�"���D�RU�����3���Gm�7�1�L|�@F�/�L��o�D�\�x뒬�DЗ=�u�<Q
-�8�P�����Sn-������(H�2L�6�!a����l�ȫ�HiB^Uf�����7�ȭ���n�Zh��H�!�(LT��^�!�a;ӱ��"}5����u�Ĕ���6��2����x��A���e�U!
+Salted__F���|���}��F�"y[��m�j	{�d�K?0g�.`���M4.yB������N��Z��~j�*h�;,�C��'ˠ�.�pher��-j�z�X�P�8�#�Z�o��&椻�MdZ��k����"����.$>�����4!c�8��8�Ą���͢o籸�sI!��|�����;�����X���6sf7C(АrBO��7]@�0F	t�e �-��bO��ĭUگ���{
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,5 @@ POM_LICENCE_DIST=repo

		POM_DEVELOPER_ID=hrach
		POM_DEVELOPER_NAME=Jan Skrasek

		RELEASE_SIGNING_ENABLED=true