[tor-commits] [tor-browser-build/maint-10.0-android] Bug 40259: Update components for mozilla88-based Fenix (android-components part)

sysrqb at torproject.org sysrqb at torproject.org
Thu May 6 03:59:31 UTC 2021


commit 960d035da16bb8c247ea2a98b6280b1ac8fa1c1d
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Apr 9 18:47:52 2021 +0200

    Bug 40259: Update components for mozilla88-based Fenix (android-components part)
---
 projects/android-components/build                  |   2 +-
 projects/android-components/config                 |  16 +-
 .../gradle-dependencies-list.txt                   | 186 ++++++++++-----------
 projects/android-components/mavenLocal.patch       |  29 ++--
 4 files changed, 119 insertions(+), 114 deletions(-)

diff --git a/projects/android-components/build b/projects/android-components/build
index 279525c..896ba3a 100644
--- a/projects/android-components/build
+++ b/projects/android-components/build
@@ -44,7 +44,7 @@ patch -p1 < $rootdir/git.patch
   gradle --debug --no-daemon assemble
 [% ELSE %]
   # Prepare Glean dependencies for offline build
-  tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2
+  tar -xf $rootdir/[% c('input_files_by_name/glean') %]
   # We need to set `LC_ALL` and `LANG` to something that is not ASCII as encoding
   # otherwise `click` barfs. See: https://click.palletsprojects.com/python3/
   export LC_ALL=C.UTF-8
diff --git a/projects/android-components/config b/projects/android-components/config
index ce9eafd..531b278 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -8,16 +8,17 @@ gpg_keyring: torbutton.gpg
 variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'
 
 var:
-  android_components_version: 73.0.11
+  android_components_version: 74.0.6
   torbrowser_branch: 10.0
   container:
     use_container: 1
   # This should be updated when the list of gradle dependencies is changed.
-  gradle_dependencies_version: 21
+  gradle_dependencies_version: 22
   # Switch to make it easier to grab all dependencies during a dry-run.
   # Note: Use the commit before support for new GeckoView interfaces gets added.
   fetch_gradle_dependencies: 0
   gradle_version: 6.6.1
+  glean_parser: 2.2.0
 
 targets:
   nightly:
@@ -47,15 +48,16 @@ input_files:
   - filename: git.patch
   - filename: mavenLocal.patch
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
-  - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2
-    sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2
+  - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %].tar.xz
+    name: glean
+    sha256sum: 24ceaaadaf155445e8ad135173d894e05c0745b41ab5fee150f9548550acf2a6
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
 
 steps:
   list_toolchain_updates:
-    git_url: https://github.com/mozilla-mobile/android-components.git
-    git_hash: v74.0.6
-    tag_gpg_id: 0
+    #git_url: https://github.com/mozilla-mobile/android-components.git
+    #git_hash: v74.0.6
+    #tag_gpg_id: 0
     var:
       container:
         use_container: 0
diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt
index 1debd7f..ab3da10 100644
--- a/projects/android-components/gradle-dependencies-list.txt
+++ b/projects/android-components/gradle-dependencies-list.txt
@@ -29,8 +29,8 @@ f7eab60c57addd94bb06275832fe7600611beaaae1a1ec597c231956faf96c8b | https://dl.go
 48167eeedc8da79c4d29deaf0d0cd9b5d8fedcae01f1a6efb3f28f08e8982f71 | https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asynclayoutinflater/1.0.0/asynclayoutinflater-1.0.0.pom
 270c7b7d99942d5ec1dd88594e4648feb33d8e31d8c3c2ab2321d49d9abdfc1f | https://dl.google.com/dl/android/maven2/androidx/biometric/biometric/1.1.0/biometric-1.1.0.aar
 aeb69e76988f43b06c84fca25efab2e418bb98b5aabcd03fa7913bd3ed1bcaa9 | https://dl.google.com/dl/android/maven2/androidx/biometric/biometric/1.1.0/biometric-1.1.0.pom
-8a28c71070271b6f802f5a285ab9ae5b424e60a4f4bb4e73c0c6f53c1375506d | https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.2.0/browser-1.2.0.aar
-0125474b4ff9dd64d9ebaa003ba0a19f782354e4490e270fc9fb2a39b33c1115 | https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.2.0/browser-1.2.0.pom
+e740b1beeac82303415d68bee9d5c1f259716f560a829ca07c7ce97e60850e1b | https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.3.0/browser-1.3.0.aar
+d82e1df52624a1fe2757055258e225ccc3aebc3f5a3d523414d7f1bbc80055f8 | https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.3.0/browser-1.3.0.pom
 1193c04c22a3d6b5946dae9f4e8c59d6adde6a71b6bd5d87fb99d82dda1afec7 | https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/cardview-1.0.0.aar
 e64ef4e08b58358fe27b599e6fe80a1b153db014c644beee630ab271061c3e6c | https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/cardview-1.0.0.pom
 a7913a5275ad68e555d2612ebe8c14c367b153e14ca48a1872a64899020e54ef | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.0/collection-1.0.0.pom
@@ -345,85 +345,34 @@ efe2431a01a188d3037d02a08e60900ec7406de626e4bd5b4995f28d409c0ebd | https://dl.go
 d7a2ff3a2fdbd0801f832df3de81dab06d9db7e4a57dfa6d768e7c6e5fa22280 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messaging/20.3.0/firebase-messaging-20.3.0.aar
 79b705ecf5140d3a2601b44ef058b4588878432eb6fb2f9d65da0551cb0a8e20 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messaging/20.3.0/firebase-messaging-20.3.0.pom
 e953cbf59b797ceb11ce312e8da19bb8afc013ef548d8946711c116bc2500482 | https://download.jetbrains.com/kotlin/native/builds/releases/1.4.30/linux/kotlin-native-prebuilt-linux-1.4.30.tar.gz
