Revert "Revert "Bump upstream-dokka-KMP-docs to use same version..."
Revert submission 2470721-revert-2459729-dokka-upstream-1.8.10-dev-203-LQPEJAVZNM
Reason for revert: Re-land with fix
Reverted changes: /q/submissionid:2470721-revert-2459729-dokka-upstream-1.8.10-dev-203-LQPEJAVZNM
Change-Id: I5631357d8b5b41a5a1069041a70bc85ba1505cf3
diff --git a/development/update-verification-metadata.sh b/development/update-verification-metadata.sh
index bff975b..90720f2 100755
--- a/development/update-verification-metadata.sh
+++ b/development/update-verification-metadata.sh
@@ -17,7 +17,7 @@
echo "regenerating verification metadata and keyring"
# regenerate metadata
# Need to run a clean build, https://github.com/gradle/gradle/issues/19228
- runGradle --stacktrace --write-verification-metadata pgp,sha256 --export-keys --dry-run --clean bOS
+ runGradle --stacktrace --write-verification-metadata pgp,sha256 --export-keys --dry-run --clean bOS :docs-kmp:zipCombinedKmpDocs
# update verification metadata file
# also remove 'version=' lines, https://github.com/gradle/gradle/issues/20192
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0a6e37b..ced557b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@
cmake = "3.22.1"
dagger = "2.44"
dexmaker = "2.28.3"
-dokka = "1.7.20"
+dokka = "1.8.10-dev-203"
espresso = "3.5.1"
espressoDevice = "1.0.0-alpha03"
grpc = "1.52.0"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index ea9eb2d..26e0481 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1,6 +1,5 @@
<?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">
<configuration>
<verify-metadata>true</verify-metadata>
@@ -30,6 +29,9 @@
<trust group="^androidx($|([.].*))" regex="true" reason="not signed yet"/>
<trust group="^com[.]android($|([.].*))" regex="true" reason="b/215430394"/>
</trusted-artifacts>
+ <ignored-keys>
+ <ignored-key id="3d12ca2ac19f3181" reason="Key couldn't be downloaded from any key server"/>
+ </ignored-keys>
<trusted-keys>
<trusted-key id="00089ee8c3afa95a854d0f1df800dd0933ecf7f7" group="com.google.guava"/>
<trusted-key id="019082bc00e0324e2aef4cf00d3b328562a119a7" group="org.openjdk.jmh"/>
@@ -94,6 +96,7 @@
<trusted-key id="24d04176586361fda94ee0315f7786df73e61f56" group="com.google.devtools.ksp"/>
<trusted-key id="26063b04869f7d235ccc057447586a1b75ef0de5" group="com.squareup.wire"/>
<trusted-key id="263923711ef4fe3f3f0c28af11509ed50ec155e6" group="org.reactivestreams"/>
+ <trusted-key id="28118c070cb22a0175a2e8d43d12ca2ac19f3181" group="com.fasterxml.jackson.core" name="jackson-databind" version="2.12.7.1"/>
<trusted-key id="2a4f55d9cda5877731fbe7466eff5ef5523052d4" group="com.github.tschuchortdev"/>
<trusted-key id="2bab4466b44f54f8f99bbbdd5ed22f661bbf0acc" group="com.almworks.sqlite4java"/>
<trusted-key id="2bcbdd0f23ea1cafcc11d4860374cf2e8dd1bdfd">
@@ -434,6 +437,14 @@
<sha256 value="8a31a27a776ba55974936b897be76edca1cf871d9ae75537e593a7f1b83380e9" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-x86_64-1.8.10.tar.gz"/>
</artifact>
</component>
+ <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.12.7.1">
+ <artifact name="jackson-databind-2.12.7.1.jar">
+ <sha256 value="3f504cac405ce066d5665ff69541484d5322f35ac7a7ec6104cf86a01008e02d" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+ </artifact>
+ <artifact name="jackson-databind-2.12.7.1.module">
+ <sha256 value="d34c2b230198d8b2d39a2ad14710d6c92271c07848c432a40e1d471594a229a6" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="com.github.gundy" name="semver4j" version="0.16.4">
<artifact name="semver4j-0.16.4-nodeps.jar">
<sha256 value="3f59eca516374ccd4fd3551625bf50f8a4b191f700508f7ce4866460a6128af0" origin="Generated by Gradle"/>
@@ -448,12 +459,12 @@
<sha256 value="cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
- <component group="com.google.ads.interactivemedia.v3" name="interactivemedia" version="3.29.0" androidx:reason="Unsigned. Used by media3.">
+ <component group="com.google.ads.interactivemedia.v3" name="interactivemedia" version="3.29.0">
<artifact name="interactivemedia-3.29.0.jar">
- <sha256 value="4d9b94444b8eea1637435c8f0598ee9f86c05ade73b1e8911dc16494013c379a" origin="Generated by Gradle"/>
+ <sha256 value="4d9b94444b8eea1637435c8f0598ee9f86c05ade73b1e8911dc16494013c379a" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="interactivemedia-3.29.0.pom">
- <sha256 value="9fb18fd29b9dfe2e7ed5fe98a3be433a4c3cc4ea8f47f2b444155c39b4afddf5" origin="Generated by Gradle"/>
+ <sha256 value="9fb18fd29b9dfe2e7ed5fe98a3be433a4c3cc4ea8f47f2b444155c39b4afddf5" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.google.android.apps.common.testing.accessibility.framework" name="accessibility-test-framework" version="2.1">
@@ -474,10 +485,10 @@
</component>
<component group="com.google.android.libraries.identity.googleid" name="googleid" version="0.0.2">
<artifact name="googleid-0.0.2.aar">
- <sha256 value="ae69047587928df1ff82ce71e9f2ec40a777270f04f4a6d1f66241944961b682" origin="Generated by Gradle"/>
+ <sha256 value="ae69047587928df1ff82ce71e9f2ec40a777270f04f4a6d1f66241944961b682" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="googleid-0.0.2.pom">
- <sha256 value="100a2c6db1ec4aab9545ead93be094c9728ecc671fba8353648d04ef405f30c8" origin="Generated by Gradle"/>
+ <sha256 value="100a2c6db1ec4aab9545ead93be094c9728ecc671fba8353648d04ef405f30c8" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.google.android.odml" name="image" version="1.0.0-beta1">
@@ -655,14 +666,6 @@
<sha256 value="31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
- <component group="org.chromium.net" name="cronet-api" version="72.3626.96" androidx:reason="Unsigned. Used by media3.">
- <artifact name="cronet-api-72.3626.96.aar">
- <sha256 value="6542c0377f00f38e2c707cc3ade1607843f572342cc798b38b78897f7d8ec248" origin="Generated by Gradle"/>
- </artifact>
- <artifact name="cronet-api-72.3626.96.pom">
- <sha256 value="8d25d21f7f2aca27dc10638ad417bbb08a189310274bc322aa620aafe7e82c92" origin="Generated by Gradle"/>
- </artifact>
- </component>
<component group="org.apache" name="apache" version="15">
<artifact name="apache-15.pom">
<pgp value="6bdaca2c0493cca133b372d09c4f7e9d98b1cc53"/>
@@ -706,6 +709,14 @@
<sha256 value="186fd460ee13150e31188703a2c871bf86e20332636f3ede4ab959cd5568da78" origin="Generated by Gradle"/>
</artifact>
</component>
+ <component group="org.chromium.net" name="cronet-api" version="72.3626.96">
+ <artifact name="cronet-api-72.3626.96.aar">
+ <sha256 value="6542c0377f00f38e2c707cc3ade1607843f572342cc798b38b78897f7d8ec248" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ <artifact name="cronet-api-72.3626.96.pom">
+ <sha256 value="8d25d21f7f2aca27dc10638ad417bbb08a189310274bc322aa620aafe7e82c92" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
<component group="org.codehaus.mojo" name="mojo-parent" version="40">
<artifact name="mojo-parent-40.pom">
<pgp value="d433f9c895710db8ab087fa6b7c3b43d18eaa8b7"/>
@@ -716,6 +727,70 @@
<pgp value="720746177725a89207a7075bfd5dea07fcb690a8"/>
</artifact>
</component>
+ <component group="org.jetbrains.dokka" name="all-modules-page-plugin" version="1.8.10-dev-203">
+ <artifact name="all-modules-page-plugin-1.8.10-dev-203.jar">
+ <sha256 value="d750c52b0f2ad66ff5bdee04ecc6ba50b9eb7e02720abec455aff33635112524" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ <artifact name="all-modules-page-plugin-1.8.10-dev-203.module">
+ <sha256 value="317e08d873f54310e1fcbfe5a4509367c2d3c26a65cf6f01937b700ed5db8b4e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
+ <component group="org.jetbrains.dokka" name="android-documentation-plugin" version="1.8.10-dev-203">
+ <artifact name="android-documentation-plugin-1.8.10-dev-203.jar">
+ <sha256 value="388125760e133d6cf80d8277990532a8037ba29c9beb57f8daf4f268f0e9a6ed" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ <artifact name="android-documentation-plugin-1.8.10-dev-203.module">
+ <sha256 value="5653f9361ed738ddff84ff5a4a2aef26e5983113ec7cac6a7e9d14d51b7f0905" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
+ <component group="org.jetbrains.dokka" name="dokka-analysis" version="1.8.10-dev-203">
+ <artifact name="dokka-analysis-1.8.10-dev-203.jar">
+ <sha256 value="f92acffcf55a8ecd1ca1d86224fe9c0477c2efc2f2a80a3541250620dab31c3f" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ <artifact name="dokka-analysis-1.8.10-dev-203.module">
+ <sha256 value="0ca9f55d947ec7c03a1169a67f8ec328c135efb359621a80a633aca53d5ba278" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
+ <component group="org.jetbrains.dokka" name="dokka-base" version="1.8.10-dev-203">
+ <artifact name="dokka-base-1.8.10-dev-203.jar">
+ <sha256 value="87a7737029f32a602bd5e04146e5919b46be2eadbacf5ad7bd151f78d6caf1ff" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ <artifact name="dokka-base-1.8.10-dev-203.module">
+ <sha256 value="842b421bd24ac2a154dd6b10f358eb31ed5d498340b75898c68e88ff72f14714" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
+ <component group="org.jetbrains.dokka" name="dokka-cli" version="1.8.10-dev-203">
+ <artifact name="dokka-cli-1.8.10-dev-203.jar">
+ <sha256 value="aac1f51acff796df791343aab7e52c7d1828c14811c63aeb17d8b4f2815f1433" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ <artifact name="dokka-cli-1.8.10-dev-203.pom">
+ <sha256 value="18e6494b8198025538bc36f4ed81cbcb61c72c6d2d9fdb0162d0981404f65bac" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
+ <component group="org.jetbrains.dokka" name="kotlin-analysis-compiler" version="1.8.10-dev-203">
+ <artifact name="kotlin-analysis-compiler-1.8.10-dev-203.jar">
+ <sha256 value="a220e6566c17fdf57e66bc76678876dcb5a1605a00107561588209df84700e2e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ <artifact name="kotlin-analysis-compiler-1.8.10-dev-203.pom">
+ <sha256 value="11479e6eea4f5d6758e5993e3240ceeb9ac2f19de043cdacba2a10c39d1ce6b4" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
+ <component group="org.jetbrains.dokka" name="kotlin-analysis-intellij" version="1.8.10-dev-203">
+ <artifact name="kotlin-analysis-intellij-1.8.10-dev-203.jar">
+ <sha256 value="7e8fa87cfe4aa342844e571cd6d71274e4ef0694f90c64527b534603cd2a8545" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ <artifact name="kotlin-analysis-intellij-1.8.10-dev-203.pom">
+ <sha256 value="16bb57be30478e0a2f9ec0923aa4ca362c55c511282c01ad7d92d7dc1f8823c3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
+ <component group="org.jetbrains.dokka" name="templating-plugin" version="1.8.10-dev-203">
+ <artifact name="templating-plugin-1.8.10-dev-203.jar">
+ <sha256 value="30b12682ffe08a886f8a78ee1df307c36a23dec5764c580665924d7fac9ba2d9" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ <artifact name="templating-plugin-1.8.10-dev-203.module">
+ <sha256 value="0eadb5d9052cf9cd3e2da9681c8de8367a272b524b4915c3b11eb87e789655b6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
<component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.3.71">
<artifact name="kotlin-reflect-1.3.71.pom">
<sha256 value="4df94aaeee8d900be431386e31ef44e82a66e57c3ae30866aec2875aff01fe70" origin="Generated by Gradle"/>
