diff --git a/.travis.yml b/.travis.yml index 2b581bd05..f39d9e124 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,18 +11,11 @@ script: - TERM=dumb ./gradlew clean build dist after_success: - - TERM=dumb ./gradlew jacocoTestReport coveralls + - TERM=dumb ./gradlew jacocoTestReport + - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports" sudo: false -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ - -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - notifications: email: - skylot@gmail.com diff --git a/README.md b/README.md index 3170e13fa..6e7418e81 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![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) +[![Code Coverage](https://codecov.io/gh/skylot/jadx/branch/master/graph/badge.svg)](https://codecov.io/gh/skylot/jadx) [![Coverity Scan Build Status](https://scan.coverity.com/projects/2166/badge.svg)](https://scan.coverity.com/projects/2166) [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) @@ -90,4 +90,4 @@ Also I need to **prioritize** these task for complete most important at first. --------------------------------------- *Licensed under the Apache 2.0 License* -*Copyright 2015 by Skylot* +*Copyright 2016 by Skylot* diff --git a/build.gradle b/build.gradle index 01783bd54..83bf5179c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,24 +1,10 @@ -buildscript { - repositories { - mavenCentral() - jcenter() - } -} - -plugins { - id "com.github.kt3k.coveralls" version "2.3.1" - id "info.solidsoft.pitest" version "1.1.4" -// id "com.github.ben-manes.versions" version "0.8" -} - ext.jadxVersion = file('version').readLines().get(0) version = jadxVersion -subprojects { +allprojects { apply plugin: 'java' apply plugin: 'groovy' apply plugin: 'jacoco' - apply plugin: 'com.github.kt3k.coveralls' version = jadxVersion @@ -50,14 +36,14 @@ subprojects { } repositories { - mavenCentral() mavenLocal() + mavenCentral() jcenter() } jacocoTestReport { reports { - xml.enabled = true // coveralls plugin depends on xml format report + xml.enabled = true html.enabled = true } } @@ -97,6 +83,3 @@ build.dependsOn(dist, samples) clean.dependsOn(cleanBuildDir) -task wrapper(type: Wrapper) { - gradleVersion = '2.7' -} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4c997c405..165e8bb21 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-2.7-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-2.14.1-bin.zip diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle index dfdd2c08f..ed6b2ccff 100644 --- a/jadx-core/build.gradle +++ b/jadx-core/build.gradle @@ -1,7 +1,5 @@ ext.jadxClasspath = 'clsp-data/android-5.1.jar' -apply plugin: "info.solidsoft.pitest" - dependencies { runtime files(jadxClasspath) @@ -14,15 +12,3 @@ dependencies { testCompile 'org.smali:smali:2.0.3' } -task packTests(type: Jar) { - classifier = 'tests' - from sourceSets.test.output -} - -pitest { - excludedMethods = ['toString'] - threads = 4 - enableDefaultIncrementalAnalysis = true - outputFormats = ['XML', 'HTML'] - jvmArgs = ['-Xmx12G'] -} diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle index 50bf72e99..c4456e3a6 100644 --- a/jadx-gui/build.gradle +++ b/jadx-gui/build.gradle @@ -41,7 +41,6 @@ startScripts { test { jacoco { - // coveralls plugin not support multi-project enabled = false } }