-07c3d82ca7eaf4722f00b2da807dc7860f6169ae60cfedcf5d40218f90880a46 | https://jcenter.bintray.com/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1.jar
-940676b124a8eea8ad7576f9be072c82d7dc7fe350ad895a36081f0c93ae99a6 | https://jcenter.bintray.com/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1.pom
-f57c6f089beeedb5b73cdaca7167998ce74505ae9a3d9aeacd72e0ebb0fbf4bc | https://jcenter.bintray.com/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom
-e81f40146f2a0eb394b10fa3a175c85ab9fbe757aa418aa44d4b760efe16f024 | https://jcenter.bintray.com/com/squareup/okio/okio-parent/1.17.2/okio-parent-1.17.2.pom
-f80ce42d2ffac47ad4c47e1d6f980d604d247ceb1a886705cf4581ab0c9fe2b8 | https://jcenter.bintray.com/com/squareup/okio/okio/1.17.2/okio-1.17.2.jar
-cd57f75443ab6a714b203da51994ee64ed0e919fea81f04e4f4b5324e4bb03f0 | https://jcenter.bintray.com/com/squareup/okio/okio/1.17.2/okio-1.17.2.pom
-ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0.jar
-965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0.pom
-affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601 | https://jcenter.bintray.com/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar
-310a6aa2d90534c32b8f46f1fc98cd0edae95dcdfca23e2847e5efa9ae0c019a | https://jcenter.bintray.com/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.pom
-79500b867b1194cf781ac98d5c706331a3d3ce8448437f536f8d4cc2faff50c3 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.3.72/kotlin-compiler-embeddable-1.3.72.jar
-2bad6c031302519db14517bcc33af09f137845de40e5b223b778e8a38c561fd7 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.3.72/kotlin-compiler-embeddable-1.3.72.pom
-1a4b999a2d9051382430994126c4bebd143c853e26d6bca4fd4c31924072ef5e | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.3.72/kotlin-daemon-embeddable-1.3.72.jar
-eabab80e05fe2a31e2f2395cedf589cd72fb8df0a82e08e93c2e36fe953b8d59 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.3.72/kotlin-daemon-embeddable-1.3.72.pom
-b0e6d0ab0c1f1dd2e2e5f540eeb6e5791820bdbe4f34597b4af183145dd2a493 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.3.72/kotlin-gradle-plugin-api-1.3.72.jar
-eedb363ba1f4b999e62b34d264f1b37492f986169d808ec94ca72a67938291db | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.3.72/kotlin-gradle-plugin-api-1.3.72.pom
-110fc7e4602f7aa47286a74756b673903ff3db5044312a16172eac38f7ba1224 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.3.72/kotlin-gradle-plugin-model-1.3.72.jar
-fce78c0c595493d89f90fa4ddba466abf4497e61aac6f2f0449ca1541c167413 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.3.72/kotlin-gradle-plugin-model-1.3.72.pom
-bf3e4edef51b7af7f1a8927fb58dca402e87668d246bfd0ad6520b9f2e3adebb | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-native-utils/1.3.72/kotlin-native-utils-1.3.72.jar
-21d04a0720be4a46804e1b73b733c72269c16900896ae463a9e87a1d04ed50c6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-native-utils/1.3.72/kotlin-native-utils-1.3.72.pom
-a188d9367de1c4ee9479db630985c0597b20709c83161b1430d24edb27e38c40 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.jar
-61653ccfae8caa4203e267b479821bd90faab3fef744a7ab0fdd9f61150f970c | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.pom
-8e525c7a19a94aea294403d531fd61eed3f08b2992e313a594cb531b75ffc35d | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-sam-with-receiver/1.3.72/kotlin-sam-with-receiver-1.3.72.jar
-4961812a7df6b98c49618bb67d497d5aeabf4e73ec3d346558f162f0c6d39d68 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-sam-with-receiver/1.3.72/kotlin-sam-with-receiver-1.3.72.pom
-d372f2dc8051f3d1d4fae3bd50e5fa109d3ec870c4a4830112f9afc8560aacfd | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-script-runtime/1.3.72/kotlin-script-runtime-1.3.72.jar
-65a3e614b27b2372f350cc015848d44cb14ca3225d8d41e1c54e60ce95e2131f | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-script-runtime/1.3.72/kotlin-script-runtime-1.3.72.pom
-420198546b466bfa9c38d1d7fb2ffcdfb8f518026e8f4a7ca3851fbdd525a538 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-common/1.3.72/kotlin-scripting-common-1.3.72.jar
-ad6cfeaefa234918fde058ab1f376168abe54cd1e7d12824fb15cc8a07aa0f03 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-common/1.3.72/kotlin-scripting-common-1.3.72.pom
-e91befa8242e5894158c0275d26d883599fe6e6c57b6952129aebec17a2ef0aa | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.3.72/kotlin-scripting-compiler-embeddable-1.3.72.jar
-de70f4db2a9d7d7aa42f88f217d59b61ed4357d4de138fadd3e459320abe52ba | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.3.72/kotlin-scripting-compiler-embeddable-1.3.72.pom
-d9a1cb78976db75b6173b51ad04efaebc2b3772636ad0b45cac4cd2d53222dc9 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.3.72/kotlin-scripting-compiler-impl-embeddable-1.3.72.jar
-0e1311cc6bcd06f373cf8ef7c4d7380087f36de70d9c72acc432e02dabc30a9b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.3.72/kotlin-scripting-compiler-impl-embeddable-1.3.72.pom
-5a9cced336697fbf2fb4b6c8a321787747f5e375227b7e355ebf3259365c024e | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.72/kotlin-scripting-jvm-1.3.72.jar
-6a1ba16592546ab118186a5634c9b24589ae2ed64f0cdd41a913ffb3c2b13db6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.72/kotlin-scripting-jvm-1.3.72.pom
-5e7d1552863e480c1628b1cc39ce230ef829f5b7230106215a05acda5172203a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.72/kotlin-stdlib-common-1.3.72.jar
-24781edf5b0934804930dcafc8911b9e710d146239a82699889132e7b37be9dc | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.72/kotlin-stdlib-common-1.3.72.pom
-40566c0c08d414b9413ba556ff7f8a0b04b98b9f0f424d122dd2088510efccc4 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.jar
-9d5a13d9abc33445e1366d258af0a77e42f01945acef7c0917b9d539854e2fce | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.pom
-133da70cfc07b56094282eac5c59bccd59f167ee2ead22e5282876d8bc10bf95 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/kotlin-stdlib-jdk8-1.3.72.jar
-a6d50f0321bdb52838c99136930c8dcc78c3074a592d526862ec01be91fa622b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/kotlin-stdlib-jdk8-1.3.72.pom
-3856a7349ebacd6d1be6802b2fed9c4dc2c5a564ea92b6b945ac988243d4b16b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72.jar
-4f0d574a969ea93c45628a163e1ed3ffabb4584278d72c647ec124f8c8109481 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72.pom
-9ef3d0277fe54384104a01089c8c718a9c2a7ab2b5292ff803ecfc9d38e7d6cb | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-io/1.3.72/kotlin-util-io-1.3.72.jar
-8131897af3fb30af2464efe56161a349087bca1544cbf57495158714875163e4 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-io/1.3.72/kotlin-util-io-1.3.72.pom
-7177ed4629704537e0252537629886f5409526ecd041d8d8e308e20624b14394 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.2.1/kotlinx-coroutines-core-1.2.1.jar
-6f7523ea8a56d7f12d11a004cfe5a4577bfba3ed6c84cc5ac48b72d54975552c | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.2.1/kotlinx-coroutines-core-1.2.1.pom
-1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.jar
-5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
-b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
-13009fb5ede3cf2be5a8d0f1602155aeaa0ce5ef5f9366892bd258d8d3d4d2b1 | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar
-1e1beb22ca906209700122b5cacf6f2719324538c5b1e3c27bf91564c8d31dbd | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.pom
-8f618bf515269c02037d89a555295e39422c759f7b550a74ea3edbe355ebd1ee | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/71.0.0/autofill-71.0.0.aar
-a1fe528647f8e20b45ea0e32bbec271c32e68b865622c42c9a37816a076be998 | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/71.0.0/autofill-71.0.0.pom
-d85f563fe91e796d3bc213ee32e98137f0cd92f00cd495d703135d29834d63c7 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forUnitTests/71.0.0/full-megazord-forUnitTests-71.0.0.jar
-adb969fb3bfef2fc3bb3db62365dd2f68d86203d26746f3c44952c63442f0282 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forUnitTests/71.0.0/full-megazord-forUnitTests-71.0.0.pom
-17dbf3d3f2cdcdbd666e6770161066214cc15f58298a9188ee8d58e27e4e5ee6 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/71.0.0/full-megazord-71.0.0.aar
-8f9fd5e44dacf9f7b5e6e6ca09fde27f8c9877f09f68cd7539f5a3d980a060ff | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/71.0.0/full-megazord-71.0.0.pom
-525d738af64c99669369b374154dd0d7e4ce32bc034f9736aaa05dc64f373743 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/71.0.0/fxaclient-71.0.0.aar
-4f1e345f4e1f41ea2463befa35413ee12b465b3e60f0ab03758b53a17136a091 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/71.0.0/fxaclient-71.0.0.pom
-373c9e30a547da6931309ba988242409292f752b0bd41b8a49972bb78546f0a0 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/71.0.0/httpconfig-71.0.0.aar
-3cb0d177eb6e731633140b2e854c48edee90ef755026b128016e964e5dfbc3e3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/71.0.0/httpconfig-71.0.0.pom
-4cea81555a8c822e382f18495e2c852a6baa4d599ecde4a11ddd5dc27685e247 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/71.0.0/logins-71.0.0.aar
-86e8a90f5deeb76843286c3afd5e65216b4f05729b4b0d7e93aca51d74b98f48 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/71.0.0/logins-71.0.0.pom
-fa8d2f9ab6a387a164e0c0b78fd72012db661b3d43848f778fb9288f17de0e52 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/71.0.0/native-support-71.0.0.aar
-382af2131c727357578c4fdab03a03232a9bdfca3b1036d52fd71ef65a8cf701 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/71.0.0/native-support-71.0.0.pom
-8d72e31784fac0c350e063453d537b1d2389f928c67235c897fc4cadfb3a2ca5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/71.0.0/nimbus-71.0.0.aar
-d11541433d5795a8d801e03637fc68e6a8baf684a3b7f56ec19684428b5575bf | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/71.0.0/nimbus-71.0.0.pom
-54934a2cd59b9562345e019e9b44dd1e23d1e2ede61ae7184e29e4e510e4d422 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/71.0.0/places-71.0.0.aar
-88e9eed6c49b167ed69864d1d0825123d7c48edfe542cafa203897a75b8fc272 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/71.0.0/places-71.0.0.pom
-16bc9f4070b9e8bfe0be8a8ce70e922dda4e4fb74d1e20db9dc1739a8d5c5c0d | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/71.0.0/push-71.0.0.aar
-a882723e6aca50bb0438a21f2ae1447d9cab19f433181459cf9b7086c2d54892 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/71.0.0/push-71.0.0.pom
-04e220d599dd5d5071bc5ee127c5d9db3e6fe378a831c8d002fb1363883711d4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/71.0.0/rustlog-71.0.0.aar
-eed6764e8fd13edbaa2ceccf976174b4dd618f9807e2ca265c7b193007b2de69 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/71.0.0/rustlog-71.0.0.pom
-57c4acea81f73043ab62dd4dc341a524d38682d6bc2e69bb48822f9e0ac7f48b | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/71.0.0/sync15-71.0.0.aar
-b9a7f2da1c0af1f88fd8bb47d04d11b4cc14f19a0f7dee13bc960ac75e87fd74 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/71.0.0/sync15-71.0.0.pom
-a50a7c02a36e5950ab0ca0c3a9486b87fd8de95582d0ddbcaa72af173230254b | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/71.0.0/syncmanager-71.0.0.aar
-3b180681c076339b42e20967f95881fa11b5753ae7f597e3c3c8288c09aa9b5e | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/71.0.0/syncmanager-71.0.0.pom
-6d23b30049cae26d35cbc1c892a785e6bdf9e0399cbbedf5584a48a8dc5cf5c9 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/71.0.0/tabs-71.0.0.aar
-383823dd20adbea1eec86fd59097feb3f84f4dda77531a1d79ebe801b4d6d283 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/71.0.0/tabs-71.0.0.pom
+6d600e6f04708c1393db6a3fb57ee273068fd8e7f95dcc32c184e3c2bb767599 | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/74.0.1/autofill-74.0.1.aar
+ca74e10892b729a0026257b89e953c03e77e44582d1686f65e8796d969ba16fd | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/74.0.1/autofill-74.0.1.pom
+5c40c0df6784f1d6ae1748196945c3c314d626153c81fc626c9dfd9847719bfa | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forUnitTests/74.0.1/full-megazord-forUnitTests-74.0.1.jar
+fe0fefe2babe6d2dbfab5357e649c4bf6eefc9806fba8a9cb1de22fe24f70bfd | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forUnitTests/74.0.1/full-megazord-forUnitTests-74.0.1.pom
+27f6e3a04e31d8053e832a446b4bf20bcfd04da56d4a390a28f3392378b88fa1 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/74.0.1/full-megazord-74.0.1.aar
+c91395a9254a9bb3c836440397d1cca9fd3b541e528d4570c646594fbd448436 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/74.0.1/full-megazord-74.0.1.pom
+71c137d337bdd5448e12d6dfd8054089e4a137be234d1f6f632f5b86d351a3bf | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/74.0.1/fxaclient-74.0.1.aar
+02a188b095ee842e4e4b0abd94267fa4e5d927c9c1254c10fa33ccdabd1b1eba | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/74.0.1/fxaclient-74.0.1.pom
+d14aed2d965a26b800233d2cfde8af9c0b3ffcd407755c8573ce3d95d32b4295 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/74.0.1/httpconfig-74.0.1.aar
+b871986d31a139a52b7c48125eccf4a4ee051397340c34610e852b2fa5d2d8ba | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/74.0.1/httpconfig-74.0.1.pom
+088949b73a203b67f985b4176f000a76eccd81b6a9aed6306860593ab52a8b6a | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/74.0.1/logins-74.0.1.aar
+72b5589ae447235096e976b35cf492283a51f47ff89dcb9aecc221128cc3aab7 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/74.0.1/logins-74.0.1.pom
+fa8d2f9ab6a387a164e0c0b78fd72012db661b3d43848f778fb9288f17de0e52 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/74.0.1/native-support-74.0.1.aar
+411555e4106ad9a1530aeed5b669f6ffed5aad31d238c11dd954e9fd16aecff0 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/74.0.1/native-support-74.0.1.pom
+3897c1ad3624ed1804dc673e3dbf5b3002304c41d78fb355e76c3d1008e34b7d | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/74.0.1/nimbus-74.0.1.aar
+8cf93085518e4573284a88ab0446149f088c602942b83237cc553a22e436f380 | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/74.0.1/nimbus-74.0.1.pom
+25e7dc1ab9c98d45fb4cfafb66835ec6bc6a90e984101745700175a35088db2e | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/74.0.1/places-74.0.1.aar
+34f6b257886def31cec92fa6425fd1a455471a0fbb635dc1b4691dfcf1f3fbac | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/74.0.1/places-74.0.1.pom
+b8840f92f21c7c0785d10eb55e14f3bcdff6e35544ab1b08b56f8fc74d91f6e2 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/74.0.1/push-74.0.1.aar
+202dbe51a9abc34f3448d9430507dd89411188da630ed5797129ab0fbdcea61f | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/74.0.1/push-74.0.1.pom
+ea871f7d5fab5a4315f41402de15f94e13481d03366396ea1bf3880f4f242c1a | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/74.0.1/rustlog-74.0.1.aar
+83bcb4a06dfea23a55d24bef657827cd6b09e534a3426d857a458332e356c2d4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/74.0.1/rustlog-74.0.1.pom
+57c4acea81f73043ab62dd4dc341a524d38682d6bc2e69bb48822f9e0ac7f48b | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/74.0.1/sync15-74.0.1.aar
+81dc9452086d8e8fe360bfc4b9bf4345acd6888863fa07ac5f02110fa887c558 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/74.0.1/sync15-74.0.1.pom
+264d997abfd49412dc0ef5b2d1811d6b9dc62dea06011ee07fc105002b314a4a | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/74.0.1/syncmanager-74.0.1.aar
+cc7f7850bc9e5fecd8c699d0464e96bdb6765778e6463bcfc1c1efed08ba6ceb | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/74.0.1/syncmanager-74.0.1.pom
+4ecc86b606e1713faa7b75b01fbcd52d7d521f0c5c99784f07d87188cd73ea9c | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/74.0.1/tabs-74.0.1.aar
+c93fe881fec0df7da21f151b05652ea79157f08ad680d674d9591f6bd9843cea | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/74.0.1/tabs-74.0.1.pom
 e5801430997ccd358df0b4b48f101402b924a72de87cc5f12d80a32bb6d61865 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/71.0.0/concept-base-71.0.0.aar
 5d08cc1bb3c2432ab3ecaaa6c06ca0603a9957ece9524643b9db4fb77a01f7b8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/71.0.0/concept-base-71.0.0.pom
 bfbb680afd838af36e4609d1b7236dbef93f47e92b386bb7ca08efca910e2e59 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/71.0.0/concept-fetch-71.0.0.aar
