Update keys again

android/gradle/verification-keyring.keys

@@ -1976,6 +1976,74 @@ tCdTcXVhcmUgQ2xpcHB5IDxvcGVuc291cmNlQHNxdWFyZXVwLmNvbT4=
 -----END PGP PUBLIC KEY BLOCK-----
 
 
+pub    6A65176A0FB1CD0B
+sub    EA8543C570FAF804
+sub    CA890A5FA09CFD80
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+pjR9iVjH1oML0H5i1H4=
+=MfhW
+-----END PGP PUBLIC KEY BLOCK-----
+
+
 pub    6D088D202BEC9088
 uid    Rafael Costa <[email protected]>
 

android/gradle/verification-metadata.xml

@@ -27,13 +27,13 @@
          <trust file=".*[.]pom" regex="true"/>
       </trusted-artifacts>
       <ignored-keys>
-         <ignored-key id="1427500BB1D27520" reason="Key couldn't be downloaded from any key server"/>
+         <ignored-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181" reason="Key couldn't be downloaded from any key server"/>
-         <ignored-key id="3D002DBC5EA9615F" reason="Key couldn't be downloaded from any key server"/>
-         <ignored-key id="3D12CA2AC19F3181" reason="Key couldn't be downloaded from any key server"/>
-         <ignored-key id="8E3A02905A1AE67E7B0F9ACD3967D4EDA591B991" reason="Key couldn't be downloaded from any key server" />
-         <ignored-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" reason="Key couldn't be downloaded from any key server" />
+         <ignored-key id="8E3A02905A1AE67E7B0F9ACD3967D4EDA591B991" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="CA183FBA1E476C6E" reason="Key couldn't be downloaded from any key server"/>
+         <ignored-key id="84E913A8E3A748C0" reason="Key couldn't be downloaded from any key server"/>
+         <ignored-key id="6A65176A0FB1CD0B" reason="Key couldn't be downloaded from any key server"/>
+         <ignored-key id="0CC641C3A62453AB390066C4A41F13C999945293" reason="Key couldn't be downloaded from any key server"/>
       </ignored-keys>
       <trusted-keys>
          <trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5">

android/scripts/update-lockfile-keys.sh

@@ -43,12 +43,7 @@ sed -Ei 's,key-servers enabled="[^"]+",key-servers enabled="true",' ../gradle/ve
 # Generate keys
 
 echo "Generating new trusted keys..."
-# 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 pgp,sha256 "$GRADLE_TASK" --export-keys --dry-run "${EXCLUDED_GRADLE_TASKS[@]}"
-    echo ""
-done
+../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M pgp,sha256 "${GRADLE_TASKS[@]}" --export-keys --dry-run "${EXCLUDED_GRADLE_TASKS[@]}"
 
 # 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)
 # extract the middle of the new file, https://github.com/gradle/gradle/issues/18569