Configure to only use armored keyring format
By default gradle generates both gpg and keys (armored) keyrings.
Starting with Gradle 8.5 we can explicitly choose what to use.
https://docs.gradle.org/8.5/release-notes.html#dependency-verification-improvements
This allows us to remove the need for update-verification-metadata.sh
to delete the unused gpg files.
Test: ./gradlew bOS --export-keys -> no gpg file generated
Change-Id: I16a574e51c5e0e0a2a221a0c90201971370dfc2a
diff --git a/development/update-verification-metadata.sh b/development/update-verification-metadata.sh
index e588ec0..70b1472 100755
--- a/development/update-verification-metadata.sh
+++ b/development/update-verification-metadata.sh
@@ -73,10 +73,6 @@
# rename keyring
mv gradle/verification-keyring-dryrun.keys gradle/verification-keyring.keys 2>/dev/null || true
-
- # remove temporary files
- rm -f gradle/verification-keyring-dryrun.gpg
- rm -f gradle/verification-keyring.gpg
}
regenerateVerificationMetadata
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e0c828e..db05fd8 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- To regenerate this file, run development/update-verification-metadata.sh -->
-<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.2.xsd">
+<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.3.xsd">
<configuration>
<verify-metadata>true</verify-metadata>
<verify-signatures>true</verify-signatures>
+ <keyring-format>armored</keyring-format>
<key-servers enabled="false">
<key-server uri="https://keyserver.ubuntu.com"/>
<key-server uri="https://keys.openpgp.org"/>
