Skip to content

Commit 4220be6

Browse files
committed
Run all tasks
1 parent db985b3 commit 4220be6

File tree

2 files changed

+36
-6
lines changed

2 files changed

+36
-6
lines changed

android/gradle/verification-metadata.xml

+18-4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
<trust file=".*-sources[.]jar" regex="true"/>
2626
<trust file=".*[.]pom" regex="true"/>
2727
</trusted-artifacts>
28+
<ignored-keys>
29+
<ignored-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181" reason="Key couldn't be downloaded from any key server"/>
30+
<ignored-key id="3D12CA2AC19F3181" reason="Key couldn't be downloaded from any key server"/>
31+
</ignored-keys>
2832
<trusted-keys>
2933
<trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5">
3034
<trusting group="org.glassfish.jaxb"/>
@@ -33,6 +37,7 @@
3337
</trusted-key>
3438
<trusted-key id="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5" group="^org[.]apache[.]httpcomponents($|([.].*))" regex="true"/>
3539
<trusted-key id="08F0AAB4D0C1A4BDDE340765B341DDB020FCB6AB" group="org.bouncycastle"/>
40+
<trusted-key id="09939C73246B4BA7444CAA453D002DBC5EA9615F" group="dev.drewhamilton.poko"/>
3641
<trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293" group="commons-collections"/>
3742
<trusted-key id="0CFA413799E2464C7D7E26220A4B343F2A55FDAE" group="com.h2database" name="h2"/>
3843
<trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty"/>
@@ -46,15 +51,15 @@
4651
<trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework" name="checker-qual"/>
4752
<trusted-key id="1A55F091AD28C07F831FA44D7905DE25C78AD456" group="com.google.protobuf"/>
4853
<trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins"/>
54+
<trusted-key id="1D85469D8559C2E1DF5F925131D2D79DF7E85DD3" group="org.jcommander" name="jcommander"/>
4955
<trusted-key id="1DBB44E80F61493D6369B5FB95C15058A5EDA4F1" group="com.google.gradle" name="osdetector-gradle-plugin"/>
5056
<trusted-key id="1DE48A38424721249780C6A8C7DFF5A8DBC5381C" group="io.arrow-kt"/>
51-
<trusted-key id="20723A6399BC060154283B37CFAE163B64AC9189" group="^org[.]jetbrains($|([.].*))" regex="true"/>
57+
<trusted-key id="20723A6399BC060154283B37CFAE163B64AC9189" group="org.jetbrains.compose.runtime"/>
5258
<trusted-key id="24D04176586361FDA94EE0315F7786DF73E61F56" group="com.google.devtools.ksp"/>
5359
<trusted-key id="259A55407DD6C00299E6607EFFDE55BE73A2D1ED">
5460
<trusting group="io.github.jeremylong"/>
5561
<trusting group="org.owasp"/>
5662
</trusted-key>
57-
<trusted-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181" group="^com[.]fasterxml($|([.].*))" regex="true"/>
5863
<trusted-key id="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD" group="^org[.]sonatype($|([.].*))" regex="true"/>
5964
<trusted-key id="2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB">
6065
<trusting group="commons-codec"/>
@@ -66,13 +71,16 @@
6671
<trusted-key id="2E3A1AFFE42B5F53AF19F780BCF4173966770193" group="org.jetbrains" name="annotations"/>
6772
<trusted-key id="3051D45031E13516A6E8FAFF280D66A55F5316C5" group="org.bitbucket.b_c" name="jose4j"/>
6873
<trusted-key id="31BAE2E51D95E0F8AD9B7BCC40A3C4432BD7308C" group="com.googlecode.juniversalchardet" name="juniversalchardet"/>
74+
<trusted-key id="32118CF76C9EC5D918E54967CA80D1F0EB6CA4BA" group="org.codehaus.mojo"/>
6975
<trusted-key id="33FD4BFD33554634053D73C0C2148900BCD3C2AF" group="org.jetbrains" name="annotations"/>
7076
<trusted-key id="350C5D75D04AA599CBAD22348D5059F2B1927A9A" group="com.lemonappdev" name="konsist"/>
7177
<trusted-key id="3690C240CE51B4670D30AD1C38EE757D69184620" group="org.tukaani" name="xz"/>
78+
<trusted-key id="3E46916ED513BEFDEAA9A14AA6BC6A2C25A6479C" group="app.cash.turbine"/>
7279
<trusted-key id="447C96E2C6AE137D1DC239B85A456ADE180A42C5" group="com.ncorti.ktfmt.gradle" name="plugin"/>
7380
<trusted-key id="45B1912987CB9DFA6A0D9693067091F1549B293F" group="org.semver4j" name="semver4j"/>
7481
<trusted-key id="47504B76CF89C15C0512D9AFE16AB52D79FD224F" group="^com[.]google($|([.].*))" regex="true"/>
7582
<trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325" group="org.slf4j"/>
83+
<trusted-key id="47BF592261CD1A8A69B703B4E0CB7823CFD00FBF" group="com.jakewharton.android.repackaged" name="dalvik-dx"/>
7684
<trusted-key id="47EF0EC60C210BC6DFAA5819B7AE15C15C321C44" group="jakarta.transaction" name="jakarta.transaction-api"/>
7785
<trusted-key id="4880ADC91C17426D0B061C89E8EBCFC35DF57B34" group="io.insert-koin"/>
7886
<trusted-key id="4BF79B8259007B566D2FCE82296CD27F60EED12C" group="com.google.crypto.tink" name="tink"/>
@@ -90,6 +98,7 @@
9098
<trusted-key id="517B94F8D0A46317A28D8AB30DA8A5EC02D11EAD" group="net.sf.jopt-simple" name="jopt-simple"/>
9199
<trusted-key id="5897253BEA3046AEEA95A067E93671C7272B7B3F" group="org.jdom" name="jdom2"/>
92100
<trusted-key id="599A4719D6C63080E1A8000520F85E1C160E0716" group="org.whitesource" name="pecoff4j"/>
101+
<trusted-key id="59B06224FD8912E36603BE79FEFE78456EDDC34A" group="io.mockk"/>
93102
<trusted-key id="5D283C23D9D9DC2D9C2130E6AADF2C18DCF95764">
94103
<trusting group="com.github.package-url"/>
95104
<trusting group="us.springett"/>
@@ -128,8 +137,10 @@
128137
<trusted-key id="8569C95CADC508B09FE90F3002216ED811210DAA" group="io.github.detekt.sarif4k"/>
129138
<trusted-key id="8756C4F765C9AC3CB6B85D62379CE192D401AB61" group="^org[.]jetbrains($|([.].*))" regex="true"/>
130139
<trusted-key id="8858D45BE9B276802318155B96FB9DB219F3338D" group="kr.motd.maven" name="os-maven-plugin"/>
140+
<trusted-key id="8DF3B0AA23ED78BE5233F6C2DEA3D207428EF16D" group="com.linkedin.dexmaker" name="dexmaker"/>
131141
<trusted-key id="8E3A02905A1AE67E7B0F9ACD3967D4EDA591B991" group="org.jetbrains.kotlinx" name="kotlinx-html-jvm"/>
132142
<trusted-key id="90EE19787A7BCF6FD37A1E9180C08B1C29100955" group="com.squareup" name="javawriter"/>
143+
<trusted-key id="99203D5A6468D757069CED511427500BB1D27520" group="io.exoquery" name="pprint-kotlin"/>
133144
<trusted-key id="A22931805BEA371C4B607CD9CCC16740C5666D5A" group="com.github.spullara.mustache.java"/>
134145
<trusted-key id="A28F589583F054D3114DF28FE561F0025AC4B54C" group="com.hankcs" name="aho-corasick-double-array-trie"/>
135146
<trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="com.google.code.findbugs" name="jsr305"/>
@@ -138,6 +149,7 @@
138149
<trusting group="androidx.activity"/>
139150
<trusting group="androidx.annotation"/>
140151
<trusting group="androidx.appcompat"/>
152+
<trusting group="androidx.collection"/>
141153
<trusting group="androidx.core"/>
142154
<trusting group="androidx.graphics"/>
143155
<trusting group="androidx.lifecycle"/>
@@ -146,6 +158,7 @@
146158
<trusting group="^androidx[.]test($|([.].*))" regex="true"/>
147159
</trusted-key>
148160
<trusted-key id="A6D6C97108B8585F91B158748671A8DF71296252" group="^com[.]squareup($|([.].*))" regex="true"/>
161+
<trusted-key id="A7892505CF1A58076453E52D7999BEFBA1039E8B" group="net.bytebuddy"/>
149162
<trusted-key id="A9F885A21BA0EFB7D0991E6CCAF5EC5919FEA27D" group="commons-digester" name="commons-digester"/>
150163
<trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j" name="project"/>
151164
<trusted-key id="B02335AA54CCF21E52BBF9ABD9C565AA72BA2FDD">
@@ -162,11 +175,10 @@
162175
</trusted-key>
163176
<trusted-key id="B83EB43C8884D8D8B2320940C72D9D97378E9A64" group="com.github.triplet.gradle"/>
164177
<trusted-key id="BCC135FC7ED8214F823D73E97FE9900F412D622E" group="com.google.flatbuffers" name="flatbuffers-java"/>
165-
<trusted-key id="BDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE" group="com.google.guava"/>
178+
<trusted-key id="BDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE" group="^com[.]google($|([.].*))" regex="true"/>
166179
<trusted-key id="C0612048F3393B80B22639B4F067A2FD751AE3E4" group="io.github.davidburstrom.contester" name="contester-breakpoint"/>
167180
<trusted-key id="C59362A11366D431E292AA32075DEF3EF14F0793" group="com.moandjiezana.toml" name="toml4j"/>
168181
<trusted-key id="C6F7D1C804C821F49AF3BFC13AD93C3C677A106E" group="io.perfmark" name="perfmark-api"/>
169-
<trusted-key id="C70B844F002F21F6D2B9C87522E44AC0622B91C3" group="com.beust" name="jcommander"/>
170182
<trusted-key id="C7BE5BCC9FEC15518CFDA882B0F3710FA64900E7" group="^com[.]google($|([.].*))" regex="true"/>
171183
<trusted-key id="CC57399D74CD7E4768ED6FA4CA62973FBF0451C0" group="com.vaadin.external.google" name="android-json"/>
172184
<trusted-key id="CE0E1BC443809579D8718F4FB943F5CB616566CD" group="^de[.]mannodermaus($|([.].*))" regex="true"/>
@@ -177,10 +189,12 @@
177189
<trusted-key id="D6F1BC78607808EC8E9F69437A8860944FAD5F62" group="org.apache.commons" name="commons-parent"/>
178190
<trusted-key id="DB0597E3144342256BC81E3EC727D053C4481CF5" group="org.tensorflow" name="tensorflow-lite-metadata"/>
179191
<trusted-key id="DBD744ACE7ADE6AA50DD591F66B50994442D2D40" group="^com[.]squareup($|([.].*))" regex="true"/>
192+
<trusted-key id="DF3986523A6AD079C46B730BCA183FBA1E476C6E" group="com.squareup.leakcanary"/>
180193
<trusted-key id="E4EDD17FF6346F018F6FC7F34871433C7653D10C" group="net.gpedro.integrations.slack" name="slack-webhook"/>
181194
<trusted-key id="E77417AC194160A3FABD04969A259C7EE636C5ED" group="com.google.errorprone"/>
182195
<trusted-key id="E7DC75FC24FB3C8DFE8086AD3D5839A2262CBBFB" group="org.jetbrains.kotlinx"/>
183196
<trusted-key id="E80EADEA55B8CA4AC11237EBAD26515E93BE1A0B" group="com.squareup.curtains" name="curtains"/>
197+
<trusted-key id="E85AED155021AF8A6C6B7A4A7C7D8456294423BA" group="org.objenesis"/>
184198
<trusted-key id="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446" group="com.google.j2objc" name="j2objc-annotations"/>
185199
<trusted-key id="EBB4A00DDEFB45874C6984D3FDC09E28DF98A023" group="io.grpc"/>
186200
<trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320" group="^com[.]google($|([.].*))" regex="true"/>

