diff --git a/brut.apktool/apktool-cli/build.gradle b/brut.apktool/apktool-cli/build.gradle index ce8947b1..a078ef7b 100644 --- a/brut.apktool/apktool-cli/build.gradle +++ b/brut.apktool/apktool-cli/build.gradle @@ -16,8 +16,8 @@ apply plugin: 'com.github.johnrengelman.shadow' dependencies { - compile depends.commons_cli - compile project(':brut.apktool:apktool-lib') + implementation depends.commons_cli + implementation project(':brut.apktool:apktool-lib') } buildscript { diff --git a/brut.apktool/apktool-lib/build.gradle b/brut.apktool/apktool-lib/build.gradle index 501f49df..bb294392 100644 --- a/brut.apktool/apktool-lib/build.gradle +++ b/brut.apktool/apktool-lib/build.gradle @@ -15,6 +15,8 @@ */ import org.apache.tools.ant.filters.* +apply plugin: 'java-library' + processResources { from('src/main/resources/properties') { include '**/*.properties' @@ -29,19 +31,21 @@ processResources { } dependencies { - compile("junit:junit:4.10") { + testImplementation("junit:junit:4.10") { exclude(module: 'hamcrest-core') } - compile project(':brut.j.dir'), - project(':brut.j.util'), - project(':brut.j.common'), - depends.baksmali, - depends.smali, - depends.snakeyaml, - depends.xmlpull, - depends.guava, - depends.commons_lang + api project(':brut.j.dir'), + project(':brut.j.util'), + project(':brut.j.common') - testCompile depends.xmlunit + implementation depends.baksmali, + depends.smali, + depends.snakeyaml, + depends.xmlpull, + depends.guava, + depends.commons_lang, + depends.commons_io + + testImplementation depends.xmlunit } \ No newline at end of file diff --git a/brut.j.common/build.gradle b/brut.j.common/build.gradle index fdb85ada..9097e928 100644 --- a/brut.j.common/build.gradle +++ b/brut.j.common/build.gradle @@ -15,6 +15,6 @@ */ dependencies { - testCompile depends.junit + testImplementation depends.junit } diff --git a/brut.j.dir/build.gradle b/brut.j.dir/build.gradle index f39b3026..91d8f89b 100644 --- a/brut.j.dir/build.gradle +++ b/brut.j.dir/build.gradle @@ -15,7 +15,8 @@ */ dependencies { - compile project(':brut.j.common'), - project(':brut.j.util') - testCompile depends.junit + implementation project(':brut.j.common'), + project(':brut.j.util'), + depends.commons_io + testImplementation depends.junit } diff --git a/brut.j.util/build.gradle b/brut.j.util/build.gradle index 5cfda6d5..57d420b3 100644 --- a/brut.j.util/build.gradle +++ b/brut.j.util/build.gradle @@ -15,7 +15,7 @@ */ dependencies { - compile project(':brut.j.common'), - depends.commons_io - testCompile depends.junit + implementation project(':brut.j.common'), + depends.commons_io + testImplementation depends.junit } diff --git a/build.gradle b/build.gradle index 4f9ed25b..c2dc26cd 100644 --- a/build.gradle +++ b/build.gradle @@ -26,13 +26,13 @@ buildscript { } plugins { - id "com.github.hierynomus.license" version "0.15.0" + id 'com.github.hierynomus.license' version '0.15.0' } apply from: 'gradle/functions.gradle' def apktoolversion_major = '2.4.2' -def apktoolversion_minor = 'SNAPSHOT'; +def apktoolversion_minor = 'SNAPSHOT' defaultTasks 'build', 'shadowJar', 'proguard' @@ -48,7 +48,7 @@ allprojects { exclude "**/android/util/*.java" include "**/*.java" mapping { - java='SLASHSTAR_STYLE' + java = 'SLASHSTAR_STYLE' } strictCheck true