@@ -436,19 +385,19 @@ d1741144ed2ea215a84f5d94d779cafcfaf778cce8cc7224437a2884cb1101bc | https://maven
 7b0a3bd6d32c8002f785db8fdbf3b08e3541366e784cac1304cb3f49642b916a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/support-ktx-71.0.0.pom
 f7bf27270904abd8639b543151b6eaf268b821b8e6235c8decf8031e02ec8648 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.0/support-utils-71.0.0.aar
 0b80acf7d1dd0d9484b0e82cd1a04ae57270d7f7e6b339ce39424554d48798e3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.0/support-utils-71.0.0.pom
-587abedeb0d539781c3a64e1d97f94e4e58598d59a110ec35a5291f5c471f441 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/87.0.20210311161514/geckoview-beta-87.0.20210311161514.aar
-04a3e6fb38caf74c58fe80b36ba585aba5ba4a22d06e40ffc2d9f7a47015fa99 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/87.0.20210311161514/geckoview-beta-87.0.20210311161514.pom
-005dc96a0f19c75ac3e83661a4c4e4b6b39fd71ab4d26d4903735fa860da8293 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/88.0.20210223085042/geckoview-nightly-88.0.20210223085042.aar
-cce46579b4a5fd731d5c12f62170287bec4f1ed8a2f24e8cb9a31998c1ea59ab | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/88.0.20210223085042/geckoview-nightly-88.0.20210223085042.pom
-e019974021cfdc86752984eba6309e7f865e3efe6d4ad40a012be212f4925251 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/87.0.20210315170302/geckoview-87.0.20210315170302.aar
-66ad663a2b60d756dadefa2024f664b7befe6fb22535da80aa88b024fe9b64f5 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/87.0.20210315170302/geckoview-87.0.20210315170302.pom
-c9a1855277e7863529fd20a6bdfd09659b472026a98b547b5fa6a19c5ef0d67e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/34.1.0/glean-forUnitTests-34.1.0.jar
-22cc8c400823e3fc8eda2e644083b137a9fe867333845ea29c57051349afbb3a | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/34.1.0/glean-forUnitTests-34.1.0.pom
-60e34ac4879aa0f8e32fb117669b09ee8946aa34e9372cfe0008995807e876a7 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/34.1.0/glean-gradle-plugin-34.1.0.jar
-0b981a04d70ee3b438359a3da2548f56b188d594dd67bd297a09f0fa0845e348 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/34.1.0/glean-gradle-plugin-34.1.0.pom
+4c496ab63c3900ebbd9bde50d520c28c29ddd594ae3958f161f41a5810ba60fa | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/88.0.20210404185932/geckoview-beta-88.0.20210404185932.aar
+e55a5d7ebdd6cae43d2a820c16f771ad8d87f25b181828ebd10c721f8ad445dc | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/88.0.20210404185932/geckoview-beta-88.0.20210404185932.pom
+d622b92149ed8477aca47dabe0fd53de75191a29ff4d79a0cfc718736bb4aa2a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/89.0.20210323094659/geckoview-nightly-89.0.20210323094659.aar
+8d6bc0c248af8f3d1f4f45abd4e04bf76044fbce518ca3c384ff83fe9acb38b4 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/89.0.20210323094659/geckoview-nightly-89.0.20210323094659.pom
+418b2052928c75f4071b533cf864baaf22d0f134f6418200b8ab807c93428161 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/87.0.20210318103112/geckoview-87.0.20210318103112.aar
+9c4b5dd3e37936890909a0795be552664dd861f9f28a9815a72a4abc7660c700 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/87.0.20210318103112/geckoview-87.0.20210318103112.pom
+1eb5321d64bdd07865bd8599b6b981193b54661f25bbb8e3ccdc6f8210c9ae38 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/35.0.0/glean-forUnitTests-35.0.0.jar
+f62de54f66aa4086100f26884927dbff06a1cbea7fb17010312d10d71cea3f01 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/35.0.0/glean-forUnitTests-35.0.0.pom
+624e642862770feb72c22cd80cd96f0e5d53340ded862987b3ec9c537c8bed29 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/35.0.0/glean-gradle-plugin-35.0.0.jar
+93d7a411ea527507fb1510d58c764aed2ec029cdd0b3c42df00ceea01afa8f45 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/35.0.0/glean-gradle-plugin-35.0.0.pom
 d6394ad35c63daca22246363ff826749deb62d514a1843eea27d8f39dfb778e6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.1.2/glean-33.1.2.pom
