Skip to content

Commit

Permalink
Remove jdepend plugin integration
Browse files Browse the repository at this point in the history
Soon will migrate from Java to Kotlin
and jdepend won't be used anymore
  • Loading branch information
vgaidarji committed Oct 6, 2023
1 parent e14a3e8 commit 526da63
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .bitrise-with-ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ workflows:
- [email protected]:
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: ''
Expand Down
4 changes: 2 additions & 2 deletions .bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
# - [email protected]:
# 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: ''
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
env:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion JENKINS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 0 additions & 11 deletions app/config/quality.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
apply plugin: 'pmd'
apply plugin: 'build-dashboard'
apply plugin: 'jdepend'
apply from: 'config/checkstyle/checkstyle.gradle'

android {
Expand Down Expand Up @@ -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
}
}
2 changes: 1 addition & 1 deletion buddybuild_postbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion jenkins/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<hudson.plugins.gradle.Gradle plugin="[email protected]">
<description></description>
<switches></switches>
<tasks>clean connectedAndroidTest assembleDebug testDebug jacocoTestReport coveralls checkstyle pmd jdepend lintDebug buildDashboard -PversionCode=${BUILD_NUMBER} -PfabricApiKey=&quot;&quot; -PfabricApiSecret=&quot;&quot;</tasks>
<tasks>clean connectedAndroidTest assembleDebug testDebug jacocoTestReport coveralls checkstyle pmd lintDebug buildDashboard -PversionCode=${BUILD_NUMBER} -PfabricApiKey=&quot;&quot; -PfabricApiSecret=&quot;&quot;</tasks>
<rootBuildScriptDir>${WORKSPACE}/app/</rootBuildScriptDir>
<buildFile></buildFile>
<gradleName>(Default)</gradleName>
Expand Down
2 changes: 1 addition & 1 deletion shippable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 526da63

Please sign in to comment.