diff --git a/build.gradle b/build.gradle index 09d565c47..e925175d5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,11 @@ ext.jadxVersion = file('version').readLines().get(0) +version = jadxVersion apply plugin: 'sonar-runner' subprojects { apply plugin: 'java' + apply plugin: 'jacoco' apply plugin: 'idea' apply plugin: 'eclipse' @@ -14,8 +16,8 @@ subprojects { gradle.projectsEvaluated { tasks.withType(Compile) { - if (!"${it}".contains(":jadx-samples:")) { - options.compilerArgs << "-Xlint" << "-Xlint:unchecked" << "-Xlint:deprecation" + if (!"${it}".contains(':jadx-samples:')) { + options.compilerArgs << '-Xlint' << '-Xlint:unchecked' << '-Xlint:deprecation' } } } @@ -30,7 +32,7 @@ subprojects { dependencies { compile 'org.slf4j:slf4j-api:1.7.5' testCompile 'junit:junit:4.11' - testCompile "org.mockito:mockito-core:1.9.5" + testCompile 'org.mockito:mockito-core:1.9.5' } repositories { @@ -66,5 +68,5 @@ task clean(type: Delete) { } task wrapper(type: Wrapper) { - gradleVersion = '1.9' + gradleVersion = '1.11' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d5c591c9c..583859812 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 77913d044..48f213068 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=http\://services.gradle.org/distributions/gradle-1.9-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip