diff options
| author | Albin <albin@mullvad.net> | 2024-08-15 16:27:58 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-15 16:43:44 +0200 |
| commit | faabc4e3ad1a7b77d7ed95da3e255c7d15582fac (patch) | |
| tree | 2b014f4606b2f5b181d18e245bbf461c0ff7f909 /android/scripts | |
| parent | cb1df6aef6a3f09123f7ec15611188a245853e0d (diff) | |
| download | mullvadvpn-faabc4e3ad1a7b77d7ed95da3e255c7d15582fac.tar.xz mullvadvpn-faabc4e3ad1a7b77d7ed95da3e255c7d15582fac.zip | |
Refactor lockfile script and gradle tasks
Diffstat (limited to 'android/scripts')
| -rwxr-xr-x | android/scripts/update-lockfile.sh | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/android/scripts/update-lockfile.sh b/android/scripts/update-lockfile.sh index d215da116b..83c8def349 100755 --- a/android/scripts/update-lockfile.sh +++ b/android/scripts/update-lockfile.sh @@ -11,7 +11,18 @@ GRADLE_OPTS="-Dorg.gradle.daemon=false" # We must provide a template for mktemp to work properly on macOS. GRADLE_USER_HOME=$(mktemp -d -t gradle-home-XXX) TEMP_GRADLE_PROJECT_CACHE_DIR=$(mktemp -d -t gradle-cache-XXX) -GRADLE_TASKS=("assemble" "compileDebugUnitTestKotlin" "assembleAndroidTest" "lint") +# Task list to discover all tasks and their dependencies since +# just running the suggested 'help' task isn't sufficient. +GRADLE_TASKS=( + "assemble" + "compileDebugUnitTestKotlin" + "assembleAndroidTest" + "lint" +) +EXCLUDED_GRADLE_TASKS=( + "-xensureRelayListExist" + "-xensureJniDirectoryExist" +) export GRADLE_OPTS export GRADLE_USER_HOME @@ -30,6 +41,12 @@ echo "" echo "Removing old components..." sed -i '/<components>/,/<\/components>/d' ../gradle/verification-metadata.xml +echo "" echo "Generating new components..." -../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M sha256 "${GRADLE_TASKS[@]}" +# Using a loop here since providing all tasks at once result in gradle task dependency issues. +for GRADLE_TASK in "${GRADLE_TASKS[@]}"; do + echo "Gradle task: $GRADLE_TASK" + ../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M sha256 "$GRADLE_TASK" "${EXCLUDED_GRADLE_TASKS[@]}" + echo "" +done |