update-verification-metadata enable kmp by default
Also regenerate the verification metadata
Bug: 229661426
Test: Treehugger runs busytown/androidx.sh
Change-Id: Ib6c4e45f0753708d81b739ddf2ab795d5d70d3cb
diff --git a/development/update-verification-metadata.sh b/development/update-verification-metadata.sh
index 69a7be0..3de0bcd 100755
--- a/development/update-verification-metadata.sh
+++ b/development/update-verification-metadata.sh
@@ -1,12 +1,17 @@
#!/bin/bash
set -e
+function runGradle() {
+ kmpArgs="-Pandroidx.compose.multiplatformEnabled=true -Pandroidx.kmp.native.enabled=true"
+ ./gradlew $kmpArgs "$@"
+}
+
# This script regenerates signature-related information (dependency-verification-metadata and keyring)
function regenerateTrustedKeys() {
echo "regenerating list of trusted keys"
# regenerate metadata
# Need to run a clean build, https://github.com/gradle/gradle/issues/19228
- ./gradlew --write-verification-metadata pgp,sha256 --dry-run --clean bOS
+ runGradle --write-verification-metadata pgp,sha256 --dry-run --clean bOS
# extract and keep only the <trusted-keys> section
WORK_DIR=gradle/update-keys-temp
rm -rf "$WORK_DIR"
@@ -40,7 +45,7 @@
function regenerateKeyring() {
# a separate step from regenerating the verification metadata, https://github.com/gradle/gradle/issues/20138
echo "regenerating keyring"
- ./gradlew --write-verification-metadata sha256 --export-keys --dry-run bOS
+ runGradle --write-verification-metadata sha256 --export-keys --dry-run bOS
echo "sorting keyring and removing duplicates"
# sort and unique the keyring
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c6b7dd8..d9d3760 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -71,6 +71,7 @@
<trusted-key id="1f8cf885d537a431" group="com.nhaarman.mockitokotlin2"/>
<trusted-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" group="de.undercouch"/>
<trusted-key id="205c8673dc742c7c" group="org.apache"/>
+ <trusted-key id="20723a6399bc060154283b37cfae163b64ac9189" group="org.jetbrains.skiko"/>
<trusted-key id="21200d723f53ce38" group="com.squareup.leakcanary"/>
<trusted-key id="218fa0f6a941a037" group="com.github.kevinstern"/>
<trusted-key id="21939ff0ca2a6567" group="commons-codec"/>
