build: include bleeding edge smali from source via jitpack (#2941)

* build: include smali from source

* refactor: adjust build.gradle for repositories

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'
         }

brut.apktool/apktool-lib/build.gradle

@@ -33,20 +33,19 @@ processResources {
 }
 
 dependencies {
+    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
-
-    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
-
     testImplementation depends.xmlunit
 }

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
-}
-

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
 }

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
 }

build.gradle

@@ -18,7 +18,7 @@ import java.nio.charset.StandardCharsets
 buildscript {
     ext {
         depends = [
-                baksmali       : 'org.smali:baksmali:2.5.2',
+                baksmali       : 'com.github.iBotPeaches.smali:baksmali:403e90375e',
                 commons_cli    : 'commons-cli:commons-cli:1.5.0',
                 commons_io     : 'commons-io:commons-io:2.11.0',
                 commons_lang   : 'org.apache.commons:commons-lang3:3.12.0',
@@ -27,14 +27,13 @@ buildscript {
                 junit          : 'junit:junit:4.13.2',
                 proguard_gradle: 'com.guardsquare:proguard-gradle:7.1.1',
                 snakeyaml      : 'org.yaml:snakeyaml:1.32:android',
-                smali          : 'org.smali:smali:2.5.2',
+                smali          : 'com.github.iBotPeaches.smali:smali:403e90375e',
                 xmlpull        : 'xpp3:xpp3:1.1.4c',
                 xmlunit        : 'xmlunit:xmlunit:1.6',
         ]
     }
 
     repositories {
-        mavenCentral()
         gradlePluginPortal()
     }
     dependencies {
@@ -80,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 {
@@ -136,10 +143,6 @@ task snapshot {
 subprojects {
     apply plugin: 'java'
 
-    repositories {
-        mavenCentral()
-    }
-
     test {
         testLogging {
             exceptionFormat = 'full'