-5d942e4a68aef1fab1b219f51e2882eb61dfd27d4bdcd9265b6d375ce5e5fb3b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/34.1.0/glean-34.1.0.aar
-681374f4e97bd97098c1266973d89167ff9c592ccb89617832e224135af72637 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/34.1.0/glean-34.1.0.pom
+953648b707c804301df08d70db75086b70c141e72d66826e88f34f7aa9ab880e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/35.0.0/glean-35.0.0.aar
+9acbb9dba515f2142695a17cb9ac123032dcba24423b660f5e0f0b95adfd22bf | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/35.0.0/glean-35.0.0.pom
 8f1fec72b91a71ea39ec39f5f778c4d1124b6b097c6d55b3a50b554a52237b27 | https://plugins.gradle.org/m2/com/google/code/gson/gson-parent/2.8.5/gson-parent-2.8.5.pom
 233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81 | https://plugins.gradle.org/m2/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar
 b8308557a7fccc92d9fe7c8cd0599258b361285d2ecde7689eda98843255a092 | https://plugins.gradle.org/m2/com/google/code/gson/gson/2.8.5/gson-2.8.5.pom
@@ -461,24 +410,65 @@ aa42cf65e9f7475bc7cb2fa7cb7dbf99938dd47de864bbed68135e5a12d3a482 | https://plugi
 74a54eb154e18b54fc69ac03ab8d186f3ba293b976eca8b336566248ea2633b4 | https://plugins.gradle.org/m2/org/gradle/kotlin/kotlin-dsl/org.gradle.kotlin.kotlin-dsl.gradle.plugin/1.3.6/org.gradle.kotlin.kotlin-dsl.gradle.plugin-1.3.6.pom
 bdce53a751fdb27af6608039df81214ba22d902ed4169540a3daeb5828c99cad | https://plugins.gradle.org/m2/org/gradle/kotlin/plugins/1.3.6/plugins-1.3.6.jar
 785f12a193912d77fe3b8714567ad5f01d727512a47c5a43aef57852cc1bc9e2 | https://plugins.gradle.org/m2/org/gradle/kotlin/plugins/1.3.6/plugins-1.3.6.pom
+ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://plugins.gradle.org/m2/org/jetbrains/annotations/13.0/annotations-13.0.jar
+965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://plugins.gradle.org/m2/org/jetbrains/annotations/13.0/annotations-13.0.pom
 77d7638a32bcae42c929eea307c9a3b48ae1a5abd00cd29f7abf6d51079d83a9 | https://plugins.gradle.org/m2/org/jetbrains/dokka/dokka-android-gradle-plugin/0.9.17/dokka-android-gradle-plugin-0.9.17.jar
 92f058aef966deca25ddcf1b1ad028d822f94891bf61491ebc914a08a3481e86 | https://plugins.gradle.org/m2/org/jetbrains/dokka/dokka-android-gradle-plugin/0.9.17/dokka-android-gradle-plugin-0.9.17.pom
 e9215460b1bb674b616cb9c8f1a1b172cdd7b3f4749662d864ebd3f319f0d73d | https://plugins.gradle.org/m2/org/jetbrains/dokka/dokka-gradle-plugin/0.9.17/dokka-gradle-plugin-0.9.17.jar
 f41e2f85d75abe256ae3f522066ad40ff9b3dc90b0f6e455508a90ba78046871 | https://plugins.gradle.org/m2/org/jetbrains/dokka/dokka-gradle-plugin/0.9.17/dokka-gradle-plugin-0.9.17.pom
+affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601 | https://plugins.gradle.org/m2/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar
+310a6aa2d90534c32b8f46f1fc98cd0edae95dcdfca23e2847e5efa9ae0c019a | https://plugins.gradle.org/m2/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.pom
 30278f88cfefb7bb328bedd73374242f8e3e55211e53884e4820dba271132fab | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-android-extensions/1.3.72/kotlin-android-extensions-1.3.72.jar
 5d87527b1f65a82d0a6a4f56cceab960522001a0fd010159a723ab897d58da0c | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-android-extensions/1.3.72/kotlin-android-extensions-1.3.72.pom
 35d8e287a1d74dc55024a42bd788567e1f73e2059eb804319876d652f249ef59 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.3.72/kotlin-annotation-processing-gradle-1.3.72.jar
 2d97af231b25d4f463438a66c7c368a8e395e49ebb623b595ca860cef917334a | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.3.72/kotlin-annotation-processing-gradle-1.3.72.pom
 dc0d14042176647d0bde5954aba8a435f6a8857f9648bbc454b94366bc1cff06 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-build-common/1.3.72/kotlin-build-common-1.3.72.jar
 5a6bb0d142ed04c1df96200c35bb72bc63c3ae7ea6c876834f37d83938f1e3d4 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-build-common/1.3.72/kotlin-build-common-1.3.72.pom
+79500b867b1194cf781ac98d5c706331a3d3ce8448437f536f8d4cc2faff50c3 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.3.72/kotlin-compiler-embeddable-1.3.72.jar
+2bad6c031302519db14517bcc33af09f137845de40e5b223b778e8a38c561fd7 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.3.72/kotlin-compiler-embeddable-1.3.72.pom
 a2d8622ef0e2877577e368ec3a2ffbe7978b4512aab456d0db6427d9fae39d47 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-compiler-runner/1.3.72/kotlin-compiler-runner-1.3.72.jar
 6816c427914a4e4ead92300c0b643339b07e7cbb3355d48d5932dbcdaac7d058 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-compiler-runner/1.3.72/kotlin-compiler-runner-1.3.72.pom
 8f3ef9192e17768cd4e1f3c1f1c225ebd3b500a67ad05a735b31aa16e01c181c | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-daemon-client/1.3.72/kotlin-daemon-client-1.3.72.jar
 215e6f1bb1980a8bdbef9c155557d17e5a16fbae84d5cae5bf2fd20b86b87d2b | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-daemon-client/1.3.72/kotlin-daemon-client-1.3.72.pom
+1a4b999a2d9051382430994126c4bebd143c853e26d6bca4fd4c31924072ef5e | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.3.72/kotlin-daemon-embeddable-1.3.72.jar
+eabab80e05fe2a31e2f2395cedf589cd72fb8df0a82e08e93c2e36fe953b8d59 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.3.72/kotlin-daemon-embeddable-1.3.72.pom
+b0e6d0ab0c1f1dd2e2e5f540eeb6e5791820bdbe4f34597b4af183145dd2a493 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.3.72/kotlin-gradle-plugin-api-1.3.72.jar
+eedb363ba1f4b999e62b34d264f1b37492f986169d808ec94ca72a67938291db | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.3.72/kotlin-gradle-plugin-api-1.3.72.pom
+110fc7e4602f7aa47286a74756b673903ff3db5044312a16172eac38f7ba1224 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.3.72/kotlin-gradle-plugin-model-1.3.72.jar
+fce78c0c595493d89f90fa4ddba466abf4497e61aac6f2f0449ca1541c167413 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.3.72/kotlin-gradle-plugin-model-1.3.72.pom
 b914cbcd8e55e76f221cc863912c38b1fe6ce56800300c147f85410aaa8789ab | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.3.72/kotlin-gradle-plugin-1.3.72.jar
 8ec81474695b94779488b99183955cf0e1f50fe4d048af920b756ca71b72ac90 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.3.72/kotlin-gradle-plugin-1.3.72.pom
