From dc88cc9de5364c662030ac71e89d0c6d50b999df Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Sat, 19 Nov 2022 16:23:02 -0500
Subject: [PATCH] refactor: adjust build.gradle for repositories

---
 brut.apktool/apktool-cli/build.gradle |  9 ++++---
 brut.apktool/apktool-lib/build.gradle | 35 ++++++++++-----------------
 brut.j.common/build.gradle            |  5 ----
 brut.j.dir/build.gradle               |  7 +++---
 brut.j.util/build.gradle              |  5 ++--
 build.gradle                          | 12 ++++++---
 6 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/brut.apktool/apktool-cli/build.gradle b/brut.apktool/apktool-cli/build.gradle
index 083c7b5243..d115f36dde 100644
--- a/brut.apktool/apktool-cli/build.gradle
+++ b/brut.apktool/apktool-cli/build.gradle
@@ -23,11 +23,12 @@ dependencies {
 }
 
 buildscript {
-    repositories {
-        mavenCentral()
-    }
-
     dependencies {
+        repositories {
+            mavenCentral()
+            gradlePluginPortal()
+        }
+
         classpath(depends.proguard_gradle) {
             exclude group: 'com.android.tools.build'
         }
diff --git a/brut.apktool/apktool-lib/build.gradle b/brut.apktool/apktool-lib/build.gradle
index 69a320edf1..080ffb7771 100644
--- a/brut.apktool/apktool-lib/build.gradle
+++ b/brut.apktool/apktool-lib/build.gradle
@@ -33,28 +33,19 @@ processResources {
 }
 
 dependencies {
-    testImplementation depends.junit
-
-    api project(':brut.j.dir'),
-        project(':brut.j.util'),
-        project(':brut.j.common')
-
-    implementation depends.baksmali,
-                   depends.smali,
-                   depends.snakeyaml,
-                   depends.xmlpull,
-                   depends.guava,
-                   depends.commons_lang,
-                   depends.commons_io,
-                   depends.commons_text
+    api project(':brut.j.dir')
+    api project(':brut.j.util')
+    api project(':brut.j.common')
+
+    implementation depends.baksmali
+    implementation depends.smali
+    implementation depends.snakeyaml
+    implementation depends.xmlpull
+    implementation depends.guava
+    implementation depends.commons_lang
+    implementation depends.commons_io
+    implementation depends.commons_text
 
+    testImplementation depends.junit
     testImplementation depends.xmlunit
-
-    repositories {
-        mavenCentral()
-
-        // Obtain baksmali/smali from source builds - https://github.com/iBotPeaches/smali
-        // Remove when official smali releases come out again.
-        maven { url 'https://jitpack.io' }
-    }
 }
diff --git a/brut.j.common/build.gradle b/brut.j.common/build.gradle
index 98929c3fc8..41a98796cf 100644
--- a/brut.j.common/build.gradle
+++ b/brut.j.common/build.gradle
@@ -13,8 +13,3 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
-dependencies {
-    testImplementation depends.junit
-}
-
diff --git a/brut.j.dir/build.gradle b/brut.j.dir/build.gradle
index 0512ffe993..0e5e1cfedd 100644
--- a/brut.j.dir/build.gradle
+++ b/brut.j.dir/build.gradle
@@ -15,8 +15,7 @@
  */
 
 dependencies {
-  implementation project(':brut.j.common'),
-                 project(':brut.j.util'),
-                 depends.commons_io
-  testImplementation depends.junit
+  implementation project(':brut.j.common')
+  implementation project(':brut.j.util')
+  implementation depends.commons_io
 }
diff --git a/brut.j.util/build.gradle b/brut.j.util/build.gradle
index 5e8c7cd504..92d7c9231d 100644
--- a/brut.j.util/build.gradle
+++ b/brut.j.util/build.gradle
@@ -15,7 +15,6 @@
  */
 
 dependencies {
-  implementation project(':brut.j.common'),
-                 depends.commons_io
-  testImplementation depends.junit
+  implementation project(':brut.j.common')
+  implementation depends.commons_io
 }
diff --git a/build.gradle b/build.gradle
index 629901f569..d7b24581ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,6 +79,14 @@ allprojects {
             "licenseMain",
             "licenseTest"
     ]
+
+    repositories {
+        mavenCentral()
+
+        // Obtain baksmali/smali from source builds - https://github.com/iBotPeaches/smali
+        // Remove when official smali releases come out again.
+        maven { url 'https://jitpack.io' }
+    }
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -135,10 +143,6 @@ task snapshot {
 subprojects {
     apply plugin: 'java'
 
-    repositories {
-        mavenCentral()
-    }
-
     test {
         testLogging {
             exceptionFormat = 'full'