diff --git a/.bitrise-with-ui-tests.yml b/.bitrise-with-ui-tests.yml index 01df91a..d3097ed 100644 --- a/.bitrise-with-ui-tests.yml +++ b/.bitrise-with-ui-tests.yml @@ -16,7 +16,7 @@ workflows: - gradle-runner@1.8.3: title: Gradle Build/Test/Analyse/Distribute inputs: - - gradle_task: assembleDebug testDebug jacocoTestReport checkstyle pmd jdepend + - gradle_task: assembleDebug testDebug jacocoTestReport checkstyle pmd lintDebug buildDashboard assembleDebugAndroidTest crashlyticsUploadDistributionDebug -PversionCode=$BITRISE_BUILD_NUMBER -PfabricApiKey=$FABRIC_API_KEY -PfabricApiSecret=$FABRIC_API_SECRET - mapping_file_exclude_filter: '' diff --git a/.bitrise.yml b/.bitrise.yml index ca284ad..7c49708 100644 --- a/.bitrise.yml +++ b/.bitrise.yml @@ -24,13 +24,13 @@ workflows: unset ANDROID_NDK_HOME - ./gradlew assembleDebug testDebug jacocoTestReport checkstyle pmd jdepend lintDebug buildDashboard assembleDebugAndroidTest crashlyticsUploadDistributionDebug -PversionCode=$BITRISE_BUILD_NUMBER -PfabricApiKey=$FABRIC_API_KEY -PfabricApiSecret=$FABRIC_API_SECRET + ./gradlew assembleDebug testDebug jacocoTestReport checkstyle pmd lintDebug buildDashboard assembleDebugAndroidTest crashlyticsUploadDistributionDebug -PversionCode=$BITRISE_BUILD_NUMBER -PfabricApiKey=$FABRIC_API_KEY -PfabricApiSecret=$FABRIC_API_SECRET title: Gradle Build/Test/Analyse/Distribute # disabled because of https://github.com/vgaidarji/ci-matters/issues/35 # - gradle-runner@1.8.3: # title: Gradle Build/Test/Analyse/Distribute # inputs: -# - gradle_task: assembleDebug testDebug jacocoTestReport checkstyle pmd jdepend +# - gradle_task: assembleDebug testDebug jacocoTestReport checkstyle pmd # lintDebug buildDashboard crashlyticsUploadDistributionDebug -PversionCode=$BITRISE_BUILD_NUMBER # -PfabricApiKey=$FABRIC_API_KEY -PfabricApiSecret=$FABRIC_API_SECRET # - mapping_file_exclude_filter: '' diff --git a/.circleci/config.yml b/.circleci/config.yml index 5f8b3f5..be2c9a9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,7 +50,7 @@ jobs: command: ./gradlew connectedAndroidTest - run: name: Build and check - command: ./gradlew testDebug jacocoTestReport coveralls checkstyle pmd jdepend lintDebug buildDashboard crashlyticsUploadDistributionDebug -PversionCode=$CIRCLE_BUILD_NUM -PfabricApiKey=$FABRIC_API_KEY -PfabricApiSecret=$FABRIC_API_SECRET + command: ./gradlew testDebug jacocoTestReport coveralls checkstyle pmd lintDebug buildDashboard crashlyticsUploadDistributionDebug -PversionCode=$CIRCLE_BUILD_NUM -PfabricApiKey=$FABRIC_API_KEY -PfabricApiSecret=$FABRIC_API_SECRET - store_artifacts: path: app/build/outputs destination: outputs diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index a9a5a3d..a2d6c52 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -18,7 +18,7 @@ jobs: FABRIC_API_KEY: ${{ secrets.FABRIC_API_KEY }} FABRIC_API_SECRET: ${{ secrets.FABRIC_API_SECRET }} with: - args: "./gradlew testDebug jacocoTestReport checkstyle pmd jdepend lintDebug buildDashboard" + args: "./gradlew testDebug jacocoTestReport checkstyle pmd lintDebug buildDashboard" - name: Distribute uses: vgaidarji/android-github-actions-build@v1.0.1 env: diff --git a/.travis.yml b/.travis.yml index 44f6046..2f08074 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ before_script: - adb shell input keyevent 82 & script: - - ./gradlew clean assembleDebug testDebug jacocoTestReport coveralls checkstyle pmd jdepend lintDebug buildDashboard connectedAndroidTest crashlyticsUploadDistributionDebug -PversionCode=$TRAVIS_BUILD_NUMBER -PfabricApiKey=$FABRIC_API_KEY -PfabricApiSecret=$FABRIC_API_SECRET + - ./gradlew clean assembleDebug testDebug jacocoTestReport coveralls checkstyle pmd lintDebug buildDashboard connectedAndroidTest crashlyticsUploadDistributionDebug -PversionCode=$TRAVIS_BUILD_NUMBER -PfabricApiKey=$FABRIC_API_KEY -PfabricApiSecret=$FABRIC_API_SECRET env: matrix: diff --git a/JENKINS.md b/JENKINS.md index fc344d9..0b20188 100644 --- a/JENKINS.md +++ b/JENKINS.md @@ -68,7 +68,7 @@ In order to build the project we need to have environment variables set in Jenki In "Tasks" section we need to specify a list of Gradle tasks to be invoked. - For example: `clean connectedAndroidTest assembleDebug testDebug jacocoTestReport checkstyle pmd jdepend lintDebug buildDashboard -PversionCode=${BUILD_NUMBER} -PfabricApiKey="YOUR_KEY" -PfabricApiSecret="YOUR_SECRET"` + For example: `clean connectedAndroidTest assembleDebug testDebug jacocoTestReport checkstyle pmd lintDebug buildDashboard -PversionCode=${BUILD_NUMBER} -PfabricApiKey="YOUR_KEY" -PfabricApiSecret="YOUR_SECRET"` 6. Configure reports diff --git a/app/config/quality.gradle b/app/config/quality.gradle index 602ff33..3f615c6 100644 --- a/app/config/quality.gradle +++ b/app/config/quality.gradle @@ -1,6 +1,5 @@ apply plugin: 'pmd' apply plugin: 'build-dashboard' -apply plugin: 'jdepend' apply from: 'config/checkstyle/checkstyle.gradle' android { @@ -49,13 +48,3 @@ task pmd(type: Pmd) { } } } - -task(jdepend, type: JDepend) { - group = "Verification" - description 'Run JDepend plugin' - classesDir = file('build/intermediates/classes/debug/') - reports { - xml.enabled true - text.enabled false - } -} diff --git a/buddybuild_postbuild.sh b/buddybuild_postbuild.sh index b8ac5df..93253f6 100755 --- a/buddybuild_postbuild.sh +++ b/buddybuild_postbuild.sh @@ -3,7 +3,7 @@ echo "Send coverage information to Coveralls" ./gradlew jacocoTestReport coveralls echo "Static code analysis" -./gradlew checkstyle pmd jdepend lintDebug buildDashboard +./gradlew checkstyle pmd lintDebug buildDashboard echo "Send build to Fabric.Beta (disabled, doesn't work)" # doesn't work, no signed APK # ./gradlew crashlyticsUploadDistributionDebug diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 79e949b..7217c2e 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -42,7 +42,7 @@ def buildDebug() { } def staticCodeAnalysis() { - sh "./gradlew checkstyle pmd jdepend lintDebug buildDashboard -PversionCode=${env.BUILD_NUMBER} -PfabricApiKey=${env.FABRIC_API_KEY} -PfabricApiSecret=${env.FABRIC_API_SECRET}" + sh "./gradlew checkstyle pmd lintDebug buildDashboard -PversionCode=${env.BUILD_NUMBER} -PfabricApiKey=${env.FABRIC_API_KEY} -PfabricApiSecret=${env.FABRIC_API_SECRET}" publishLintResults() publishJunitResults() publishJaCoCoCoverage() diff --git a/jenkins/config.xml b/jenkins/config.xml index a08807c..78426bf 100644 --- a/jenkins/config.xml +++ b/jenkins/config.xml @@ -44,7 +44,7 @@ - clean connectedAndroidTest assembleDebug testDebug jacocoTestReport coveralls checkstyle pmd jdepend lintDebug buildDashboard -PversionCode=${BUILD_NUMBER} -PfabricApiKey="" -PfabricApiSecret="" + clean connectedAndroidTest assembleDebug testDebug jacocoTestReport coveralls checkstyle pmd lintDebug buildDashboard -PversionCode=${BUILD_NUMBER} -PfabricApiKey="" -PfabricApiSecret="" ${WORKSPACE}/app/ (Default) diff --git a/shippable.yml b/shippable.yml index 5fef73c..9bd6417 100644 --- a/shippable.yml +++ b/shippable.yml @@ -30,7 +30,7 @@ build: - android list targets - ./ui_tests_on_emulator.sh emulator64-arm # one line build steps (don't want to pass paramaters to every gradlew command) - - ./gradlew clean assembleDebug testDebug jacocoTestReport coveralls checkstyle pmd jdepend lintDebug buildDashboard crashlyticsUploadDistributionDebug -PversionCode=$BUILD_NUMBER + - ./gradlew clean assembleDebug testDebug jacocoTestReport coveralls checkstyle pmd lintDebug buildDashboard crashlyticsUploadDistributionDebug -PversionCode=$BUILD_NUMBER # convert JaCoCo to cobertura - wget -O cover2cover.py https://raw.githubusercontent.com/rix0rrr/cover2cover/master/cover2cover.py - python cover2cover.py $JACOCO_REPORT_LOCATION app/src/main/java > shippable/codecoverage/coverage.xml