Merge pull request #13307 from woocommerce/unify_gradle_repositories

Unify Gradle repositories
woocommerce · Jan 14, 2025 · 888b2e9 · 888b2e9
2 parents 3222339 + 107d6ff
commit 888b2e9
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 98 deletions.
diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle
@@ -10,27 +10,6 @@ plugins {
     alias(libs.plugins.sentry)
 }
 
-repositories {
-    maven {
-        url 'https://a8c-libs.s3.amazonaws.com/android'
-        content {
-            includeGroup "org.wordpress"
-            includeGroup "org.wordpress.fluxc"
-            includeGroup "org.wordpress.fluxc.plugins"
-            includeGroup "org.wordpress.wellsql"
-            includeGroup "com.automattic"
-            includeGroup "com.automattic.tracks"
-        }
-    }
-    mavenCentral()
-    maven {
-        url "https://a8c-libs.s3.amazonaws.com/android/jcenter-mirror"
-        content {
-            includeVersion "com.android.volley", "volley", "1.1.1"
-        }
-    }
-}
-
 sentry {
     includeSourceContext = true
     autoUploadSourceContext = true

diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle
@@ -58,50 +58,6 @@ sentry {
     ]
 }
 
-repositories {
-    maven {
-        url 'https://a8c-libs.s3.amazonaws.com/android'
-        content {
-            includeGroup "org.wordpress"
-            includeGroup "org.wordpress.fluxc"
-            includeGroup "org.wordpress.fluxc.plugins"
-            includeGroup "org.wordpress.wellsql"
-            includeGroup "org.wordpress.mediapicker"
-            includeGroup "com.automattic"
-            includeGroup "com.automattic.tracks"
-            includeGroup "com.gravatar"
-            includeGroup "org.wordpress.aztec"
-        }
-    }
-    maven {
-        url 'https://zendesk.jfrog.io/zendesk/repo'
-        content {
-            includeGroup "com.zendesk"
-            includeGroup "com.zendesk.belvedere2"
-        }
-    }
-    mavenCentral()
-    maven {
-        url "https://a8c-libs.s3.amazonaws.com/android/jcenter-mirror"
-        content {
-            includeVersion "com.android.volley", "volley", "1.1.1"
-            includeVersion "com.google.android", "flexbox", "2.0.1"
-            includeVersion "com.jraska", "falcon", "2.1.1"
-            includeVersion "org.wordpress", "wellsql", "1.6.0"
-            includeVersion "org.wordpress", "wellsql-core", "1.6.0"
-        }
-    }
-    maven {
-        url "https://jitpack.io"
-        content {
-            includeModule("com.github.wordpress-mobile.WordPress-Aztec-Android", "aztec")
-            includeModule("com.github.wordpress-mobile.WordPress-Aztec-Android", "glide-loader")
-            includeModule("com.github.chrisbanes", "PhotoView")
-            includeModule("com.github.PhilJay", "MPAndroidChart")
-        }
-    }
-}
-
 def versionProperties = loadPropertiesFromFile(file("${rootDir}/version.properties"))
 
 android {

diff --git a/build.gradle b/build.gradle
@@ -60,11 +60,6 @@ static def readPropertiesFromFile(File file) {
 allprojects {
     apply plugin: libs.plugins.detekt.get().pluginId
 
-    repositories {
-        google()
-        mavenCentral()
-    }
-
     tasks.withType(KotlinCompile).all {
         kotlinOptions {
             jvmTarget = libs.versions.java.get()
@@ -77,12 +72,6 @@ allprojects {
     }
 }
 
-subprojects {
-    configurations {
-        compile.exclude group: 'org.jetbrains', module: 'annotations-java5'
-    }
-}
-
 tasks.register("detektAll", Detekt) {
     description = "Custom DETEKT build for all modules"
     parallel = true

diff --git a/libs/apifaker/build.gradle b/libs/apifaker/build.gradle
@@ -6,28 +6,6 @@ plugins {
     alias(libs.plugins.ksp)
 }
 
-repositories {
-    maven {
-        url 'https://a8c-libs.s3.amazonaws.com/android'
-        content {
-            includeGroup "org.wordpress"
-            includeGroup "org.wordpress.fluxc"
-            includeGroup "org.wordpress.fluxc.plugins"
-            includeGroup "org.wordpress.wellsql"
-            includeGroup "org.wordpress.mediapicker"
-            includeGroup "com.automattic"
-            includeGroup "com.automattic.tracks"
-        }
-    }
-
-    maven {
-        url "https://a8c-libs.s3.amazonaws.com/android/jcenter-mirror"
-        content {
-            includeVersion "com.android.volley", "volley", "1.1.1"
-        }
-    }
-}
-
 android {
     namespace 'com.woocommerce.android.apifaker'
 

diff --git a/settings.gradle b/settings.gradle
@@ -20,6 +20,55 @@ plugins {
     id 'com.gradle.enterprise' version '3.17.2'
 }
 
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        mavenCentral()
+        google()
+        maven {
+            url 'https://a8c-libs.s3.amazonaws.com/android'
+            content {
+                includeGroup "org.wordpress"
+                includeGroup "org.wordpress.fluxc"
+                includeGroup "org.wordpress.fluxc.plugins"
+                includeGroup "org.wordpress.wellsql"
+                includeGroup "org.wordpress.mediapicker"
+                includeGroup "com.automattic"
+                includeGroup "com.automattic.tracks"
+                includeGroup "com.gravatar"
+                includeGroup "org.wordpress.aztec"
+            }
+        }
+        maven {
+            url 'https://zendesk.jfrog.io/zendesk/repo'
+            content {
+                includeGroup "com.zendesk"
+                includeGroup "com.zendesk.belvedere2"
+            }
+        }
+        maven {
+            url "https://a8c-libs.s3.amazonaws.com/android/jcenter-mirror"
+            content {
+                includeVersion "com.android.volley", "volley", "1.1.1"
+                includeVersion "com.google.android", "flexbox", "2.0.1"
+                includeVersion "com.jraska", "falcon", "2.1.1"
+                includeVersion "org.wordpress", "wellsql", "1.6.0"
+                includeVersion "org.wordpress", "wellsql-core", "1.6.0"
+            }
+        }
+        maven {
+            url "https://jitpack.io"
+            content {
+                includeModule("com.github.wordpress-mobile.WordPress-Aztec-Android", "aztec")
+                includeModule("com.github.wordpress-mobile.WordPress-Aztec-Android", "glide-loader")
+                includeModule("com.github.chrisbanes", "PhotoView")
+                includeModule("com.github.PhilJay", "MPAndroidChart")
+            }
+        }
+    }
+}
+
+
 rootProject.name = 'WCAndroid'
 
 include ':libs:commons'