+bf3e4edef51b7af7f1a8927fb58dca402e87668d246bfd0ad6520b9f2e3adebb | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-native-utils/1.3.72/kotlin-native-utils-1.3.72.jar
+21d04a0720be4a46804e1b73b733c72269c16900896ae463a9e87a1d04ed50c6 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-native-utils/1.3.72/kotlin-native-utils-1.3.72.pom
+a188d9367de1c4ee9479db630985c0597b20709c83161b1430d24edb27e38c40 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.jar
+61653ccfae8caa4203e267b479821bd90faab3fef744a7ab0fdd9f61150f970c | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.pom
+8e525c7a19a94aea294403d531fd61eed3f08b2992e313a594cb531b75ffc35d | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-sam-with-receiver/1.3.72/kotlin-sam-with-receiver-1.3.72.jar
+4961812a7df6b98c49618bb67d497d5aeabf4e73ec3d346558f162f0c6d39d68 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-sam-with-receiver/1.3.72/kotlin-sam-with-receiver-1.3.72.pom
+d372f2dc8051f3d1d4fae3bd50e5fa109d3ec870c4a4830112f9afc8560aacfd | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-script-runtime/1.3.72/kotlin-script-runtime-1.3.72.jar
+65a3e614b27b2372f350cc015848d44cb14ca3225d8d41e1c54e60ce95e2131f | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-script-runtime/1.3.72/kotlin-script-runtime-1.3.72.pom
+420198546b466bfa9c38d1d7fb2ffcdfb8f518026e8f4a7ca3851fbdd525a538 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-common/1.3.72/kotlin-scripting-common-1.3.72.jar
+ad6cfeaefa234918fde058ab1f376168abe54cd1e7d12824fb15cc8a07aa0f03 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-common/1.3.72/kotlin-scripting-common-1.3.72.pom
+e91befa8242e5894158c0275d26d883599fe6e6c57b6952129aebec17a2ef0aa | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.3.72/kotlin-scripting-compiler-embeddable-1.3.72.jar
+de70f4db2a9d7d7aa42f88f217d59b61ed4357d4de138fadd3e459320abe52ba | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.3.72/kotlin-scripting-compiler-embeddable-1.3.72.pom
+d9a1cb78976db75b6173b51ad04efaebc2b3772636ad0b45cac4cd2d53222dc9 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.3.72/kotlin-scripting-compiler-impl-embeddable-1.3.72.jar
+0e1311cc6bcd06f373cf8ef7c4d7380087f36de70d9c72acc432e02dabc30a9b | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.3.72/kotlin-scripting-compiler-impl-embeddable-1.3.72.pom
+5a9cced336697fbf2fb4b6c8a321787747f5e375227b7e355ebf3259365c024e | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.72/kotlin-scripting-jvm-1.3.72.jar
+6a1ba16592546ab118186a5634c9b24589ae2ed64f0cdd41a913ffb3c2b13db6 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.72/kotlin-scripting-jvm-1.3.72.pom
+5e7d1552863e480c1628b1cc39ce230ef829f5b7230106215a05acda5172203a | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.72/kotlin-stdlib-common-1.3.72.jar
+24781edf5b0934804930dcafc8911b9e710d146239a82699889132e7b37be9dc | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.72/kotlin-stdlib-common-1.3.72.pom
+40566c0c08d414b9413ba556ff7f8a0b04b98b9f0f424d122dd2088510efccc4 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.jar
+9d5a13d9abc33445e1366d258af0a77e42f01945acef7c0917b9d539854e2fce | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.pom
+133da70cfc07b56094282eac5c59bccd59f167ee2ead22e5282876d8bc10bf95 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/kotlin-stdlib-jdk8-1.3.72.jar
+a6d50f0321bdb52838c99136930c8dcc78c3074a592d526862ec01be91fa622b | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/kotlin-stdlib-jdk8-1.3.72.pom
+3856a7349ebacd6d1be6802b2fed9c4dc2c5a564ea92b6b945ac988243d4b16b | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72.jar
+4f0d574a969ea93c45628a163e1ed3ffabb4584278d72c647ec124f8c8109481 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72.pom
+9ef3d0277fe54384104a01089c8c718a9c2a7ab2b5292ff803ecfc9d38e7d6cb | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-util-io/1.3.72/kotlin-util-io-1.3.72.jar
+8131897af3fb30af2464efe56161a349087bca1544cbf57495158714875163e4 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-util-io/1.3.72/kotlin-util-io-1.3.72.pom
 3825cbc39ac9b557bf11ed52ed8552200831004a60e845eba61c77ba972a2d9f | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-util-klib/1.3.72/kotlin-util-klib-1.3.72.jar
 0e10935a94077c217ec5107b451c0859e89a27f67fd09543bd044c798cb154cf | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-util-klib/1.3.72/kotlin-util-klib-1.3.72.pom
+7177ed4629704537e0252537629886f5409526ecd041d8d8e308e20624b14394 | https://plugins.gradle.org/m2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.2.1/kotlinx-coroutines-core-1.2.1.jar
+6f7523ea8a56d7f12d11a004cfe5a4577bfba3ed6c84cc5ac48b72d54975552c | https://plugins.gradle.org/m2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.2.1/kotlinx-coroutines-core-1.2.1.pom
+b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://plugins.gradle.org/m2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
 f5759b7fcdfc83a525a036deedcbd32e5b536b625ebc282426f16ca137eb5902 | https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar
 770471090ca40a17b9e436ee2ec00819be42042da6f4085ece1d37916dc08ff9 | https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
 2bf4e59f3acd106fea6145a9a88fe8956509f8b9c0fdd11eb96fee757269e3f3 | https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar
@@ -616,13 +606,19 @@ efd442f0c35276739da19b5f6c8c3792a87bb309df199e0478dacc8c8c6de4fe | https://repo.
 efb8644c55fffaf1f229893ac5c99864c9cef677478a206a729af96262ba9078 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/3.13.1/okhttp-urlconnection-3.13.1.pom
 4aca3e552afb1ceb47f8956685f6295a276e49fa03f9066f8b6be83bec56fb66 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.10.0/okhttp-3.10.0.jar
 d94e3316e6b8e49897d10bb3aa0e2e7d0693be526a4aa265ca0792bc77ebc333 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.10.0/okhttp-3.10.0.pom
+07c3d82ca7eaf4722f00b2da807dc7860f6169ae60cfedcf5d40218f90880a46 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1.jar
+940676b124a8eea8ad7576f9be072c82d7dc7fe350ad895a36081f0c93ae99a6 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1.pom
 0ab41a713e2a638efc1f4610ef34c07fef398f9d7b9d79a6f5406b779b0011a5 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.13.1/okhttp-3.13.1.jar
 73416ac947490016bb1269faf8dc354841abe4c0c08ce455f34d281fecd09160 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.13.1/okhttp-3.13.1.pom
 2c35da6696e905e8c116caef4d6b92c9d6130532c4974ad1b70cd9fe78e4250e | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.10.0/parent-3.10.0.pom
+f57c6f089beeedb5b73cdaca7167998ce74505ae9a3d9aeacd72e0ebb0fbf4bc | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom
 4e374858730d3ec488695db9710d28fd476ea84a040900ff6b47bc1c9e7b4218 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.13.1/parent-3.13.1.pom
 18d1f68a7d7d03b0e935c03ae335c51b15d2ba4664964b96e07542af390aee85 | https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.14.0/okio-parent-1.14.0.pom
