diff --git a/build.gradle b/build.gradle index 10f30aa84..db3f1280a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'com.github.ksoichiro.console.reporter' version '0.5.0' - id 'org.sonarqube' version '2.4' + id 'org.sonarqube' version '2.6.2' + id 'com.github.ben-manes.versions' version '0.17.0' } ext.jadxVersion = file('version').readLines().get(0) @@ -31,14 +32,14 @@ allprojects { } dependencies { - compile 'org.slf4j:slf4j-api:1.7.10' + compile 'org.slf4j:slf4j-api:1.7.25' - testCompile 'ch.qos.logback:logback-classic:1.1.2' + testCompile 'ch.qos.logback:logback-classic:1.2.3' testCompile 'junit:junit:4.12' testCompile 'org.hamcrest:hamcrest-library:1.3' - testCompile 'org.mockito:mockito-core:1.10.19' - testCompile 'org.spockframework:spock-core:1.0-groovy-2.4' - testCompile 'cglib:cglib-nodep:3.1' + testCompile 'org.mockito:mockito-core:2.15.0' + testCompile 'org.spockframework:spock-core:1.1-groovy-2.4' + testCompile 'cglib:cglib-nodep:3.2.6' } repositories { @@ -47,6 +48,9 @@ allprojects { jcenter() } + jacoco { + toolVersion = "0.8.0" + } jacocoTestReport { reports { xml.enabled = true @@ -62,6 +66,19 @@ sonarqube { } } +dependencyUpdates.resolutionStrategy = { + componentSelection { rules -> + rules.all { ComponentSelection selection -> + boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'atlassian'].any { qualifier -> + selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/ + } + if (rejected) { + selection.reject('Release candidate') + } + } + } +} + task copyArtifacts(type: Sync, dependsOn: ['jadx-cli:installDist', 'jadx-gui:installDist']) { destinationDir file("$buildDir/jadx") ['jadx-cli', 'jadx-gui'].each { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 99340b4ad..c44b679ac 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2c2bbe5f9..568c50bf3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip diff --git a/jadx-cli/build.gradle b/jadx-cli/build.gradle index 131f8a91a..ccb686396 100644 --- a/jadx-cli/build.gradle +++ b/jadx-cli/build.gradle @@ -6,7 +6,7 @@ applicationName = 'jadx' dependencies { compile(project(':jadx-core')) compile 'com.beust:jcommander:1.47' - compile 'ch.qos.logback:logback-classic:1.1.2' + compile 'ch.qos.logback:logback-classic:1.2.3' } applicationDistribution.with { diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle index 645f2c9cb..b4aced120 100644 --- a/jadx-core/build.gradle +++ b/jadx-core/build.gradle @@ -5,9 +5,9 @@ dependencies { compile files('lib/dx-1.14.jar') compile 'commons-io:commons-io:2.6' - compile 'org.ow2.asm:asm:5.0.3' - compile 'com.intellij:annotations:12.0' - compile 'uk.com.robust-it:cloning:1.9.2' + compile 'org.ow2.asm:asm:6.0' + compile 'org.jetbrains:annotations:15.0' + compile 'uk.com.robust-it:cloning:1.9.9' testCompile 'org.smali:smali:2.2.2' testCompile 'org.smali:baksmali:2.2.2' diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle index 9af97e4f5..7390e661d 100644 --- a/jadx-gui/build.gradle +++ b/jadx-gui/build.gradle @@ -6,7 +6,7 @@ dependencies { compile(project(":jadx-core")) compile(project(":jadx-cli")) compile 'com.fifesoft:rsyntaxtextarea:2.6.1' - compile 'com.google.code.gson:gson:2.3.1' + compile 'com.google.code.gson:gson:2.8.2' compile files('libs/jfontchooser-1.0.5.jar') compile 'hu.kazocsaba:image-viewer:1.2.3' } @@ -30,7 +30,7 @@ jar { } startScripts { - defaultJvmOpts = [ '-Xms2g', '-Xmx4g' ] + defaultJvmOpts = [ '-d64', '-Xms512M', '-Xmx4g' ] doLast { def str = windowsScript.text str = str.replaceAll('java.exe', 'javaw.exe')