fix maven (#242)

* move group * add sign fix * add group to designsystem * add closeAndReleaseSonatypeStagingRepository
dhis2 · May 8, 2024 · 619f443 · 619f443
1 parent 661735f
commit 619f443
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/scripts/publish-maven.sh b/.github/workflows/scripts/publish-maven.sh
@@ -3,7 +3,7 @@ set -x
 branch=$(git rev-parse --abbrev-ref HEAD)
 
 if [ "$branch" = "main" ]; then
-  ./gradlew publishToSonatype -PremoveSnapshotSuffix
+  ./gradlew :designsystem:publishToSonatype closeAndReleaseSonatypeStagingRepository -PremoveSnapshotSuffix
 else
-  ./gradlew publishToSonatype
+  ./gradlew :designsystem:publishToSonatype
 fi
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,8 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
+group = "org.hisp.dhis.mobile"
+
 plugins {
     kotlin("multiplatform") apply false
     id("com.android.application") apply false

diff --git a/convention-plugins/src/main/kotlin/convention.publication.gradle.kts b/convention-plugins/src/main/kotlin/convention.publication.gradle.kts
@@ -62,4 +62,11 @@ signing {
     setRequired({ !version.toString().endsWith("-SNAPSHOT") })
     useInMemoryPgpKeys(signingPrivateKey, signingPassword)
     sign(publishing.publications)
-}
+}
+
+// Fix Gradle warning about signing tasks using publishing task outputs without explicit dependencies
+// https://github.com/gradle/gradle/issues/26091
+tasks.withType<AbstractPublishToMaven>().configureEach {
+    val signingTasks = tasks.withType<Sign>()
+    mustRunAfter(signingTasks)
+}
diff --git a/designsystem/build.gradle.kts b/designsystem/build.gradle.kts
@@ -1,5 +1,5 @@
-group = "org.hisp.dhis.mobile"
 version = "0.2-SNAPSHOT"
+group = "org.hisp.dhis.mobile"
 
 plugins {
     kotlin("multiplatform")