diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java index f4b92d07..4b092f61 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java @@ -417,7 +417,8 @@ final public class AndrolibResources { InputStream in = null; OutputStream out = null; try { - in = AndrolibResources.class.getResourceAsStream("/brut/androlib/android-framework.jar"); + in = AndrolibResources.class.getResourceAsStream( + "/brut/androlib/android-framework.jar"); out = new FileOutputStream(apk); IOUtils.copy(in, out); return apk; @@ -579,4 +580,4 @@ final public class AndrolibResources { private String mMaxSdkVersion = null; private String mTargetSdkVersion = null; -} +} \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar b/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar index 8b9be231..a3255046 100644 Binary files a/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar and b/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar differ diff --git a/build.gradle b/build.gradle index 639ba9de..13f16aa9 100644 --- a/build.gradle +++ b/build.gradle @@ -39,14 +39,6 @@ subprojects { apply plugin: 'maven' apply plugin: 'idea' - gradle.taskGraph.whenReady { - ext.version = '1.5.1' - - jar { - - } - } - repositories { mavenCentral() } @@ -61,7 +53,7 @@ subprojects { } project(':brut.j.util') { dependencies { - compile project(':brut.j.common'), "commons-io:commons-io:1.4" + compile project(':brut.j.common'), "commons-io:commons-io:2.4" testCompile "junit:junit:3.8.1" } } @@ -91,6 +83,13 @@ subprojects { } } project(':brut.apktool:apktool-lib') { + gradle.taskGraph.whenReady { + task copy << { + from 'src/main/resources' + into 'build/resources/main' + include '**/*.jar' + } + } processResources { ext.fullrev = '' ant.loadfile(srcFile: "../../.git/refs/heads/master", property: ext.fullrev) @@ -110,7 +109,6 @@ subprojects { version = apktoolversion gradle.taskGraph.whenReady { - // build a jar containing all dependencies jar { from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } @@ -123,4 +121,4 @@ subprojects { dependencies { compile project(':brut.apktool:apktool-lib') } - } + } \ No newline at end of file