diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-03-13 13:45:55 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-03-13 16:47:04 +0100 |
| commit | 0da3da210079387c4b57d154892a7de8f402fd9e (patch) | |
| tree | e2ef6bde285e828fc762e8a30d824dae3c49af37 /android/scripts | |
| parent | 0c8753e4fea5fa26b91486c69e008b4a533de2b7 (diff) | |
| download | mullvadvpn-0da3da210079387c4b57d154892a7de8f402fd9e.tar.xz mullvadvpn-0da3da210079387c4b57d154892a7de8f402fd9e.zip | |
Use lint only when generating a new verification metadata file
Also remove excluded cargo task as it is no longer needed
Diffstat (limited to 'android/scripts')
| -rwxr-xr-x | android/scripts/update-lockfile.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/android/scripts/update-lockfile.sh b/android/scripts/update-lockfile.sh index 36387b0b82..9de05f00a0 100755 --- a/android/scripts/update-lockfile.sh +++ b/android/scripts/update-lockfile.sh @@ -15,12 +15,6 @@ TEMP_GRADLE_PROJECT_CACHE_DIR=$(mktemp -d -t gradle-cache-XXX) # just running the suggested 'help' task isn't sufficient. GRADLE_TASKS=( "lint" - "assemble" - "compileDebugUnitTestKotlin" - "assembleAndroidTest" -) -EXCLUDED_GRADLE_TASKS=( - "-xcargoBuild" ) export GRADLE_OPTS @@ -49,7 +43,7 @@ echo "Generating new components..." # 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[@]}" + ../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M sha256 "$GRADLE_TASK" echo "" done @@ -60,7 +54,7 @@ echo "Temporarily enabling key servers..." sed -Ei 's,key-servers enabled="[^"]+",key-servers enabled="true",' ../gradle/verification-metadata.xml echo "Generating new trusted keys..." -../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M pgp,sha256 "${GRADLE_TASKS[@]}" --export-keys --dry-run "${EXCLUDED_GRADLE_TASKS[@]}" +../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M pgp,sha256 "${GRADLE_TASKS[@]}" --export-keys --dry-run # Move keys from dry run file to existing file. # This part is taken from: https://gitlab.com/fdroid/fdroidclient/-/blob/master/gradle/update-verification-metadata.sh |