Pier Angelo Vendrame pushed to branch maint-15.0 at The Tor Project / Applications / tor-browser-build

Commits:

9 changed files:

Changes:

  • projects/application-services/build
    ... ... @@ -25,8 +25,11 @@ export JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64
    25 25
     [% INCLUDE 'fake-git' %]
    
    26 26
     
    
    27 27
     [% IF !c('var/fetch_gradle_dependencies') %]
    
    28
    +  tar -xf [% c('input_files_by_name/glean') %]
    
    29
    +
    
    28 30
       gradle_repo=/var/tmp/dist/gradle-dependencies
    
    29 31
       mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo
    
    32
    +  cp -rl $rootdir/glean/maven/* $gradle_repo
    
    30 33
       cp -rl $gradle_repo/dl/android/maven2/* $gradle_repo || true
    
    31 34
       cp -rl $gradle_repo/m2/* $gradle_repo || true
    
    32 35
       cp -rl $gradle_repo/maven2/* $gradle_repo || true
    

  • projects/application-services/config
    ... ... @@ -16,9 +16,9 @@ container:
    16 16
       use_container: 1
    
    17 17
     
    
    18 18
     var:
    
    19
    -  build_number: 6
    
    19
    +  build_number: 7
    
    20 20
       # This should be updated when the list of gradle dependencies is changed.
    
    21
    -  gradle_dependencies_version: 12
    
    21
    +  gradle_dependencies_version: 13
    
    22 22
       gradle_version: 8.13
    
    23 23
       nss_version: '3.110'
    
    24 24
       nspr_version: '4.36'
    
    ... ... @@ -57,6 +57,10 @@ steps:
    57 57
           - project: uniffi-rs
    
    58 58
             name: uniffi-rs
    
    59 59
             pkg_type: build
    
    60
    +      - project: glean
    
    61
    +        name: glean
    
    62
    +        pkg_type: build
    
    63
    +        enable: '[% !c("var/fetch_gradle_dependencies") %]'
    
    60 64
           # Only Application Services currently requires build tools 35.
    
    61 65
           # So, download them only here, rather than adding them to the shared
    
    62 66
           # toolchain.
    

  • projects/application-services/gradle-dependencies-list.txt
    ... ... @@ -11,7 +11,6 @@ c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7 | https://repo.
    11 11
     06fbc14ecb14a0af47b5a3f8d34763f4933d5cba5a3d245045bfe2f2bdb91b1e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/2.1.0/kotlin-stdlib-jdk7-2.1.0.pom
    
    12 12
     a8b17513949e5db6c9601c30be19df953762dd877512f1e2cfcfae81d2440944 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.2.0/core-runtime-2.2.0.module
    
    13 13
     8769e5647557e3700919c32d508f5c5dad53c5d8234cd10846354fbcff14aa24 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-serialization-json-jvm/1.8.1/kotlinx-serialization-json-jvm-1.8.1.jar
    
    14
    -5792a08566c294a46ea777939819154a945eeee8d5cb47d391f845d7c711013a | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/64.3.1/glean-64.3.1.pom
    
    15 14
     5bad1de4f101447659f89d089868ccbad64a68cc503d2d65410b51f6904aa061 | https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.5.14/httpcomponents-client-4.5.14.pom
    
    16 15
     e6c7f18a3228f56ca91400a54ddad21e1d789a9f9a07263b560c8c95347c63cd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools-impl/2.1.21/kotlin-build-tools-impl-2.1.21.jar
    
    17 16
     29091c9457252f997ddfeafb33dd65a373ad45840128f945832d8eafd9118561 | https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/8.10.0/apkzlib-8.10.0.jar
    
    ... ... @@ -51,7 +50,6 @@ c5fd725bffab51846bf3c77db1383c60aaaebfe1b7fe2f00d23fe1b7df0a439d | https://repo.
    51 50
     c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://repo.maven.apache.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar
    
    52 51
     8362004b686681cdc2b022ee1c86d2582c95c2f7a988b21ee5facc4a979312ca | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/31.10.0/intellij-core-31.10.0.jar
    
    53 52
     555d0c9eaa69c042aff924927b9381e8f8174136d355eead445224452e6291cc | https://repo.maven.apache.org/maven2/org/apache/apache/31/apache-31.pom
    
    54
    -17ae368dcc12a965df8a9195e5d897fb70400159a87effcf65ee5c05790f814e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-native/64.3.1/glean-native-64.3.1.pom
    
    55 53
     c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92 | https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.24/animal-sniffer-annotations-1.24.jar
    
    56 54
     11386cfa46cbbfddb6a4059f14354c00691cf65d3d63c3618818a83326ef3c7f | https://dl.google.com/dl/android/maven2/androidx/core/core-viewtree/1.0.0/core-viewtree-1.0.0.module
    
    57 55
     2aee3523715f8f2cd10b2603c8d19e561ac758310b7e2c9853946d2c5e7b4bf7 | https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.7.0/tink-1.7.0.pom
    
    ... ... @@ -111,7 +109,6 @@ febb30a5cf238237d075a3923e893992183daf171a1eb434acf132114a5f7f8a | https://repo.
    111 109
     6de29bceab25a1bd0be11eea8468d0e3f1c0c476d0a533215b4fde1c8284b570 | https://repo.maven.apache.org/maven2/io/grpc/grpc-context/1.69.1/grpc-context-1.69.1.pom
    
    112 110
     45ef95b8c158a8b5bdd3acb67b9e682ef25414bb148f488ec847438ab64715d4 | https://repo.maven.apache.org/maven2/io/grpc/grpc-context/1.69.1/grpc-context-1.69.1.jar
    
    113 111
     51717bb7471141950390c6713a449fdb1054d07e60737ee7dda7083796cdee48 | https://repo.maven.apache.org/maven2/io/netty/netty-transport-native-unix-common/4.1.110.Final/netty-transport-native-unix-common-4.1.110.Final.jar
    
    114
    -e04e25951501df25adc7b1dcdb6c53373c94897b84d3e14921292763ee07ae3d | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.pom
    
    115 112
     9ecea8bf2b1b39963939d18b70464eef60c508fed8820f9dcaba0c35518eabf7 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.jar
    
    116 113
     0fc55e4d215f4b021d881172acef82464061d962dfebb113a0540dc7045928e5 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/31.10.0/tracker-31.10.0.jar
    
    117 114
     8273692ccc17094d746cafd04b679f259cbf501b2ea8475e349fba24ed3976b9 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime-ktx/2.10.0/work-runtime-ktx-2.10.0.aar
    
    ... ... @@ -212,7 +209,6 @@ d327e8a93f65fca90cd2c188da83883e50ca3e3689da7dfafe4797c718c939b6 | https://dl.go
    212 209
     c8bc7e1c51a6d4ce72f40d2ebbabf1c4b68bfe76e732104b04381b493478e9d6 | https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.14/httpclient-4.5.14.jar
    
    213 210
     1aecc515671afc84b5ff5b28d5895efb443dddab49dd5cc7400976a1cfc510c9 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime/2.10.0/work-runtime-2.10.0.pom
    
    214 211
     57e8d93260d18d5b9007c9eed3c64ad159de90c8609ebfc74a347cbd514535a4 | https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.1.1/versionedparcelable-1.1.1.aar
    
    215
    -79aa542e883553436721d40af661beb9ac09dad323b89afde057631c54fdf83c | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-native/64.3.1/glean-native-64.3.1.aar
    
    216 212
     8460c950127ca3598766161e38b4ff8d63b4d69fb8310a16e00b351350010c11 | https://plugins.gradle.org/m2/com/google/gradle/osdetector-gradle-plugin/1.7.3/osdetector-gradle-plugin-1.7.3.pom
    
    217 213
     943e12b100627804638fa285805a0ab788a680266531e650921ebfe4621a8bfa | https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.pom
    
    218 214
     6804cd5f05d77fa954ac7b7a930e7b57fae08caf024e2291880a3c28a49fc075 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/2.1.21/kotlin-gradle-plugin-model-2.1.21.jar
    
    ... ... @@ -238,7 +234,6 @@ c733881c2e17d5f7c8661cc02a9159cb160b7b2094a27d593916c87d3e250636 | https://dl.go
    238 234
     0de78fc06ee5045d68fc7e81c313a2a3d53ac7d127f79f9bc95abf7be49e5764 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.8.7/lifecycle-common-2.8.7.module
    
    239 235
     c5067a7b928237a1271a5e9cb5710e9f80b4973293945bc51e3a4c864ea4bfed | https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta10/jetifier-processor-1.0.0-beta10.jar
    
    240 236
     91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff | https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar
    
    241
    -07742881a447c577669139ed7548fc4a0e6c43c63aa28a6f4652ff2d163b94f6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/64.3.1/glean-gradle-plugin-64.3.1.pom
    
    242 237
     88970a456a08ba4c66b01b23e5846ca1095cc14e54cb48363e5d2e15a1307308 | https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.7.0/tink-1.7.0.jar
    
    243 238
     9851ec66548b9e0d41164ce98943cdd4bbe305f68ddbd24eae52e4501a0d7b1a | https://repo.maven.apache.org/maven2/io/netty/netty-common/4.1.110.Final/netty-common-4.1.110.Final.jar
    
    244 239
     cb00e5cb9283b75948dcc0d27234fb6d72a80c34dcb7b3b8d493185e4316bf85 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.8.7/lifecycle-runtime-2.8.7.module
    
    ... ... @@ -272,7 +267,6 @@ fc15b14fc550ab81a61a36ef1f21b8fd1df843f584099b081bde0cc7fb952e74 | https://plugi
    272 267
     e147d258ab6e6691f70599a952400e6e6c7558f8c9c028dbe1be23178308e830 | https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16.pom
    
    273 268
     51b731e5cff121efd6d320f4a801cd616869c5bed4e9c0e353b29060b1d2355f | https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.22/groovy-3.0.22.pom
    
    274 269
     b24f8d51f184a68bc1b86d48c0e3cfefeb21a44ede1c5f7303c58ae0488533ec | https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.3.2/jaxb-runtime-parent-2.3.2.pom
    
    275
    -81a8b9afc65f9d6b205338c25908af8de0ff8411a00985104c9d83fffdfab380 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.aar
    
    276 270
     821a8f101caca6381ada36f233b9c91fcc0886b3584f5eaa5cf3044849bab6a2 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/2.1.21/kotlin-scripting-jvm-2.1.21.pom
    
    277 271
     7ab526b9f479533055b844c52aae0bf53ee9a2a27882f29c4e9acf46faf25d29 | https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/31.10.0/android-device-provider-gradle-proto-31.10.0.pom
    
    278 272
     b48b04ddba40e8ac33bf036f06fc43995fc5084bd94bdaace807ce27d3bea3fb | https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.2/auto-value-annotations-1.6.2.jar
    
    ... ... @@ -338,7 +332,6 @@ cc7eed0ed4b669de84b852f78797a50018a4f30002e1e38aaa668af22ca5b460 | https://dl.go
    338 332
     748a34eb5d13d19d187adecaea82667fded5f1b0b98a655e13ed2e4a8b3d8ae6 | https://dl.google.com/dl/android/maven2/androidx/concurrent/concurrent-futures/1.1.0/concurrent-futures-1.1.0.pom
    
    339 333
     55441db27e8869dfefe053059bdf478bdc7e95585642bf391f0023345fd56287 | https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.3.1-jre/guava-parent-33.3.1-jre.pom
    
    340 334
     7e120e4dfca08edd4890afe0b68bba5aa89f27fba11d8fe68f6b6da0b2129358 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/2.1.21/kotlin-gradle-plugin-2.1.21.module
    
    341
    -cb1c7a04874d97c6bb1d3ba4ce009e1fde5f46225b45f6bb87559328573b530b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/64.3.1/glean-64.3.1.aar
    
    342 335
     e713f1f874244115a07571065cffa0f24f5e78300e9720fea16de3af1d75fd41 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.10.2/kotlinx-coroutines-android-1.10.2.jar
    
    343 336
     5777d292251c7895c04a4c57015683ec3b353a12486c9b3e7178e9b0b3c38fff | https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.pom
    
    344 337
     e9f18b8a41f017e9033cb0ed85c8a2ba2307292cdfe25eae365923e7a31d2a70 | https://repo.maven.apache.org/maven2/org/tensorflow/tensorflow-lite-metadata/0.2.0/tensorflow-lite-metadata-0.2.0.jar
    
    ... ... @@ -424,7 +417,6 @@ d324cb785134d419757709118f86e2a88f3cc0b222bd8c23495ddbcb7a800cac | https://dl.go
    424 417
     36c25576b19993df360170528cc62b7246c37776d6158154a67cdf8fc2d58e13 | https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta10/jetifier-processor-1.0.0-beta10.module
    
    425 418
     e982eadc788c69cf2e4de50a9f632b182c31dba50612830d348fc4b4ba8dd7d6 | https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/2.2/snakeyaml-2.2.pom
    
    426 419
     fc0905810309a5ad3ea15dfbbe129a47e90db11215232364841b72044124e7b0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/fus-statistics-gradle-plugin/2.1.21/fus-statistics-gradle-plugin-2.1.21-gradle85.jar
    
    427
    -34ed1e1f27fa896bca50dbc4e99cf3732967cec387a7a0d5e3486c09673fe8c6 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar
    
    428 420
     984ce9bd780055eafb8a105aca3f514686bf7b1b6272ec7c645a98ce40fc7db4 | https://dl.google.com/dl/android/maven2/androidx/collection/collection-jvm/1.4.2/collection-jvm-1.4.2.jar
    
    429 421
     4505b9a5e30a9418b59a9ad6702c3e4193aea6e691a3d03cf220c7640ad083e2 | https://dl.google.com/dl/android/maven2/androidx/concurrent/concurrent-futures/1.0.0/concurrent-futures-1.0.0.pom
    
    430 422
     8fc84f36ce6da6ce8c893b6538199a7f69a69a0706d9b17a3ee6a3a09452eed6 | https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
    
    ... ... @@ -475,7 +467,6 @@ b537b388dbab4cc0690b9d2fb0c74124d672531734567acf6e53130eab131ad6 | https://repo.
    475 467
     9a579b54d292ad9be171d4313fd4739c635592c2b5ac3a459bbd1049cddec6a0 | https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.7.1/asm-commons-9.7.1.jar
    
    476 468
     6260c875066300987319d9006786db7a6b6b46f1c4072adc5aedc9c617845bb2 | https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/8.10.0-12782657/aapt2-proto-8.10.0-12782657.pom
    
    477 469
     20522549056e9e50aa35ef0b445a2e47a53d06be0b0a9467d704e2483ffb049a | https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.jar
    
    478
    -7d66a1b1e51592eda1e77c44d5692192dbffc828ea3899ff92ae0161b681a336 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/64.3.1/glean-gradle-plugin-64.3.1.jar
    
    479 470
     637b7a7ecb20533b6d2d5401bed07e20549eb700019c6257f137eca73a0cb419 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/8.10.0/gradle-8.10.0.jar
    
    480 471
     b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://plugins.gradle.org/m2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
    
    481 472
     7e0747751e9b67e19dcb5206f04ea22cc03d250c422426402eadd03513f2c314 | https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.pom
    
    ... ... @@ -604,3 +595,6 @@ ea0131846abe1fe9dea59ac6dfe1f0fb9d8b6d600c9eff9a1fd4ad5ee5e7cbc7 | https://dl.go
    604 595
     edf4200cfdc2d946232252c99e5dcb9c61bb909eb5450b2613d1d4fdc974b981 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.2.0/core-common-2.2.0.module
    
    605 596
     22c175c2c1823667630c84e73225767f5970492d8e6cbffb81a6575dba472d26 | https://repo.maven.apache.org/maven2/io/perfmark/perfmark-api/0.27.0/perfmark-api-0.27.0.pom
    
    606 597
     578649d9034e92d887286f9b2966e53721b66c714e53258fcc3387eb59b6b84b | https://repo.maven.apache.org/maven2/de/undercouch/download/de.undercouch.download.gradle.plugin/5.6.0/de.undercouch.download.gradle.plugin-5.6.0.pom
    
    598
    +9551ea53f638143064a94c9beed20a02e69c908d43fb84e3ad4b19416a5d3b1d | https://plugins.gradle.org/m2/net/java/dev/jna/jna/5.16.0/jna-5.16.0.aar
    
    599
    +3f5233589a799eb66dc2969afa3433fb56859d3d787c58b9bc7dd9e86f0a250c | https://plugins.gradle.org/m2/net/java/dev/jna/jna/5.16.0/jna-5.16.0.jar
    
    600
    +f61fd2c44aa583f2a2cbc5fc67b0f19a9203ca87d5f0e18d3d5030cbe3908083 | https://plugins.gradle.org/m2/net/java/dev/jna/jna/5.16.0/jna-5.16.0.pom

  • projects/geckoview/config
    ... ... @@ -37,7 +37,7 @@ var:
    37 37
         - openjdk-17-jdk-headless
    
    38 38
       # this should be updated when the list of gradle dependencies is changed
    
    39 39
       # see doc/how-to-create-gradle-dependencies-list.txt
    
    40
    -  gradle_dependencies_version: 18
    
    40
    +  gradle_dependencies_version: 19
    
    41 41
       gradle_version: 8.13
    
    42 42
       glean_parser: 14.0.1
    
    43 43
       # python/mozboot/mozboot/android.py
    

  • projects/geckoview/gradle-dependencies-list.txt
    ... ... @@ -1453,8 +1453,8 @@ fa08998aae1e7bdae83bde0712c50e8444d71c0e0c196bb2247ade8d4ad0eb90 | https://plugi
    1453 1453
     205b8b254196717e81dad672bb869a719afc96df297f97d811effe1f43653dae | https://plugins.gradle.org/m2/net/bytebuddy/byte-buddy/1.15.11/byte-buddy-1.15.11.pom
    
    1454 1454
     9ecea8bf2b1b39963939d18b70464eef60c508fed8820f9dcaba0c35518eabf7 | https://plugins.gradle.org/m2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.jar
    
    1455 1455
     1beb35cb4184e6c906a7e32eaebd852dd3da0a263962e99134ab945832394e28 | https://plugins.gradle.org/m2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.pom
    
    1456
    -81a8b9afc65f9d6b205338c25908af8de0ff8411a00985104c9d83fffdfab380 | https://plugins.gradle.org/m2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.aar
    
    1457
    -e04e25951501df25adc7b1dcdb6c53373c94897b84d3e14921292763ee07ae3d | https://plugins.gradle.org/m2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.pom
    
    1456
    +9551ea53f638143064a94c9beed20a02e69c908d43fb84e3ad4b19416a5d3b1d | https://plugins.gradle.org/m2/net/java/dev/jna/jna/5.16.0/jna-5.16.0.aar
    
    1457
    +f61fd2c44aa583f2a2cbc5fc67b0f19a9203ca87d5f0e18d3d5030cbe3908083 | https://plugins.gradle.org/m2/net/java/dev/jna/jna/5.16.0/jna-5.16.0.pom
    
    1458 1458
     5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf | https://plugins.gradle.org/m2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.jar
    
    1459 1459
     5fe81b0255978f24616d37b10608b79498a5f3073e1d9b2038d8736a831f2608 | https://plugins.gradle.org/m2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
    
    1460 1460
     281440811268e65d9e266b3cc898297e214e04f09740d0386ceeb4a8923d63bf | https://plugins.gradle.org/m2/net/java/jvnet-parent/1/jvnet-parent-1.pom
    

  • projects/glean/build
    ... ... @@ -74,6 +74,7 @@ tar -xf $rootdir/[% c('input_files_by_name/uniffi-rs') %]
    74 74
     
    
    75 75
     patch -p1 < $rootdir/use-custom-gradle-repo.diff
    
    76 76
     patch -p1 < $rootdir/use-uniffi-noop.diff
    
    77
    +patch -p1 < $rootdir/jna-5.16.0.diff
    
    77 78
     
    
    78 79
     gradle_flags="--offline --no-daemon -PuniffiBindgenNoop=$builddir/uniffi-rs/uniffi-bindgen -PgradleDependenciesUrl=file:///var/tmp/dist/gradle-dependencies"
    
    79 80
     gradle $gradle_flags :glean:assembleRelease
    

  • projects/glean/config
    ... ... @@ -9,7 +9,7 @@ container:
    9 9
     
    
    10 10
     var:
    
    11 11
       # This should be updated when the list of gradle dependencies is changed.
    
    12
    -  gradle_dependencies_version: 1
    
    12
    +  gradle_dependencies_version: 2
    
    13 13
       gradle_version: 8.13
    
    14 14
     
    
    15 15
     steps:
    
    ... ... @@ -46,3 +46,4 @@ steps:
    46 46
             exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
    
    47 47
           - filename: use-custom-gradle-repo.diff
    
    48 48
           - filename: use-uniffi-noop.diff
    
    49
    +      - filename: jna-5.16.0.diff

  • projects/glean/gradle-dependencies-list.txt
    ... ... @@ -361,9 +361,9 @@ e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b | https://repo.
    361 361
     569b6977ee4603c965c1c46c3058fa6e969291b0160eb6964dd092cd89eadd94 | https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.pom
    
    362 362
     9ecea8bf2b1b39963939d18b70464eef60c508fed8820f9dcaba0c35518eabf7 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.jar
    
    363 363
     1beb35cb4184e6c906a7e32eaebd852dd3da0a263962e99134ab945832394e28 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.pom
    
    364
    -81a8b9afc65f9d6b205338c25908af8de0ff8411a00985104c9d83fffdfab380 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.aar
    
    365
    -34ed1e1f27fa896bca50dbc4e99cf3732967cec387a7a0d5e3486c09673fe8c6 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar
    
    366
    -e04e25951501df25adc7b1dcdb6c53373c94897b84d3e14921292763ee07ae3d | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.pom
    
    364
    +9551ea53f638143064a94c9beed20a02e69c908d43fb84e3ad4b19416a5d3b1d | https://plugins.gradle.org/m2/net/java/dev/jna/jna/5.16.0/jna-5.16.0.aar
    
    365
    +3f5233589a799eb66dc2969afa3433fb56859d3d787c58b9bc7dd9e86f0a250c | https://plugins.gradle.org/m2/net/java/dev/jna/jna/5.16.0/jna-5.16.0.jar
    
    366
    +f61fd2c44aa583f2a2cbc5fc67b0f19a9203ca87d5f0e18d3d5030cbe3908083 | https://plugins.gradle.org/m2/net/java/dev/jna/jna/5.16.0/jna-5.16.0.pom
    
    367 367
     5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.jar
    
    368 368
     5fe81b0255978f24616d37b10608b79498a5f3073e1d9b2038d8736a831f2608 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
    
    369 369
     281440811268e65d9e266b3cc898297e214e04f09740d0386ceeb4a8923d63bf | https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
    

  • projects/glean/jna-5.16.0.diff
    1
    +diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
    
    2
    +index aa369048b..912036583 100644
    
    3
    +--- a/gradle/libs.versions.toml
    
    4
    ++++ b/gradle/libs.versions.toml
    
    5
    +@@ -23,7 +23,7 @@ androidx-lifecycle = "2.8.7"
    
    6
    + androidx-work = "2.10.0"
    
    7
    + 
    
    8
    + # JNA
    
    9
    +-jna = "5.14.0" # Don't update until Android 5/6 support is dropped
    
    10
    ++jna = "5.16.0"
    
    11
    + 
    
    12
    + # Linting and Static Analysis
    
    13
    + detekt = "1.23.8"