diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 405c1b3c2..d8cf62e66 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -14,4 +14,4 @@ jobs: with: java-version: 1.8 - name: Build with Gradle - run: ./gradlew -Pcoverage lintBetaDebug pmd checkstyle jacocoTestBetaDebugUnitTestReport \ No newline at end of file + run: ./gradlew -Pcoverage jacocoTestBetaDebugUnitTestReport \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index e1c34ac7d..3e86a578d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ android: licenses: - android-sdk-license-.+ script: -- "./gradlew -Pcoverage lintBetaDebug pmd checkstyle jacocoTestBetaDebugUnitTestReport" +- "./gradlew -Pcoverage jacocoTestBetaDebugUnitTestReport" - if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then mkdir -p app/src/prodRelease/play/release-notes/en-US; fi diff --git a/app/build.gradle b/app/build.gradle index 65170e1de..b7e829925 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,6 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android-extensions' apply plugin: "com.hiya.jacoco-android" -apply from: 'quality.gradle' def isRunningOnTravisAndIsNotPRBuild = System.getenv("CI") == "true" && file('../play.p12').exists() diff --git a/app/quality.gradle b/app/quality.gradle deleted file mode 100644 index 1afdf0d68..000000000 --- a/app/quality.gradle +++ /dev/null @@ -1,45 +0,0 @@ -apply plugin: 'checkstyle' -apply plugin: 'pmd' - -check.dependsOn 'checkstyle', 'pmd' - -checkstyle { - toolVersion = '7.5.1' -} - -task checkstyle(type: Checkstyle) { - configFile file("${project.rootDir}/script/style/checkstyle.xml") - source 'src' - include '**/*.java' - exclude '**/gen/**' - - classpath = files() - - reports { - html { - enabled true - destination file("${project.buildDir}/reports/checkstyle/checkstyle.html") - } - } -} - -task pmd(type: Pmd) { - ignoreFailures = true - ruleSetFiles = files("${project.rootDir}/script/style/ruleset.xml") - ruleSets = [] - - source 'src' - include '**/*.java' - exclude '**/gen/**' - - reports { - xml.enabled = false - html.enabled = true - xml { - destination file("${project.buildDir}/reports/pmd/pmd.xml") - } - html { - destination file("${project.buildDir}/reports/pmd/pmd.html") - } - } -} diff --git a/script/style/checkstyle.xml b/script/style/checkstyle.xml deleted file mode 100644 index 216d1bce2..000000000 --- a/script/style/checkstyle.xml +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/script/style/ruleset.xml b/script/style/ruleset.xml deleted file mode 100644 index d516ddcf3..000000000 --- a/script/style/ruleset.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Custom ruleset for Commons Android app - - .*/R.java - .*/gen/.* - - - - -