Skip to content

Commit e7f1d4c

Browse files
committed
Only use lint when generating a new verification metadata file
1 parent 3676cb6 commit e7f1d4c

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

android/scripts/update-lockfile.sh

+2-8
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ TEMP_GRADLE_PROJECT_CACHE_DIR=$(mktemp -d -t gradle-cache-XXX)
1515
# just running the suggested 'help' task isn't sufficient.
1616
GRADLE_TASKS=(
1717
"lint"
18-
"assemble"
19-
"compileDebugUnitTestKotlin"
20-
"assembleAndroidTest"
21-
)
22-
EXCLUDED_GRADLE_TASKS=(
23-
"-xcargoBuild"
2418
)
2519

2620
export GRADLE_OPTS
@@ -49,7 +43,7 @@ echo "Generating new components..."
4943
# Using a loop here since providing all tasks at once result in gradle task dependency issues.
5044
for GRADLE_TASK in "${GRADLE_TASKS[@]}"; do
5145
echo "Gradle task: $GRADLE_TASK"
52-
../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M sha256 "$GRADLE_TASK" "${EXCLUDED_GRADLE_TASKS[@]}"
46+
../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M sha256 "$GRADLE_TASK"
5347
echo ""
5448
done
5549

@@ -60,7 +54,7 @@ echo "Temporarily enabling key servers..."
6054
sed -Ei 's,key-servers enabled="[^"]+",key-servers enabled="true",' ../gradle/verification-metadata.xml
6155

6256
echo "Generating new trusted keys..."
63-
../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M pgp,sha256 "${GRADLE_TASKS[@]}" --export-keys --dry-run "${EXCLUDED_GRADLE_TASKS[@]}"
57+
../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M pgp,sha256 "${GRADLE_TASKS[@]}" --export-keys --dry-run
6458

6559
# Move keys from dry run file to existing file.
6660
# This part is taken from: https://gitlab.com/fdroid/fdroidclient/-/blob/master/gradle/update-verification-metadata.sh

0 commit comments

Comments
 (0)