boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 333552f7 by Nicolas Vigier at 2026-04-20T17:22:28+02:00 Bug 41764: Fix some comments about generate_gradle_dependencies_list-* - - - - - 0412200e by Nicolas Vigier at 2026-04-20T17:22:29+02:00 Bug 41764: Add new makefile rule: generate_gradle_dependencies_list-application-services-unpatched The same as generate_gradle_dependencies_list-application-services, but using upstream branch. Also rename `generate_gradle_dependencies_list-geckoview-firefoxbrowser` to `generate_gradle_dependencies_list-geckoview-upatched`. - - - - - afef0027 by Nicolas Vigier at 2026-04-20T17:22:31+02:00 Bug 41764: Update toolchains for Firefox 150 - - - - - 15 changed files: - Makefile - doc/how-to-update-gradle-dependencies-list.md - projects/android-sdk/config - projects/application-services/config - projects/application-services/gradle-dependencies-list.txt - projects/firefox/build - projects/firefox/config - + projects/firefox/firefoxbrowser-0001-Bug-2024724-Fix-PowerCounters.h-because-we-do-not-co.patch - projects/firefox/firefoxbrowser-BB-29320.patch - projects/firefox/mozconfig-upstream-firefox.in - projects/geckoview/config - projects/geckoview/gradle-dependencies-list.txt - projects/glean/config - projects/gradle/config - projects/mingw-w64-clang/config Changes: ===================================== Makefile ===================================== @@ -443,10 +443,13 @@ create_glean_deps_tarball-with_torsocks: submodule-update generate_gradle_dependencies_list-application-services: submodule-update $(rbm) build application-services --target generate_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 +generate_gradle_dependencies_list-application-services-unpatched: submodule-update + $(rbm) build application-services --target list_toolchain_updates --target generate_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 + generate_gradle_dependencies_list-geckoview: submodule-update $(rbm) build geckoview --target geckoview:generate_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 -generate_gradle_dependencies_list-geckoview-firefoxbrowser: submodule-update +generate_gradle_dependencies_list-geckoview-unpatched: submodule-update $(rbm) build geckoview --target geckoview:generate_gradle_dependencies_list --target alpha --target firefoxbrowser-android-aarch64 generate_gradle_dependencies_list-glean: submodule-update ===================================== doc/how-to-update-gradle-dependencies-list.md ===================================== @@ -2,16 +2,14 @@ ## TL; DR -For `application-services`, 'geckoview', `geckoview-firefoxbrowser`, -`glean`: +For `application-services`, `geckoview`, `glean`: 1. Run `make generate_gradle_dependencies_list-$project` 2. Copy `out/$project/gradle-dependencies-list-$version.txt` to `projects/$project/gradle-dependencies-list.txt`. -Note: The `generate_gradle_dependencies_list-geckoview-firefoxbrowser` -target is doing the same as the `generate_gradle_dependencies_list-geckoview-firefoxbrowser` -target, except that it is using unpatched upstream branch. +Note: For `geckoview` and `application-services` you can append +`-unpatched` to the makefile target to use the unpatched upstream branch. ## Rationale ===================================== projects/android-sdk/config ===================================== @@ -16,14 +16,14 @@ var: build_tools_version: 36.1 build_tools_filename: 'build-tools_r[% c("var/build_tools_version") %]_linux.zip' build_tools_sha256sum: a7b5889e4a79fcf3b0976bef40d401f4240fb1eed891d9d91169da1111e11d78 - commandlinetools_version: 13114758 - commandlinetools_version_string: 19.0 + commandlinetools_version: 14742923 + commandlinetools_version_string: 20.0 platform_tools_version: 36.0.0 input_files: # Hashes can be compared with https://gitlab.com/fdroid/android-sdk-transparency-log/-/blob/master/checksu... - URL: '[% c("var/google_repo") %]/commandlinetools-linux-[% c("var/commandlinetools_version") %]_latest.zip' name: android_commandlinetools - sha256sum: 7ec965280a073311c339e571cd5de778b9975026cfcbe79f2b1cdcb1e15317ee + sha256sum: 04453066b540409d975c676d781da1477479dde3761310f1a7eb92a1dfb15af7 - URL: '[% c("var/google_repo") %]/[% c("var/build_tools_filename") %]' name: build_tools sha256sum: '[% c("var/build_tools_sha256sum") %]' ===================================== projects/application-services/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: '149.0' +version: '150.0' git_hash: 'v[% c("version") %]-TORBROWSER-build[% c("var/build_number") %]' git_url: https://gitlab.torproject.org/tpo/applications/application-services.git tag_gpg_id: 1 @@ -45,7 +45,7 @@ steps: # Due to some issue in application-service causing non matching # builds when build time differ a lot, we need to do periodic rebuilds: # https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_req... - rebuild_date: '2026-02-23' + rebuild_date: '2026-04-08' arch_deps: # Needed to build NSS - gyp @@ -89,16 +89,20 @@ steps: project: application-services pkg_type: cargo_vendor norec: - sha256sum: 65ab6bc3d784881a10da1f3897ff4ad94d468cfd3915f0cc7287814529d1ba24 + sha256sum: df94ed5a82c6abb1d7fe49658753d2d3746bf9a2c1ba8faf555fe3a41ae67edb enable: '[% !c("var/generate_gradle_dependencies_list") %]' - filename: gen-gradle-deps-file.py enable: '[% c("var/generate_gradle_dependencies_list") %]' targets: - # Run `make get_gradle_dependencies_list-application-services` to + # Run `make generate_gradle_dependencies_list-application-services` to # generate the gradle dependencies file. You can them move the file # `out/application-services/gradle-dependencies-list-$version.txt` # to `projects/application-services/gradle-dependencies-list.txt`. + # + # If you want to build from upstream applications-services (for example + # if the rebase has not been done yet), you can use `make + # generate_gradle_dependencies_list-application-services-unpatched`. generate_gradle_dependencies_list: filename: 'gradle-dependencies-list-[% c("version") %].txt' var: ===================================== projects/application-services/gradle-dependencies-list.txt ===================================== @@ -26,18 +26,18 @@ c903f8f51e3f4ea5e7e1f0a6fe3be873c357221227d103d08d7fd042f4b7570c | https://dl.go 4505b9a5e30a9418b59a9ad6702c3e4193aea6e691a3d03cf220c7640ad083e2 | https://dl.google.com/dl/android/maven2/androidx/concurrent/concurrent-futur... 77639a0b051e22510bad93affcea0ebd781ef124bf9b7621a95749937bcfcdfd | https://dl.google.com/dl/android/maven2/androidx/concurrent/concurrent-futur... 748a34eb5d13d19d187adecaea82667fded5f1b0b98a655e13ed2e4a8b3d8ae6 | https://dl.google.com/dl/android/maven2/androidx/concurrent/concurrent-futur... -4d23190b8623b8abb3c5247a0a7727eca347062d026335c427a09e82711b15f8 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.17.0/core-k... -ed7bcadc39c62d00daee44f4a78a23ca83fbc399f22fa90ace4e859b415c9048 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.17.0/core-k... -0233d8d0a2ce8ff383502c8c64a42fc1673016402c923795465b6444eacd9939 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.17.0/core-k... +c7c511e3df838fcbcb61ace36944de6bb7c10eb597be546974f001119939c85d | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.18.0/core-k... +3fa579c11de0f6f378002c0f0bb4bbe71100634f80f8b282951789ea7d0fb849 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.18.0/core-k... +3a5e0009e06517627756b9203d9a8f055fda87b215a17b775bae568697854196 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.18.0/core-k... dc1b678d58ebcf2bfa1587be68ff826694ce3d221251b9ef30d4d4b36297e6de | https://dl.google.com/dl/android/maven2/androidx/core/core-viewtree/1.0.0/co... 11386cfa46cbbfddb6a4059f14354c00691cf65d3d63c3618818a83326ef3c7f | https://dl.google.com/dl/android/maven2/androidx/core/core-viewtree/1.0.0/co... d4f2ed1176fa8c5612b80f74c952a8799142a9ed36022a1a238fde5b140580d9 | https://dl.google.com/dl/android/maven2/androidx/core/core-viewtree/1.0.0/co... 42ffa7ca47d7ba8fe1d874c57ef9c7111bc41a2b0c0c21518a39e07d222ded8b | https://dl.google.com/dl/android/maven2/androidx/core/core/1.12.0/core-1.12.... 2f63fbeda23ca0919738d09e406de661f21bac583d6e04a1797dcb77e3b6ae95 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.12.0/core-1.12.... 475f6e2210eb079471607693e65f65b333c080030d5aa22a1972c513015aa255 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.12.0/core-1.12.... -e1bd22bbcf5cee3a992dedb7d2d3c3b31c9f761c01e56d00ea443c8aaa981182 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.17.0/core-1.17.... -6006fde98c6fa98a9180b940bb44971aa5c9243e39f947ad6caddf386fc9cfea | https://dl.google.com/dl/android/maven2/androidx/core/core/1.17.0/core-1.17.... -8b63b18ff4e3474ef1e9428ed022d7994e9e69adfcdaee7e59c7e52dc3cf75b0 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.17.0/core-1.17.... +311d83ac67d394076ec21d12ed2d10a44b59cb2929b7dce00e5a90a93842e37d | https://dl.google.com/dl/android/maven2/androidx/core/core/1.18.0/core-1.18.... +b67ff7a1f9be95687dfa86d6055147fc1d8bbe3b1dc19048c432afca18abfd95 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.18.0/core-1.18.... +57d644ebb37d309ad959d740157d8e8424e273b9c672842e4f4c758edc6d30e7 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.18.0/core-1.18.... 66cab82639dac0f6c2433464c093b074d608c4bb887ec38a9b8bc4ac98126732 | https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-com... 1d1b2c91e89310786dee770e9126f2fa20ed12e3e617e439ca289ff5df3913b1 | https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-com... a2c3fff0c39ac72c4c21c415017066c263efe170d8aeb9d339a3eca7c0d79f1e | https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-com... @@ -224,14 +224,14 @@ d429b9312dffa0503381d1ee1b18a999bd901e7456612b2fb48c6a5d5a2caf88 | https://dl.go e2eed37782da4d8c799d4c4b737c35ad88d3912f5136cfdfe2c014ccd40b350c | https://dl.google.com/dl/android/maven2/com/android/zipflinger/8.13.2/zipfli... d001eb0ccbbfc8cb9eaa193a358e63712974639775647be949ab232c2b29b407 | https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-pro... 3bb45280df1dd1c96b9a01724a614566b7d60d33453fcd52c2c741f9999c3a4e | https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-pro... -d17c3026ae975b04cb2390bc7583a33aa2a4a4880e7b498f214c8efc36f6e9e5 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/147.0.... -f32f0072d24411eca7e5f5dea3e14da41bb51d1b52dd1d640806d70c443160e0 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/147.0.... -d2545ed35b2cb3df9dd48138e852a6c0003236f4d5fd1397d05f9daf56480ee7 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/6... -1b3e3a2386c4c8ed6d06fe13a543eda3f77edbf6dbe401d0066882f2b7548673 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/6... -bc250c3d3bd9d6e1f51d2c573444cf2100dc8e3df9ffc9ea68ae8aba7119c2b2 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-native/67.0.0/g... -f680f9b5ae8c71493e76c599ff2d0575bf591ed94ecb380e2ee4b0a1c50c10eb | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-native/67.0.0/g... -9a01891e4fdbd66d5437dbb9f27be641f2dcde6671c97ea3238e74f6e8f747a6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/67.0.0/glean-67... -a43d3e9729b650a56de1616c127f1fe774ce370057e8e81e54628f3f3a691bf4 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/67.0.0/glean-67... +98ed852923fb7d1dc559e05e71d9ae38cd353f0e94115a1b79d0519ed73287b1 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/148.0.... +af2a6061b3fb4017cddabd4819fdd4ca88538c70c27947763e11ab8c96add319 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/148.0.... +08058654c6af4498c8b9db4200fcdc7fb069458230e7728f34420656fd1fb09e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/6... +9dbe4140d3e1401c2e15972b37a11c08282859358de8259977859029f09bf76d | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/6... +7593aa70a25cc6e867e6bc2f73239824e40e4a4662daade43f82bc8ed6c84f97 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-native/67.1.0/g... +414d2b81926ed4c33c15044a81a6e32c11a2b8f309609956398bc036d53efd2f | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-native/67.1.0/g... +9a01891e4fdbd66d5437dbb9f27be641f2dcde6671c97ea3238e74f6e8f747a6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/67.1.0/glean-67... +cf841c80b58d09fa7eb9817d6e04e2133389d96b864548e58208753d4cfd5d8b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/67.1.0/glean-67... 6b4692f913a21b1fb603169ee78ba8f3e4ab2af9d762af9ca88b79126c1c0ad1 | https://plugins.gradle.org/m2/com/google/gradle/osdetector-gradle-plugin/1.7... 8460c950127ca3598766161e38b4ff8d63b4d69fb8310a16e00b351350010c11 | https://plugins.gradle.org/m2/com/google/gradle/osdetector-gradle-plugin/1.7... 0dfeca0861962b7bae7df0199c9b939d51d8ed6b5876642512bdcd7e929cbdff | https://plugins.gradle.org/m2/com/google/protobuf/com.google.protobuf.gradle... @@ -244,10 +244,10 @@ b7f00343ebdd21db9e9cb5ec189f9490429814d39b1c7371c997d4059e78dea5 | https://plugi 6b7aa8ea52466795239440c9881fa2875cacb6d36ecc8eeebb590354a610a067 | https://plugins.gradle.org/m2/io/gitlab/arturbosch/detekt/io.gitlab.arturbos... f47aeef86821e52b2b18758978bd045f03d722292e32e747082122c6228952e0 | https://plugins.gradle.org/m2/kr/motd/maven/os-maven-plugin/1.7.1/os-maven-p... 4b758004422b9633dd318f29e784f1d180bd8a5920cd50af1930861f6d6a5476 | https://plugins.gradle.org/m2/kr/motd/maven/os-maven-plugin/1.7.1/os-maven-p... -dfa5cbfaaa3b390548e805de001bc9401192e33e022512d176c140eab6903b04 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-serialization/2.3.... -cb84876fe8a77d443a81b863543214b8c4f77bd0d77059cd3b89b9370c3c319f | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-serialization/2.3.... -05d45ca7092c3525c462518492dc1f7e15f0ae1cc23bc07249ec4a421b1c74d5 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-serialization/2.3.... -39795daf2f2f2f0c6dcb7571be9569db7d9ed6326718c29198cddc73a0629e0e | https://plugins.gradle.org/m2/org/jetbrains/kotlin/plugin/serialization/org.... +fb84eef558f1e4dc628b58009c290a254d5cd34c11cc46da9764c6e18d33cedb | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-serialization/2.3.... +510e8dca6340d0e0717d3e4ffce32804dafefb31fefebb1309da91f13ba7bddf | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-serialization/2.3.... +2a8e3e29d3bcbb8880ecc1c12cdc18d8d2404e7a79d804a3d440d6d440ce3d11 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-serialization/2.3.... +379037f25c2de78ca3038481e4037601d697c86b175accaca764a9812230f170 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/plugin/serialization/org.... e256ee50a14d28e59c9c69c090b3e7654c197e84111c94016dd5d55034ccc0ee | https://plugins.gradle.org/m2/org/mozilla/rust-android-gradle/plugin/0.9.6/p... 5f0c98844d8c214409c6ef921ff4520cce91e5d3c590a066add3a14bad850d0c | https://plugins.gradle.org/m2/org/mozilla/rust-android-gradle/plugin/0.9.6/p... ee5cba205efbf7fa45f019ce92d31738a5be38d7a6579ab5fe2a6f8777346f6e | https://plugins.gradle.org/m2/org/mozilla/rust-android-gradle/plugin/0.9.6/p... @@ -303,17 +303,17 @@ c71555751e57e0ef912870e8ac9625ae782502a6a5b9c19ccf83b2a97d8b26bd | https://repo. c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://repo.maven.apache.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.ja... efa86e5cd922f17b472fdfcae57234d8d4ac3e148b6250737dfce454af7a7a44 | https://repo.maven.apache.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.po... 080e2984173238b50e064c226afffbb1b0233520295c790a7fd3d6ae4593f063 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.25.5... -6ca5f1e4380c5323cb103b034edf1160c9fbb676aede5d9989f4def172c7c4d8 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.33.2... +5432cdadd5d21701d0b89d93b58f4c4f7638b1a14e81c0822a34eecd846ca739 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.34.1... dacc58b2c3d2fa8d4bddc1acb881e78d6cf7c137dd78bc1d67f6aca732436a8d | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/... a09d190eaa6a79616bc5f4b5404e94b0cab559803a98c8a090c4099962f41f92 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/... 8540247fad9e06baefa8fb45eb313802d019f485f14300e0f9d6b556ed88e753 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.25.... e752032157a7a39be9be3786684075452a46cd586b2865abd33e707568a4c8af | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.25.... -cd09e496b3d56aaeb9d5fd3e62b7fe20f9f39275c98134e25249ef3952e8dbfb | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/4... -bdfb9efb6a34657a6112fe63f10032865f33596817f1d9bf1d6d8259f27ea2ca | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/4... +cfbc20253fd8c365b74bd63f8f90b90ef92005b6619ce629c3eef39b0afef197 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/4... +a29f2019d95600d25488110e1421fda3bf925791f46582d5708af93ff931e5f4 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/4... 64cc0e3ad6e85f5aec8f9dcf9341d1379e9525364ff53e23e16d8d5824673ef7 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.2... -c8c22112c7860e6eddc7ecb01ce9176fcbb4049eda5b0a26be3d4bb9fbd80211 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.3... -0e3f0ae2a73bc27682baa8981bc18312bab1b2f90c804d528c6ee1f600247189 | https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/4.33.2/proto... -86b0bd1f634ca478ebef19d684815846c89cb79a6a02c659720c0f9e2a521218 | https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/4.33.2/proto... +7f50e0acf52c17491c4d334ae395560a89431b7de902cf28b32c4d4c03848999 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.3... +3d6aef252f3851bdee5a7e7a2c8c927d4980e014d8ac0f18c8ba2d6f084a0504 | https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/4.34.1/proto... +f650529b71a87f987defd92861196551284fb9136db0268f79b9b052bcdfd10b | https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/4.34.1/proto... 757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76 | https://repo.maven.apache.org/maven2/com/googlecode/juniversalchardet/junive... 7846399b35c7cd642a9b3a000c3e2d62d04eb37a4547b6933cc8b18bcc2f086b | https://repo.maven.apache.org/maven2/com/googlecode/juniversalchardet/junive... 20ef4b82e43ff7c652281a21313cf3b941092467add3fa73509c26f6969efdab | https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.10.0/javapoet-1... @@ -473,54 +473,56 @@ ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://repo. 965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotati... 7b0f19724082cbfcbc66e5abea2b9bc92cf08a1ea11e191933ed43801eb3cd05 | https://repo.maven.apache.org/maven2/org/jetbrains/annotations/23.0.0/annota... c9490f655132328df2cfbcfdf743f53fc3916d6c1d10437175a6ca6e3a67771c | https://repo.maven.apache.org/maven2/org/jetbrains/annotations/23.0.0/annota... -1369cb542ae647a9d5549e6d864921ea0f86029749591997b5e5aa161c97188b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/abi-tools-api/2.3.... -c75d8c8a7893e438a36c165e03523eb8744367ac0d695e2c76b678f0b0239c4f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/abi-tools-api/2.3.... -691e2d2a68cb9e0a088f1957de7cfba568e249187699486123d6075fdff39d17 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/fus-statistics-gra... -4ba566118987e6de342eb786f5c065abf28e0f51b10a19f9bab1d09d0f018008 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/fus-statistics-gra... -2ead0529137341a46536e29f24b52b8dc8bcef9771411059bc87978a4aa57052 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/fus-statistics-gra... -ac04e6f4d7a1b0d38d34c6fffd233dd12a66ce29158f25faf00c75ecacd443bc | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-stati... -0f8d76b3cf259936d4bbf27b6d93ab66dc68af8c0169fe1f5e132e418f409e8d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-stati... -1186720b910684df9dad9cb96015ccf19176ec5655ceb09b01fbc45230bd1f64 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... -de905aeed0561d976ec52114f2f3e4e6696cd39320f43ab116f17fefd73d53c2 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... -d8232d07ebac56e11726a0666143dd4a617bedbe3a0bf1f14020f8045d8ac9b3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... -0f8b033a614122fc4406ebbead248a458a0490a8a4bc97d84a96fc5370c3f3c6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... -32f02a6af72b8e0c82f26343b68e0d1da1c844827478feb2fa9dc40df5f9bb5a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... -db56b6cb27528d72b31872856cedab08ec7b18127454c06ec77880850411db58 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... -ac6a182785345380b5db5085dbeea3f5f0e925e2e100e54ab059b5787d4f6e40 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-em... -fe2fcd37b725c5864873cff78ce64d13206e14e08f4b982e1150f68c9c0e896d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-em... -0a9192fb80251ccad1cdbf2caba28488e8d46869d2e5e4957ca179c27c0a4ee0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-ru... -e02b58bd00d90a313137d2f5f19219dadb7715755e6ddd6def8998a5afd18027 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-ru... -d21a6f77d9803a615e6d150857377e10a9e8c7cd06ae6e1c1eb99920fda38b93 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-clie... -b0ea6cb7231eafe8fba0dfb37fc3198499040f74c4d341263edab6c84d19dac0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-clie... -3597117800e60923bcadd0187fa5dbcaa66f82900829d6925d1ea41dd7e27a30 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embe... -d878fd7d078db509b12bf6c740aea31cf72453137a84c775bd4e521c9efb78fd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embe... -cb3f00da7221c73b9fe395b71c5c579ee326260c573a38c219deadeef524764b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -5b8b53ce0a45216ba9eb26515907e67458be729f8eaaf5c1952f6cb2e09f71a7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -292101c3bc45766e6029421b3899322446ccefd5abcd0278863f5210d3494922 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -a7b44ac8fd85acb559690764ac897c1dacfb79495e7e85e663a20c4611025dae | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -aadcbd5c5791f6c54c8b4220a4602fc4504e8eba6c8ecfa4ba61b402446ebad2 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -681656525912ebe0644b6b90ada1483c139c5e930d4f8ea48820dbe181cffbda | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -023c6f1b75017c653422c69a794893691e41efe8c2e3b9f18b5b8c1ec4d0848a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -952e73948e2a20d398c26b87a6bb70ccf66418fbaf1527c3515b188ea9d4bd60 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -9ca6af96daf7ee590a0e59c9efe1df9019ab01e80f447676b9dca8fc5feaf4b5 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -9c01aed154faf7b8ffbef865419f17164063f6b7a9b55813269a50c6b48e9712 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -b8160f458f50923df03fd01b204d95e80f63c4adb140f8949ce50b43d794bde3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -fb3214f5b9fa0d9fccbcbc6df2d1bbd551e5a10fe5bc587b76c374df12f49932 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -e5f98d709772fefdd758fd0a39c4f7c759f2f0171d1aa0cc0cc2b9f0bb6fe395 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -d160b79c8e5d7eceffb906d8c7446150edc9f1b43c657ca505caaf1ff502cee9 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -2a4f7b44a3d0ac7aec7dbf5b1aa88db938bf542f7351561fb1d3b5cf81b60d05 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... -2b4e23a496bda46f243cbfbaa66eb1c4c901b531c1feecc69e79f1bc44f58693 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-common... -ccac1459e8046d5e050f5309e2a8b6664e4806b55a5d4045085588d7ed193a49 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-common... -9200d16967b221aaf6014e4eb0257316798a47bb2816723d3d9c646853d72e13 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-util... -8a791a0829c9f14f05ee3c51ab63905b17687d321f5bba7c571e38ebeee4742d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-util... +53685f5783b0490683898d755abae4d418b6e83ba06134858afddcb5945899e9 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/abi-tools-api/2.3.... +a886c9fd7f2b9669457fec021f19dcf15f0463e0db4bdad53ae18125366cc6f9 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/abi-tools-api/2.3.... +a4f10a3f0ea5ddd1f555a4f706e09ea7f552b3c8522bb1006361dd306e35e76a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/fus-statistics-gra... +6cd8d64b0e65377904f306f6a858dafd931c4135240f844c93d5294ee98fe839 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/fus-statistics-gra... +4a0a454e8af6e503afe67830a18563b9b680deeebb1a1706a0d7b44bc50740a1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/fus-statistics-gra... +a6d27b3c83617652dd065606f98cf59cfbe263f8c20ebe4ebd5a6f2689eb0d4f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-stati... +9d0a8d7ff1723d5d72d3495d55573d8d3c6b7774d61d80579714f79c24265f8f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-stati... +22f1ab223854b949099f6b259cef541d5b58a3643df9a49c4577c63c416e843b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... +1b5e0b2c36905dc2f55e0a4b7812ae63e3125defcf686d2c0f490f83b73d9d5e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... +44c307b4edd4cac51f960a8134112d664c93076700cda5e866e94d9a4296340e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... +ae90be25eb0476108d968ebe32a8ddf525e14088588fa05473db12815a0f1b74 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... +54eced630f28124ccfe2e464e6cacc281e528a8a50a89725721554c9693548fe | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... +e7378c6581ef5f0e2cb40e3a4cec51d2b963e625645a92b67ea09525af97c4c3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... +9681bc2164a8bd9f6ddf4c085cf4a836b92d27506667d73bab9f6d855336c910 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... +82cc1abe5e63d3fe6757e797284f05db9afd7eadc3e83d1139c3a55b64d4b2d5 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools... +976f989d0b5f5d80e8e8a8ad4b73da0bfc27fdd965b9fa38362b2be79ecc1337 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-em... +0c35aeee372f07514ebed37b9407b8e1181d1427755139e5cee7719ca05fe7e8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-em... +c069f30a403be70c8152f8aa9f25eccba188eead54263ae02af14421437a2208 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-ru... +8d84ea0edd60b38bcea562de5178152a2671a9a0053d670f931452b3db013228 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-ru... +c71a7c1be8fbff04e0af45c9ee8cb7a61d8953bca6b8bf225a5719c725a90b44 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-clie... +9e7c8b80724117f72aace65f6be48d836db8fc39753ad951f2bb90862d7e7080 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-clie... +8870bab840b8087c96c4ddc06088b4aedf5131c408af3674306304f1f96af3f4 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embe... +61540e5b3a32c0b11962449665924c6cd7554ea9aee0855bd8e4f5b7f610a0ab | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embe... +e1662ed747322b63f61d4fadd99ab78104c45eaf09c11a789862415e81c18dc4 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +68ff827fc1350d93f0d673368c06479b62b7d5e5c30658a958cf93066831e8d9 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +c9bc17df69bf39907c597c1e19bec4b479c75aac75fbfd6321e3445b49712e88 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +d3850110ff5a8eb70fed2d578b45fb07ebc44af6a291ae4cf3c79430c65128ba | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +01d552213491c853d56f87eb74813038df9ee1d85e9086aa37bd0663b2496f88 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +e4289cbf9ff49407f041ddc6336e1b577a6ca4cf2be1d2a31338271c13eed3ed | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +f6f78739ba9fe2712e9f0c9e5bc4f5e93719ccfea95b47c2f49b250be176357e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +952e73948e2a20d398c26b87a6bb70ccf66418fbaf1527c3515b188ea9d4bd60 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +6fb5d97300a5e559afd4d9ff9ac0356c4d966f7d694b662fae169fd87421531e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +59138721518d82a343f7dc2f0912b70498d3eef3363c9ebac220acb0fc938ecc | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +46e16ee26594f480fecb92c96daae37530e835026b78e37ef3251e957f03f6fb | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +95552673b81b3578ad9b2f3aff1454b63ce806c6fd4ab7c6049231e8640ab471 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +11c323c2dd8a804e9f58e047c2c01864b2a01dc0d8132b363c0a4312215bc09b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +f82bd7645d0c3efeb4f4f65520a3c65b3e8c302b083322037a0001b87b02e990 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +dd6b919197e132fe71ddac70f6fc5d8fae7f52777afd837b14de871b8c0a5400 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +be9377485412d00f01e78299cb30be4802591c2730342b6ebdafc0894f752743 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-common... +21b15ba5bd62d21d536bb7a0c8cb6743571fc0f43092548a4235b26f2a1d220b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-common... +4319c2764795efbdff2b78ee95455157d7af0b9155698baa1ba52a6abe3abf2d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-util... +2c0a7e0035620885d437e7f126274475ba58aa2242fb5dbbf43f91f20cafa708 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-util... 3277ac102ae17aad10a55abec75ff5696c8d109790396434b496e75087854203 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6... 57905524274a00ae028aaccc27283f6bc5925a934a046c1cc5d06c8ee4d6d5a9 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6... 230d91c2e410e3cfca3a4dc73d255455f62ff52aac091a33397a6e30bde91bf7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.2... deed831efcb663e4cf3d5121e5ae796f201e37b813d2c7d607b5f1f8a86fe52e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.2... -d0b3b08ecf8901c6610aa0e8efb29db3731bfbd96afd4f987cc817016b1e003e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runt... -c228a31855d5df5b386e119f1728cfa9e43d2dcdb78139c292a8d3ed267ac587 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runt... -75d66e4a95072a95e702453ea07fcc1479ac835c1623de7ae739d044e6f5f366 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-serializati... -bf42a6e26bdeb45188c6d7f837b3d796d188793f2ea1eb8ee88bd234dc182363 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-serializati... +6fcdb7da6e65cf8cc43e5aabab94bdcc48825e7933686f8a1bf694eb88f8e00e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runt... +66099676703a081fd9ac43139665883e5c145020b640759de0539d8916ff247f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runt... +178edb62cda3e255fc80e270656f2848b6e0752f7b4b4c27e4a88cc537bea674 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-serializati... +6f655d402b2ccb1b45c758f7ffbcaa05d187ab25ea07eb8ddfcaa674e1505973 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-serializati... 0d10bc0d42b8605f23629a3f31ea27c19cdbca9dcdf4f53f6d22cd6366836d18 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7... 95c2189c35ef7bfc48951c32ad70847b21f3809d26f5d0a76e23570879988c30 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7... adc16648dbbcf35b0d10e7ec301c35d746d1c2fe460c606aba59f12b117cf9b0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8... @@ -528,23 +530,22 @@ adc16648dbbcf35b0d10e7ec301c35d746d1c2fe460c606aba59f12b117cf9b0 | https://repo. 65d12d85a3b865c160db9147851712a64b10dadd68b22eea22a95bf8a8670dca | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.2.... a5b98fdcd9db017d542e197225dcee18d658a56de1db2cc41e13196d6b1769a4 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.2.... 8c3c821007c13411558739b9f3d5382eb81551db3895cffb89561e56c0f4dc16 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.2.... -f61662c6d3a2f8ef5bd34362a02d877772c39f393cd394feb259dfaf7f4d8437 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.3.... -ea871f66319cda27ab2522fa8d929131d5e6fcb53344e4f54cdae03111d150aa | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.3.... -4a3f8ed8a44c7ed8b31ae5101334880587c10970653f4b3b944fdb23830b2420 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.3.... -367142781299bc0f9120c1deec0e62934a1af9ea7f01aaa9c5a5354dc5d8d7d9 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-cor... -e61873edd5a8dd031a6ba9759c05d15690659e612e3d48c1ed122737dab44986 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-cor... -e01c370e7f37fc4d0293b9571141f53709e5109e28ec9d5082732d3820d67f2e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/2.3... -2d97eaa3677a404a0529321a678aeb2d1cc39f9130c1149a98d166dd32fc2b74 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/2.3... -d6e054db300e5ea7b208e8e36683cd6c4d7474d88b69169515b7b0ebd7b50c8b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib-m... -793fe4b438f00778682435ce1b1bcf5ba7de65247a248b99a5eea9992a2fe5a0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib-m... -e5bde04fc8d2f21d7059f05ca74d54b5890a0b8cc2a890ff2208c2841ec765f8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/2... -4b34a4d81af9c549a0f013a3ea001078ce44a2d0446707946a492105b692931d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/2... +0ae12504a5040ebaf37703908483420d1a5624dd1d93f357665f8c77c848a01e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.3.... +f4eb344fc4d1e3a28ae16c086ec3e42f52373b466d4308182fb386e392c0efa3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.3.... +c83c02d9a7e2e954730491c33c2f1dc03c27662e27b566ec2b44d2d018639b98 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.3.... +367142781299bc0f9120c1deec0e62934a1af9ea7f01aaa9c5a5354dc5d8d7d9 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-cor... +47e3aefd24b5be62d807b6cbcd79c55b83f94b55cfe18efdc6e33ce11bf190e4 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-cor... +0e76e7471e91c53ea68d2d24ef1f29fb592ac5fbb0d1d10faa916430eff3daca | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/2.3... +95c28a828fc1f1e59e65638247a64f766d81d8b59f6d8debef2d18a0cc321f89 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/2.3... +a8994e0bca6846dfb19f458c4cc15d7b13779ca1b0d9f34880b5ff2c2a2b73b3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib-m... +8f10291071aefabbd8e66ff9af7743a23881d69c6aaf28e13616cc0e95bd17b7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib-m... +9562b8d3b7a04beba2b14c05671e713859ea54bbc0a2107e65b2bcf273fa8448 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/2... +5a584c3cc2ba3b41d1e5cd7e7a2083576c1b8c397a79bb8163676d8ef7b0ea17 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/2... e713f1f874244115a07571065cffa0f24f5e78300e9720fea16de3af1d75fd41 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... 092fe38103eec62e94540ca0cd61039ef8f7d8e46694ec033be1f63f0ea2013d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... b92d3672e7f9e8f4c4e2ab187c3e31fecc506496396f4a5f27ee1c957a42b319 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... faf0c6538e53ddc0499a63664d8e763c216580b2e18e722ccbdf1b431a6afe26 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... 1239e9dbe1397cd5971342956b2511bc3ace7b641842e4372a088dcfa8b9ad55 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... -563e4aa29fa8fe09a6e1746d0a5b51308f7c7dedc468dc5a0ca810a485877030 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... bea5511e9001f2c593ab5080df131b219ab5e2085cc5979ce583eacd4946fd78 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... 5ca175b38df331fd64155b35cd8cae1251fa9ee369709b36d42e0a288ccce3fd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... e9e4a74b4dbfe0f5ebeed88d49f3546c3ec3089419b20e5250403135c2c64c53 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... @@ -557,8 +558,6 @@ b321a899e40d3ce345707aa2cfda9983ad0dcc69fea74a9b8bf906a16c1cf8a9 | https://repo. 19c4889941b3aa098bd57cc64f02f9adacc654d571a12a956de4b5bb148c6499 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... 8fe254177e711a7cd18a3c06d8242fce945f41c2cca13dc19b33ae42a5435016 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... 519da5400096f3462a4dae80783ad050413d4bc81ec7ae53fae76aef0ccbed4c | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... -08cbaf3325b54e0f8ef8da85e4eb596f7d946f843e5d1600385463f3268a4ef0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... -f88918dbfa8787c4d171ab02553a14ad1def8aa9b0c5c2c20cc99455d3241e22 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... ad534034a953b4e12cbeeb874c66adf8b1ca14df15fe0d2e6547aa34e86dfeca | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... 770f2793d05e2b027b9c799938ec1d2d4ef141ce5819c780c32c3995cadb0a47 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutine... 2e973e4dfc3bc638dd2e683da959dc2b97923297bf3b8f60c7ff00d61eac3b07 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-serializa... ===================================== projects/firefox/build ===================================== @@ -108,6 +108,7 @@ export LANG=C.UTF-8 [% IF c("var/firefox-browser") && c("var/windows") -%] patch -p1 < $rootdir/firefoxbrowser-BB-29320.patch + patch -p1 < $rootdir/firefoxbrowser-0001-Bug-2024724-Fix-PowerCounters.h-because-we-do-not-co.patch [% END -%] echo "Starting ./mach configure $(date)" ===================================== projects/firefox/config ===================================== @@ -18,13 +18,13 @@ container: use_container: 1 var: - firefox_platform_version: '149.0a1' + firefox_platform_version: '150.0a1' firefox_version: '[% c("var/firefox_platform_version") %]' browser_series: '16.0' - browser_rebase: 2 + browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' browser_build: 3 - upstream_firefox_commit: FIREFOX_NIGHTLY_149_END + upstream_firefox_commit: FIREFOX_NIGHTLY_150_END copyright_year: '[% exec("git show -s --format=%ci " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser @@ -246,3 +246,10 @@ input_files: # build for Windows - filename: firefoxbrowser-BB-29320.patch enable: '[% c("var/firefox-browser") && c("var/windows") %]' + # Patch added in the 151 branch to fix MinGW build: + # https://bugzilla.mozilla.org/show_bug.cgi?id=2024724 + # Later reverted as part of: + # https://bugzilla.mozilla.org/show_bug.cgi?id=2026031 + # We should drop this patch when updating to Firefox 151. + - filename: firefoxbrowser-0001-Bug-2024724-Fix-PowerCounters.h-because-we-do-not-co.patch + enable: '[% c("var/firefox-browser") && c("var/windows") %]' ===================================== projects/firefox/firefoxbrowser-0001-Bug-2024724-Fix-PowerCounters.h-because-we-do-not-co.patch ===================================== @@ -0,0 +1,100 @@ +From 138c33ea964b2e0a4875aadc39d8a948e0c2aace Mon Sep 17 00:00:00 2001 +From: Damien Carver <dcarver@mozilla.com> +Date: Mon, 23 Mar 2026 15:40:58 +0000 +Subject: [PATCH] Bug 2024724 - Fix PowerCounters.h because we do not compile + PowerCounters-win.cpp against __MINGW32__ r=canaltinova,profiler-reviewers + +Differential Revision: https://phabricator.services.mozilla.com/D288844 +--- + mozglue/baseprofiler/public/BaseProfilerState.h | 2 +- + tools/profiler/core/PowerCounters.h | 14 +++++++------- + tools/profiler/moz.build | 1 + + tools/profiler/public/ProfilerState.h | 2 +- + 4 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/mozglue/baseprofiler/public/BaseProfilerState.h b/mozglue/baseprofiler/public/BaseProfilerState.h +index 608bf26826ff9..9b2a4e9381f13 100644 +--- a/mozglue/baseprofiler/public/BaseProfilerState.h ++++ b/mozglue/baseprofiler/public/BaseProfilerState.h +@@ -136,7 +136,7 @@ class MOZ_RAII AutoProfilerStats { + "Record the power used by the entire system with each sample. " \ + "Only available with Intel CPUs and requires setting " \ + "the sysctl kernel.perf_event_paranoid to 0." +-#elif defined(GP_OS_windows) ++#elif defined(GP_OS_windows) && defined(_MSC_VER) + # define POWER_HELP \ + "Record the value of every energy meter available on the system with " \ + "each sample. Only available on Windows 11 with Intel CPUs." +diff --git a/tools/profiler/core/PowerCounters.h b/tools/profiler/core/PowerCounters.h +index 896a2398b646f..e2ae294c8b65b 100644 +--- a/tools/profiler/core/PowerCounters.h ++++ b/tools/profiler/core/PowerCounters.h +@@ -10,7 +10,7 @@ + #include "mozilla/UniquePtr.h" + #include "mozilla/Vector.h" + +-#if defined(GP_OS_windows) ++#if defined(GP_OS_windows) && defined(_MSC_VER) + class PowerMeterDevice; + #endif + #if defined(GP_PLAT_arm64_darwin) +@@ -50,20 +50,20 @@ bool GetRailEnergyData(RailEnergyData*, size_t* size_of_arr); + + class PowerCounters { + public: +-#if defined(GP_OS_windows) || defined(GP_OS_darwin) || \ ++#if (defined(GP_OS_windows) && defined(_MSC_VER)) || defined(GP_OS_darwin) || \ + defined(GP_PLAT_amd64_linux) || defined(GP_PLAT_arm64_android) + explicit PowerCounters(); + #else + explicit PowerCounters() {}; + #endif +-#if defined(GP_OS_windows) || defined(GP_PLAT_amd64_darwin) || \ +- defined(GP_PLAT_arm64_android) ++#if (defined(GP_OS_windows) && defined(_MSC_VER)) || \ ++ defined(GP_PLAT_amd64_darwin) || defined(GP_PLAT_arm64_android) + ~PowerCounters(); + #else + ~PowerCounters() = default; + #endif +-#if defined(GP_OS_windows) || defined(GP_PLAT_amd64_darwin) || \ +- defined(GP_PLAT_arm64_android) ++#if (defined(GP_OS_windows) && defined(_MSC_VER)) || \ ++ defined(GP_PLAT_amd64_darwin) || defined(GP_PLAT_arm64_android) + void Sample(); + #else + void Sample() {}; +@@ -75,7 +75,7 @@ class PowerCounters { + private: + CountVector mCounters; + +-#if defined(GP_OS_windows) ++#if defined(GP_OS_windows) && defined(_MSC_VER) + mozilla::Vector<mozilla::UniquePtr<PowerMeterDevice>> mPowerMeterDevices; + #endif + #if defined(GP_PLAT_amd64_darwin) +diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build +index e5fcb8f1c136f..fdd8a36c67672 100644 +--- a/tools/profiler/moz.build ++++ b/tools/profiler/moz.build +@@ -167,6 +167,7 @@ elif CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] in ( + UNIFIED_SOURCES += [ + "gecko/nsProfiler.cpp", + ] ++ # Keep in sync with PowerCounters.h, BaseProfilerState.h and ProfilerState.h (see __MINGW32__) + if CONFIG["CC_TYPE"] == "clang-cl": + UNIFIED_SOURCES += [ + "core/PowerCounters-win.cpp", +diff --git a/tools/profiler/public/ProfilerState.h b/tools/profiler/public/ProfilerState.h +index 444ee7fd5043c..d44cef710440f 100644 +--- a/tools/profiler/public/ProfilerState.h ++++ b/tools/profiler/public/ProfilerState.h +@@ -31,7 +31,7 @@ + "Only available with Intel CPUs and requires setting " \ + "the sysctl kernel.perf_event_paranoid to 0." + +-#elif defined(GP_OS_windows) ++#elif defined(GP_OS_windows) && defined(_MSC_VER) + # define POWER_HELP \ + "Record the value of every energy meter available on the system with " \ + "each sample. Only available on Windows 11 with Intel CPUs." ===================================== projects/firefox/firefoxbrowser-BB-29320.patch ===================================== @@ -1,37 +1,32 @@ -commit df53f566fa75408c95f3f619e1eee30417449642 +commit 14f983a3309fccc6dc5f4a2377fe2b4a0b80be0c Author: Pier Angelo Vendrame <pierov@torproject.org> Date: Thu Jun 13 09:22:53 2024 +0200 BB 29320: Replace the gnu target with gnullvm for Rust. diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index d71d2fbe33b77..62ceec58677a2 100644 +index 69051c7d8eb25..8618c0faf771a 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -490,12 +490,16 @@ def split_triplet(triplet, allow_wasi=False): +@@ -493,11 +493,11 @@ def split_triplet(triplet, allow_wasi=False): canonical_kernel = "kFreeBSD" elif os.startswith("gnu"): canonical_os = canonical_kernel = "GNU" -- elif os.startswith("mingw") or os in ("windows-msvc", "windows-gnu"): -+ elif os.startswith("mingw") or os in ( -+ "windows-msvc", -+ "windows-gnu", -+ "windows-gnullvm", -+ ): +- elif os in ("windows-msvc", "windows-gnu"): ++ elif os in ("windows-msvc", "windows-gnu", "windows-gnullvm"): canonical_os = canonical_kernel = "WINNT" - if not os.startswith("mingw"): - if os == "windows-msvc": - abi = "msvc" -- elif os == "windows-gnu": -+ elif os == "windows-gnu" or os == "windows-gnullvm": - abi = "mingw" - # Many things down the line are looking for the string "mingw32" - # until they are all fixed, we pretend that's the raw os we had + if os == "windows-msvc": + abi = "msvc" +- elif os == "windows-gnu": ++ elif os == "windows-gnu" or os == "windows-gnullvm": + abi = "mingw" + # Many things down the line are looking for the string "mingw32" + # until they are all fixed, we pretend that's the raw os we had diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure -index 6c1c891817133..ee836b6060756 100644 +index e40d71d9f5b35..d26fca7beac5f 100644 --- a/build/moz.configure/rust.configure +++ b/build/moz.configure/rust.configure -@@ -310,9 +310,9 @@ def detect_rustc_target( +@@ -308,9 +308,9 @@ def detect_rustc_target( if host_or_target.abi == "msvc": suffix = "windows-msvc" elif host_or_target.abi == "mingw": ===================================== projects/firefox/mozconfig-upstream-firefox.in ===================================== @@ -3,11 +3,11 @@ # options are set in the specific mozconfig files in tor-browser.git. [% IF c("var/windows-x86_64") -%] - ac_add_options --target=x86_64-w64-mingw32 + ac_add_options --target=x86_64-pc-windows-gnu ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32- [% END -%] [% IF c("var/windows-i686") -%] - ac_add_options --target=i686-w64-mingw32 + ac_add_options --target=i686-pc-windows-gnu ac_add_options --with-toolchain-prefix=i686-w64-mingw32- [% END -%] [% IF c("var/windows") -%] ===================================== projects/geckoview/config ===================================== @@ -21,10 +21,10 @@ container: build_apk: '[% !c("var/online_build") %]' var: - firefox_platform_version: '149.0a1' + firefox_platform_version: '150.0a1' geckoview_version: '[% c("var/firefox_platform_version") %]' browser_series: '16.0' - browser_rebase: 2 + browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' browser_build: 3 gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser @@ -38,7 +38,7 @@ var: - python3-zstandard - pkg-config - openjdk-17-jdk-headless - gradle_version: 9.2.1 + gradle_version: 9.4.1 glean_parser: 14.0.1 # python/mozboot/mozboot/android.py bundletool_version: 1.18.3 @@ -64,7 +64,7 @@ targets: online_build: 1 has_l10n: 0 - # Run `make get_gradle_dependencies_list-geckoview` to + # Run `make generate_gradle_dependencies_list-geckoview` to # generate the gradle dependencies file. You can them move the file # `out/geckoview/gradle-dependencies-list-$version.txt` # to `projects/geckoview/gradle-dependencies-list.txt`. ===================================== projects/geckoview/gradle-dependencies-list.txt ===================================== The diff for this file was not included because it is too large. ===================================== projects/glean/config ===================================== @@ -3,7 +3,7 @@ git_hash: 'a793015bad500379ec5480e280ac2631178a2013' # v67.0.0 git_url: https://github.com/mozilla/glean.git filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' # Check for mozilla-glean in gradle/libs.versions.toml in the tor-browser repository -version: 67.0.0 +version: 67.1.0 container: use_container: 1 disable_network: @@ -56,7 +56,7 @@ steps: - filename: use-uniffi-noop.diff targets: - # Run `make get_gradle_dependencies_list-glean` to + # Run `make generate_gradle_dependencies_list-glean` to # generate the gradle dependencies file. You can them move the file # `out/glean/gradle-dependencies-list-$version.txt` # to `projects/glean/gradle-dependencies-list.txt`. ===================================== projects/gradle/config ===================================== @@ -12,7 +12,7 @@ var: export PATH=$PATH:$GRADLE_HOME/bin gradle_sha256sum: 8.14.3: bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 - 9.2.1: 72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f + 9.4.1: 2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb input_files: - project: container-image ===================================== projects/mingw-w64-clang/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% pc("llvm-project", "version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 59830ec1d93be038ffe883b69229753bb18ff59e +git_hash: 43f2643cbde20aff1c4b89a98c78d0b4b0fe90c2 version: '[% c("abbrev") %]' container: use_container: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/7... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/7... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help