Update gradle build files

.gitignore

@@ -7,12 +7,15 @@
 .idea/
 out/
 *.iml
+*.ipr
+*.iws
 
 bin/
 target/
 build/
 idea/
 .gradle/
+gradle.properties
 
 *.dex
 *.jar

build.gradle

@@ -1,90 +1,32 @@
-apply plugin: 'java'
-apply plugin: 'application'
-
-apply plugin: 'eclipse'
 apply plugin: 'idea'
 
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
+ext.jadxVersion = file('version').readLines().get(0)
 
-version = file('version').readLines().get(0)
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'idea'
+    apply plugin: 'eclipse'
 
-mainClassName = "jadx.Main"
-manifest.mainAttributes("jadx-version" : version)
+    sourceCompatibility = 1.6
+    targetCompatibility = 1.6
 
-project.ext {
-    mainSamplesClass = "jadx.samples.RunTests"  
-    samplesJadxSrcDir = "${buildDir}/samples-jadx/src"
-}
-
-dependencies {
-    compile 'com.google.android.tools:dx:1.7'
-    compile 'com.beust:jcommander:1.30'
-    compile 'org.slf4j:slf4j-api:1.7.5'
-    compile 'ch.qos.logback:logback-classic:1.0.13'
-    testCompile 'junit:junit:4.11'
-}
-
-repositories {
-    mavenCentral()
-}
-
-sourceSets {
-    samples
-    //TODO don't add to eclipse classpath
-    samplesJadx {
-        java {
-            srcDir samplesJadxSrcDir
-            output.classesDir "${buildDir}/samples-jadx/output"
-        }
+    jar {
+        version = jadxVersion
     }
-}
 
-task samplesRun(type: JavaExec, dependsOn: compileSamplesJava) {  
-    classpath = sourceSets.samples.output
-    main = mainSamplesClass  
-}
-
-task samplesJar(type: Jar, dependsOn: samplesRun) {
-    baseName = 'samples'
-    from sourceSets.samples.output
-}
-
-task samplesJadxCreate(type: JavaExec, dependsOn: [compileJava, samplesJar]) {  
-    classpath = sourceSets.main.output + configurations.compile
-    main = mainClassName 
-    args = ['-d', samplesJadxSrcDir, samplesJar.archivePath]
-}
-
-compileSamplesJadxJava.dependsOn samplesJadxCreate
-
-task samplesJadxRun(type: JavaExec, dependsOn: compileSamplesJadxJava) {  
-    classpath = sourceSets.samplesJadx.output
-    main = mainSamplesClass  
-}
-
-task samples (dependsOn: samplesJadxRun) {
-}
-
-//check.dependsOn samples
-build.dependsOn distZip
-build.dependsOn installApp
-
-startScripts {
-    doLast {
-        // increase default max heap size
-        String var = 'DEFAULT_JVM_OPTS='
-        String args = '-Xmx1400M'
-        unixScript.text = unixScript.text.replace(var + '""', var + '"' + args + '"')
-        windowsScript.text = windowsScript.text.replace(var, var + args)
+    manifest {
+        mainAttributes("jadx-version" : jadxVersion)
     }
-}
 
-applicationDistribution.with {
-    into('') {
-        from '.'
-        include 'README.md'
-        include 'NOTICE'
+    dependencies {
+        compile 'com.google.android.tools:dx:1.7'
+        compile 'org.slf4j:slf4j-api:1.7.5'
+        compile 'ch.qos.logback:logback-classic:1.0.13'
+        testCompile 'junit:junit:4.11'
+    }
+
+    repositories {
+        mavenCentral()
     }
 }
 

jadx-cli/build.gradle

@@ -0,0 +1,30 @@
+apply plugin: 'application'
+
+mainClassName = "jadx.cli.JadxCLI"
+
+dependencies {
+    compile(project(":jadx-core"))
+    compile 'com.beust:jcommander:1.30'
+}
+
+build.dependsOn distZip
+build.dependsOn installApp
+
+startScripts {
+    doLast {
+        // increase default max heap size
+        String var = 'DEFAULT_JVM_OPTS='
+        String args = '-Xmx1400M'
+        unixScript.text = unixScript.text.replace(var + '""', var + '"' + args + '"')
+        windowsScript.text = windowsScript.text.replace(var, var + args)
+    }
+}
+
+applicationDistribution.with {
+    into('') {
+        from '.'
+        include 'README.md'
+        include 'NOTICE'
+    }
+}
+

jadx-core/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    compile 'com.google.android.tools:dx:1.7'
+}
+

jadx-gui/build.gradle

@@ -0,0 +1,31 @@
+apply plugin: 'application'
+
+mainClassName = "jadx.gui.JadxGUI"
+
+dependencies {
+    compile(project(":jadx-core"))
+    compile(project(":jadx-cli"))
+    compile 'com.fifesoft:rsyntaxtextarea:2.0.7'
+}
+
+build.dependsOn distZip
+build.dependsOn installApp
+
+startScripts {
+    doLast {
+        // increase default max heap size
+        String var = 'DEFAULT_JVM_OPTS='
+        String args = '-Xmx1400M'
+        unixScript.text = unixScript.text.replace(var + '""', var + '"' + args + '"')
+        windowsScript.text = windowsScript.text.replace(var, var + args)
+    }
+}
+
+applicationDistribution.with {
+    into('') {
+        from '.'
+        include 'README.md'
+        include 'NOTICE'
+    }
+}
+

jadx-samples/build.gradle

@@ -0,0 +1,47 @@
+project.ext {
+    mainSamplesClass = "jadx.samples.RunTests"  
+    samplesJadxSrcDir = "${buildDir}/samples-jadx/src"
+}
+
+dependencies {
+    compile(project(":jadx-core"))
+    compile(project(":jadx-cli"))
+}
+
+sourceSets {
+    samples
+    //TODO don't add to eclipse classpath
+    samplesJadx {
+        java {
+            srcDir samplesJadxSrcDir
+            output.classesDir "${buildDir}/samples-jadx/output"
+        }
+    }
+}
+
+task samplesRun(type: JavaExec, dependsOn: compileSamplesJava) {  
+    classpath = sourceSets.samples.output
+    main = mainSamplesClass  
+}
+
+task samplesJar(type: Jar, dependsOn: samplesRun) {
+    baseName = 'samples'
+    from sourceSets.samples.output
+}
+
+task samplesJadxCreate(type: JavaExec, dependsOn: [compileJava, samplesJar]) {  
+    classpath = sourceSets.main.output + configurations.compile
+    main = "jadx.cli.JadxCLI" 
+    args = ['-d', samplesJadxSrcDir, samplesJar.archivePath]
+}
+
+compileSamplesJadxJava.dependsOn samplesJadxCreate
+
+task samplesJadxRun(type: JavaExec, dependsOn: compileSamplesJadxJava) {  
+    classpath = sourceSets.samplesJadx.output
+    main = mainSamplesClass  
+}
+
+task samples (dependsOn: samplesJadxRun) {
+}
+

settings.gradle

@@ -0,0 +1 @@
+include 'jadx-core', 'jadx-cli', 'jadx-gui', 'jadx-samples'

version

@@ -1 +1 @@
-0.4
+0.5.0