Refactor gradle configs, use same maven publication release

opensrp · Sep 18, 2024 · ffb393f · ffb393f
1 parent e1cf4c5
commit ffb393f
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 79 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -84,9 +84,10 @@ object Dependencies {
       "com.google.mlkit:object-detection-custom:${Versions.Mlkit.objectDetectionCustom}"
   }
 
-  const val androidFhirGroup = "org.smartregister"
   const val playServicesLocation =
     "com.google.android.gms:play-services-location:${Versions.playServicesLocation}"
+
+  const val androidFhirGroup = "org.smartregister"
   const val androidFhirEngineModule = "engine"
   const val androidFhirKnowledgeModule = "knowledge"
   const val androidFhirCommon = "$androidFhirGroup:common:${Versions.androidFhirCommon}"
@@ -130,7 +131,6 @@ object Dependencies {
   const val xmlUnit = "org.xmlunit:xmlunit-core:${Versions.xmlUnit}"
 
   object Versions {
-
     const val androidFhirCommon = "0.1.0-alpha05-preview3-SNAPSHOT"
     const val androidFhirEngine = "1.0.0-preview13-SNAPSHOT"
     const val androidFhirKnowledge = "0.1.0-beta01-preview-SNAPSHOT"

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
@@ -15,9 +15,11 @@
  */
 
 import org.gradle.api.Project
+import org.gradle.api.artifacts.repositories.PasswordCredentials
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.credentials
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.register
@@ -147,13 +149,11 @@ fun Project.publishArtifact(artifact: LibraryArtifact) {
                 }
               }
             }
-            // Weird quirk, build fails with this entry. Reverting to individual configuration per
-            // module
-            //            maven {
-            //              credentials(PasswordCredentials::class)
-            //              url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-            //              name = "sonatype"
-            //            }
+            maven {
+              credentials(PasswordCredentials::class)
+              url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+              name = "sonatype"
+            }
           }
         }
       }

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -7,16 +7,6 @@ plugins {
   jacoco
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.Common)
 
 createJacocoTestReportTask()

diff --git a/contrib/barcode/build.gradle.kts b/contrib/barcode/build.gradle.kts
@@ -7,16 +7,6 @@ plugins {
   jacoco
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.Contrib.Barcode)
 
 createJacocoTestReportTask()

diff --git a/contrib/locationwidget/build.gradle.kts b/contrib/locationwidget/build.gradle.kts
@@ -7,16 +7,6 @@ plugins {
   jacoco
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.Contrib.LocationWidget)
 
 createJacocoTestReportTask()

diff --git a/datacapture/build.gradle.kts b/datacapture/build.gradle.kts
@@ -9,16 +9,6 @@ plugins {
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.DataCapture)
 
 createJacocoTestReportTask()

diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts
@@ -10,16 +10,6 @@ plugins {
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.Engine)
 
 createJacocoTestReportTask()

diff --git a/knowledge/build.gradle.kts b/knowledge/build.gradle.kts
@@ -10,16 +10,6 @@ plugins {
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.Knowledge)
 
 createJacocoTestReportTask()

diff --git a/workflow/build.gradle.kts b/workflow/build.gradle.kts
@@ -9,16 +9,6 @@ plugins {
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
 
-publishing {
-  repositories {
-    maven {
-      credentials(PasswordCredentials::class)
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-      name = "sonatype"
-    }
-  }
-}
-
 publishArtifact(Releases.Workflow)
 
 createJacocoTestReportTask()