diff --git a/.travis.yml b/.travis.yml index e38a36c706ce6869d83f748cea9cdccd2b6f06ee..1adf05b39716c106946860853b935eab87131330 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,18 @@ jdk: - oraclejdk7 - openjdk7 - openjdk6 +env: + - TERM=dumb + before_install: - chmod +x gradlew + script: - - TERM=dumb ./gradlew clean build dist + - ./gradlew clean build dist + +after_success: + - ./gradlew jacocoTestReport coveralls + notifications: email: - skylot@gmail.com diff --git a/README.md b/README.md index 7a9cbf81a58ee3120c325c571742359256ec12d1..8b2bdd529ba25b62037981a28134bf2ae5159ebf 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,16 @@ ## JADX + +[![Build Status](https://travis-ci.org/skylot/jadx.png?branch=master)](https://travis-ci.org/skylot/jadx) +[![Build Status](https://drone.io/github.com/skylot/jadx/status.png)](https://drone.io/github.com/skylot/jadx/latest) +[![Coverage Status](https://coveralls.io/repos/skylot/jadx/badge.png)](https://coveralls.io/r/skylot/jadx) + **jadx** - Dex to Java decompiler Command line and GUI tools for produce Java source code from Android Dex and Apk files -Note: jadx-gui now in experimental stage - ### Downloads - [unstable](https://drone.io/github.com/skylot/jadx/files) -[![Build Status](https://drone.io/github.com/skylot/jadx/status.png)](https://drone.io/github.com/skylot/jadx/latest) -[![Build Status](https://travis-ci.org/skylot/jadx.png?branch=master)](https://travis-ci.org/skylot/jadx) - from [github](https://github.com/skylot/jadx/releases) - from [sourceforge](http://sourceforge.net/projects/jadx/files/) @@ -51,4 +52,4 @@ Example: *Licensed under the Apache 2.0 License* -*Copyright 2013 by Skylot* +*Copyright 2014 by Skylot* diff --git a/build.gradle b/build.gradle index 603fb471c8a372d70b889979d835cc7ec58a765a..0562d885201143f10e2e20ea1d9423c1016df7c2 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,7 @@ apply plugin: 'sonar-runner' subprojects { apply plugin: 'java' apply plugin: 'jacoco' - apply plugin: 'idea' - apply plugin: 'eclipse' + apply plugin: 'coveralls' sourceCompatibility = 1.6 targetCompatibility = 1.6 @@ -30,15 +29,34 @@ subprojects { } dependencies { - compile 'org.slf4j:slf4j-api:1.7.6' + compile 'org.slf4j:slf4j-api:1.7.7' testCompile 'junit:junit:4.11' testCompile 'org.mockito:mockito-core:1.9.5' - testCompile 'ch.qos.logback:logback-classic:1.1.1' + testCompile 'ch.qos.logback:logback-classic:1.1.2' } repositories { mavenCentral() } + + jacocoTestReport { + reports { + xml.enabled = true // coveralls plugin depends on xml format report + html.enabled = true + } + } +} + +// setup coveralls (http://coveralls.io/) +// see http://github.com/kt3k/coveralls-gradle-plugin +buildscript { + repositories { + mavenCentral() + } + + dependencies { + classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:0.4.0' + } } task copyArtifacts(type: Sync, dependsOn: ['jadx-cli:installApp', 'jadx-gui:installApp']) { @@ -69,5 +87,5 @@ task clean(type: Delete) { } task wrapper(type: Wrapper) { - gradleVersion = '1.11' + gradleVersion = '1.12' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5838598129719e795cc5633f411468bdec311016..3c7abdf12790879c06b07176de29647f77aa4129 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 48f2130686be1b7e0e02810fab5bf074e70b4b21..d6718bc7883fc72cdc8fdd39a224d56f3a6e6cd8 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.11-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip diff --git a/jadx-cli/build.gradle b/jadx-cli/build.gradle index 0326ffd8daff670584cc0d790795cafb44bdbf9e..9687a01efe62c046a716a46ceea8aa9823811ff2 100644 --- a/jadx-cli/build.gradle +++ b/jadx-cli/build.gradle @@ -5,8 +5,8 @@ applicationName = 'jadx' dependencies { compile(project(':jadx-core')) - compile 'com.beust:jcommander:1.30' - compile 'ch.qos.logback:logback-classic:1.1.1' + compile 'com.beust:jcommander:1.35' + compile 'ch.qos.logback:logback-classic:1.1.2' } startScripts { diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle index dd7580a631bdc68d152b90170174936f430eddb3..10a727728f936ca706121f8f9f65304f11aa2821 100644 --- a/jadx-gui/build.gradle +++ b/jadx-gui/build.gradle @@ -26,3 +26,10 @@ applicationDistribution.with { } } +test { + jacoco { + // coveralls plugin not support multi-project + enabled = false + } +} +