android/scripts/update-lockfile-keys.sh

+18-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,24 @@ cd "$SCRIPT_DIR"
99
# regardless if stopped.
1010
GRADLE_OPTS="-Dorg.gradle.daemon=false"
1111
# We must provide a template for mktemp to work properly on macOS.
12+
GRADLE_USER_HOME=$(mktemp -d -t gradle-home-XXX)
1213
TEMP_GRADLE_PROJECT_CACHE_DIR=$(mktemp -d -t gradle-cache-XXX)
14+
# Task list to discover all tasks and their dependencies since
15+
# just running the suggested 'help' task isn't sufficient.
16+
GRADLE_TASKS=(
17+
"assemble"
18+
"compileDebugUnitTestKotlin"
19+
"assembleAndroidTest"
20+
"lint"
21+
)
1322
EXCLUDED_GRADLE_TASKS=(
1423
"-xensureRelayListExist"
1524
"-xensureJniDirectoryExist"
1625
)
1726

27+
export GRADLE_OPTS
28+
export GRADLE_USER_HOME
29+
1830
function cleanup {
1931
echo "Cleaning up temp dirs..."
2032
rm -rf -- "$TEMP_GRADLE_PROJECT_CACHE_DIR" ../gradle/verification-metadata.dryrun.xml
@@ -28,8 +40,12 @@ echo ""
2840
# Generate keys
2941

3042
echo "Generating new trusted keys..."
31-
../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M pgp,sha256 help --dry-run "${EXCLUDED_GRADLE_TASKS[@]}"
32-
echo ""
43+
# Using a loop here since providing all tasks at once result in gradle task dependency issues.
44+
for GRADLE_TASK in "${GRADLE_TASKS[@]}"; do
45+
echo "Gradle task: $GRADLE_TASK"
46+
../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M pgp,sha256 "$GRADLE_TASK" --dry-run "${EXCLUDED_GRADLE_TASKS[@]}"
47+
echo ""
48+
done
3349

3450
# 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)
3551
# extract the middle of the new file, https://github.com/gradle/gradle/issues/18569

0 commit comments

Comments
 (0)