adjust build.gradle to handle apktool / dexlib2

brut.apktool.smali/baksmali/build.gradle

@@ -34,8 +34,8 @@ configurations {
 }
 
 dependencies {
-    compile project(':util')
-    compile project(':dexlib2')
+    compile project(':brut.apktool.smali:util')
+    compile project(':brut.apktool.smali:dexlib2')
     compile depends.commons_cli
     compile depends.guava
 
@@ -56,7 +56,7 @@ jar {
     }
 
     doLast {
-        ant.symlink(link: file("${destinationDir}/baksmali.jar"), resource: archivePath, overwrite: true)
+        //ant.symlink(link: file("${destinationDir}/baksmali.jar"), resource: archivePath, overwrite: true)
     }
 }
 

brut.apktool.smali/dexlib/build.gradle

@@ -30,7 +30,7 @@
  */
 
 dependencies {
-    compile project(':util')
+    compile project('brut.apktool.smali:util')
     compile depends.findbugs
     compile depends.guava
 }

brut.apktool.smali/dexlib2/accessorTestGenerator/build.gradle

@@ -30,7 +30,7 @@
  */
 
 dependencies {
-    compile project(':util')
+    compile project(':brut.apktool.smali:util')
     compile 'com.google.code.findbugs:jsr305:1.3.9'
     compile 'com.google.guava:guava:13.0.1'
     compile 'org.antlr:ST4:4.0.7'

brut.apktool.smali/dexlib2/build.gradle

@@ -34,7 +34,7 @@ configurations {
 }
 
 dependencies {
-    compile project(':util')
+    compile project(':brut.apktool.smali:util')
     compile depends.findbugs
     compile depends.guava
 

brut.apktool.smali/smali/build.gradle

@@ -65,8 +65,8 @@ idea {
 }
 
 dependencies {
-    compile project(':util')
-    compile project(':dexlib2')
+    compile project(':brut.apktool.smali:util')
+    compile project(':brut.apktool.smali:dexlib2')
     compile depends.antlr_runtime
     compile depends.commons_cli
 
@@ -142,7 +142,7 @@ jar {
     }
 
     doLast {
-        ant.symlink(link: file("${destinationDir}/smali.jar"), resource: archivePath, overwrite: true)
+        // ant.symlink(link: file("${destinationDir}/smali.jar"), resource: archivePath, overwrite: true)
     }
 }
 

brut.apktool/apktool-lib/build.gradle

@@ -51,7 +51,7 @@ compile project(':brut.j.dir'),
 	   project(':brut.j.util'), 
 	   project(':brut.j.common'), 
 	   project(':brut.apktool.smali:util'),
-	   project(':brut.apktool.smali:dexlib'), 
+	   project(':brut.apktool.smali:dexlib2'), 
 	   project(':brut.apktool.smali:baksmali'),
 	   project(':brut.apktool.smali:smali'),
 	   "org.yaml:snakeyaml:1.12",

build.gradle

@@ -17,6 +17,7 @@
 apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'license'
+
 ext.apktoolversion = '2.0.0-Beta4'
 ext.fullrev = '';
 ext.gitrev_version = '';
@@ -69,9 +70,22 @@ subprojects {
   apply plugin: 'maven'
   apply plugin: 'idea'
   
+  ext {
+        depends = [guava: 'com.google.guava:guava:14.0',
+                   findbugs: 'com.google.code.findbugs:jsr305:1.3.9',
+                   junit: 'junit:junit:4.6',
+                   antlr_runtime: 'org.antlr:antlr-runtime:3.5',
+                   antlr: 'org.antlr:antlr:3.5',
+                   commons_cli: 'commons-cli:commons-cli:1.2',
+                   jflex: 'de.jflex:jflex:1.4.3',
+                   proguard: 'net.sf.proguard:proguard-base:4.8'
+         ]
+  }
+    
   repositories {
     mavenCentral()
   }
+  
   dependencies {
     testCompile 'junit:junit:4.8.2'
   }

settings.gradle

@@ -2,8 +2,9 @@ include 'brut.j.common',
   'brut.j.util',
   'brut.j.dir',
   'brut.apktool.smali:util',
-  'brut.apktool.smali:dexlib',
+  'brut.apktool.smali:dexlib2',
   'brut.apktool.smali:baksmali',
   'brut.apktool.smali:smali',
+  'brut.apktool.smali:dexlib2:accessorTestGenerator',
   'brut.apktool:apktool-lib',
   'brut.apktool:apktool-cli'