+e81f40146f2a0eb394b10fa3a175c85ab9fbe757aa418aa44d4b760efe16f024 | https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.17.2/okio-parent-1.17.2.pom
 4633c331f50642ebe795dc089d6a5928aff43071c9d17e7840a009eea2fe95a3 | https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.14.0/okio-1.14.0.jar
 0922137559cb91f6fe88e2643f4d986f566913883f9a82ef91e5d0675466f81e | https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.14.0/okio-1.14.0.pom
+f80ce42d2ffac47ad4c47e1d6f980d604d247ceb1a886705cf4581ab0c9fe2b8 | https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.2/okio-1.17.2.jar
+cd57f75443ab6a714b203da51994ee64ed0e919fea81f04e4f4b5324e4bb03f0 | https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.2/okio-1.17.2.pom
 e58c97406a6bb1138893750299ac63c6aa04b38b6b49eae1bfcad1a63ef9ba1b | https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.2.2/okio-2.2.2.jar
 fd621988f7f6957025735dc6dd090b00a20f3a3bb8d77ca79036077f629b140b | https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.2.2/okio-2.2.2.pom
 1d8518e3ac7532a104e4f7be77def37c982e530723c6bdb3d67708cce2b0c2c4 | https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom
@@ -891,6 +887,8 @@ f8c8b7485d4a575e38e5e94945539d1d4eccd3228a199e1a9aa094e8c26174ee | https://repo.
 497a7639820ba0758d4e0c1d6f82fdc8a9b6f6c2a28d91fe03c6b0776db4be40 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-test/1.4.2/kotlinx-coroutines-test-1.4.2.pom
 e49454af130e066a4e1c31255c5fd9a23f31105324f48e98406325b051638908 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.0.5/kotlinx-metadata-jvm-0.0.5.jar
 f928d533d912546b6d97904bab53e983f8fe2cda303af9fa953c1438ccf38470 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.0.5/kotlinx-metadata-jvm-0.0.5.pom
+1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.jar
+c94b0b73790c70c709bcd445a01247908888211e38cc59e946ff6fe900785ae9 | https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
 518080049ba83181914419d11a25d9bc9833a2d729b6a6e7469fa52851356da8 | https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.jar
 c7e660c50bf4ecda0fc81ab62b489db9171e207fa784ddcb48c6c85bb40b49f5 | https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
 95b05d9590af4154c6513b9c5dc1fb2e55b539972ba0a9ef28e9a0c01d83ad77 | https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.jar
@@ -934,5 +932,7 @@ c513995cf019d9213d4fda666589937b2bf1bea5c4cdd337e6170e80b18406ee | https://repo.
 fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
 a45da61abed61568a533fdece125093180828edeb0d4b6f6d572e0cf457465f6 | https://repo.maven.apache.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar
 5806cf36dd28bfe961f7fe12679f4a2748a03e7a1d0070c22c411c19f01f266a | https://repo.maven.apache.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.pom
+13009fb5ede3cf2be5a8d0f1602155aeaa0ce5ef5f9366892bd258d8d3d4d2b1 | https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar
+1e1beb22ca906209700122b5cacf6f2719324538c5b1e3c27bf91564c8d31dbd | https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.23/snakeyaml-1.23.pom
 d3f7f09989d5b0ce5c4791818ef937ee7663f1e359c2ef2d312f938aad0763da | https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.24/snakeyaml-1.24.jar
 174d423722256823edbe2af8d7e3385c4645cf72382a22da0485b3b674394f37 | https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.24/snakeyaml-1.24.pom
diff --git a/projects/android-components/mavenLocal.patch b/projects/android-components/mavenLocal.patch
index 9d6d66c..3b5f064 100644
--- a/projects/android-components/mavenLocal.patch
+++ b/projects/android-components/mavenLocal.patch
@@ -1,11 +1,17 @@
-From 6a88b59457dd38f0e8d69f0c2988bb2952075536 Mon Sep 17 00:00:00 2001
+From d1263dbcc33e3f587abbc4bbf8c24c0bb567f194 Mon Sep 17 00:00:00 2001
 From: Georg Koppen <gk at torproject.org>
 Date: Wed, 20 May 2020 14:18:12 +0000
 Subject: [PATCH] mavenLocal() fixes
 
+---
+ build.gradle             | 2 ++
+ buildSrc/build.gradle    | 1 +
+ buildSrc/settings.gradle | 7 ++++++-
+ settings.gradle          | 7 +++++++
+ 4 files changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/build.gradle b/build.gradle
-index 9f298887a..278245d30 100644
+index f412f91f4..944a19e9a 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -6,6 +6,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
@@ -16,7 +22,7 @@ index 9f298887a..278245d30 100644
          if (project.hasProperty("googleRepo")) {
              maven {
                  name "Google"
-@@ -48,6 +49,7 @@ plugins {
+@@ -39,6 +40,7 @@ plugins {
  
  allprojects {
      repositories {
@@ -25,7 +31,7 @@ index 9f298887a..278245d30 100644
              maven {
                  name "Google"
 diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
-index 9f05b8434..f97029ccf 100644
+index c9f83be52..c01e9ab01 100644
 --- a/buildSrc/build.gradle
 +++ b/buildSrc/build.gradle
 @@ -7,6 +7,7 @@ plugins {
@@ -33,9 +39,9 @@ index 9f05b8434..f97029ccf 100644
  
  repositories {
 +    mavenLocal()
-     jcenter()
- }
+     mavenCentral()
  
+     if (project.hasProperty("centralRepo")) {
 diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
 index c31ad3840..fb6526db3 100644
 --- a/buildSrc/settings.gradle
@@ -59,7 +65,7 @@ index c31ad3840..fb6526db3 100644
 \ No newline at end of file
 +}
 diff --git a/settings.gradle b/settings.gradle
-index a6e8dfa49..049fa29d6 100644
+index e1204312f..428e9ddcd 100644
 --- a/settings.gradle
 +++ b/settings.gradle
 @@ -4,8 +4,15 @@
@@ -75,9 +81,6 @@ index a6e8dfa49..049fa29d6 100644
  buildscript {
      repositories {
 +        mavenLocal()
-         jcenter()
-     }
- 
--- 
-2.28.0
-
+         if (hasProperty("centralRepo")) {
+             maven {
+                 name "MavenCentral"





More information about the tor-commits mailing list