brizental pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: df7c4ade by Beatriz Rizental at 2025-06-12T09:12:15+02:00 Bug 41453: Update android toochain for building application-services - - - - - 13 changed files: - projects/android-toolchain/config - projects/application-services/a-s-noop.diff - − projects/application-services/bug40485-nimbus-fml-reproducibility.diff - projects/application-services/build - projects/application-services/config - projects/application-services/glean-noop.diff - projects/application-services/gradle-dependencies-list.txt - projects/application-services/list_toolchain_updates_checks - projects/application-services/local-repository.diff - − projects/application-services/ohttp-no-git.diff - projects/glean/config - projects/gradle/config - projects/uniffi-rs/config Changes: ===================================== projects/android-toolchain/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # FIXME: Rework this whole mess filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' -version: '34.0.0' +version: 36.0.0 var: setup: | mkdir -p /var/tmp/dist @@ -29,39 +29,39 @@ var: export PATH=$PATH:$GRADLE_HOME/bin [% END -%] google_repo: https://dl.google.com/android/repository - android_api_level: 34 - android_release_dir: android-14 - android_platform_revision: '03' - android_ndk_version: 26 - android_ndk_revision: c - android_ndk_version_build: 26.2.11394342 + android_api_level: 36 + android_release_dir: android-16 + android_platform_revision: '01' + android_ndk_version: 28 + android_ndk_revision: b + android_ndk_version_build: 28.1.13356709 # We need the following two variables for get_build_tools, used by signing # scripts. - build_tools_version: 34 - build_tools_filename: 'build-tools_r[% c("var/build_tools_version") %]-linux.zip' - build_tools_sha512sum: c28dd52f8eca82996726905617f3cb4b0f0aee1334417b450d296991d7112cab1288f5fd42c48a079ba6788218079f81caa3e3e9108e4a6f27163a1eb7f32bd7 - commandlinetools_version: 11076708 - commandlinetools_version_string: 12.0 + build_tools_version: 36 + build_tools_filename: 'build-tools_r[% c("var/build_tools_version") %]_linux.zip' + build_tools_sha512sum: 277c08c2dcced3c1cc46ce0349e18adc6d6d4b8739868eab5d469f9fb4e9c6b79aa9d2a6592cfc5db0ccb8690fcc75a44db4b18b03dcf349efd0eb54025ef5ca + commandlinetools_version: 13114758 + commandlinetools_version_string: 19.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: 2d2d50857e4eb553af5a6dc3ad507a17adf43d115264b1afc116f95c92e5e258 + sha256sum: 7ec965280a073311c339e571cd5de778b9975026cfcbe79f2b1cdcb1e15317ee - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]-linux.zip' name: android_ndk_compiler - sha256sum: 6d6e659834d28bb24ba7ae66148ad05115ebbad7dabed1af9b3265674774fcf6 + sha256sum: e9f2759862cecfd48c20bbb7d8cfedbb020f4d91b5f78d9a2fc106f7db3c27ed - URL: '[% c("var/google_repo") %]/[% c("var/build_tools_filename") %]' name: build_tools sha512sum: '[% c("var/build_tools_sha512sum") %]' - - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level") %]-ext7_r[% c("var/android_platform_revision") %].zip' + - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level") %]_r[% c("var/android_platform_revision") %].zip' name: platform - sha256sum: 16fdb74c55e59ae3ef52def135aec713508467bd56d7dabcd8c9be31fa8b20f3 + sha256sum: a5273f7d68de0a6a58032b26c24965634bc14ed3839e70a3a9759369f3f6c02a # ./mach bootstrap is fetching the latest version, so it does not seem to # matter which particular version we are using. Pin to the one fitting best to # SDK version/build-tools version. - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("version") %]-linux.zip' name: platform_tools - sha256sum: 8137c2834dea05cb64c1a8bc041ea00fcd43e3a8a29429ad4f25b8ee51efebf6 + sha256sum: 0ead642c943ffe79701fccca8f5f1c69c4ce4f43df2eefee553f6ccb27cbfbe8 steps: # The get_build_tools step is used by tools/signing/android-signing get_build_tools: ===================================== projects/application-services/a-s-noop.diff ===================================== @@ -1,3 +1,48 @@ +diff --git a/build-scripts/component-common.gradle b/build-scripts/component-common.gradle +index a126341b0..3b3579290 100644 +--- a/build-scripts/component-common.gradle ++++ b/build-scripts/component-common.gradle +@@ -111,16 +111,30 @@ ext.configureUniFFIBindgen = { crateName -> + commandLine "${mozconfig.topobjdir}/dist/host/bin/embedded-uniffi-bindgen", 'generate', '--library', libraryPath, "--crate", crateName, '--language', 'kotlin', '--out-dir', uniffiOutDir.get(), '--no-format' + } + } else { +- def libraryPath = megazordNative.asFileTree.matching { +- include "${nativeRustTarget}/libmegazord.*" +- }.singleFile +- +- if (libraryPath == null) { +- throw new GradleException("libmegazord dynamic library path not found") +- } +- exec { +- workingDir project.rootDir +- commandLine '/usr/bin/env', 'cargo', 'uniffi-bindgen', 'generate', '--library', libraryPath, "--crate", crateName, '--language', 'kotlin', '--out-dir', uniffiOutDir.get(), '--no-format' ++ if (crateName.toString().contains("places")) { ++ def libraryPath = megazordNative.asFileTree.matching { ++ include "${nativeRustTarget}/libmegazord.*" ++ }.singleFile ++ ++ if (libraryPath == null) { ++ throw new GradleException("libmegazord dynamic library path not found") ++ } ++ exec { ++ workingDir project.rootDir ++ commandLine '/usr/bin/env', 'cargo', 'uniffi-bindgen', 'generate', '--library', libraryPath, "--crate", crateName, '--language', 'kotlin', '--out-dir', uniffiOutDir.get(), '--no-format' ++ } ++ } else { ++ def libraryPath = "${project.rootDir}/megazords/full/target/debug/libmegazord.so" ++ exec { ++ workingDir project.rootDir ++ def command = ["${rootProject.projectDir}/uniffi-rs/uniffi-bindgen", 'generate', '--library', libraryPath, "--crate", crateName, '--language', 'kotlin', '--out-dir', uniffiOutDir.get(), '--no-format'] ++ println "Executing command: ${command.join(' ')}" ++ commandLine command ++ ++ // Print both stdout and stderr to Gradle's console ++ standardOutput = System.out ++ errorOutput = System.err ++ } + } + } + } diff --git a/components/fxa-client/android/src/main/java/mozilla/appservices/fxaclient/Config.kt b/components/fxa-client/android/src/main/java/mozilla/appservices/fxaclient/Config.kt index 78c16dd0a..d2615fa74 100644 --- a/components/fxa-client/android/src/main/java/mozilla/appservices/fxaclient/Config.kt @@ -9,10 +54,10 @@ index 78c16dd0a..d2615fa74 100644 + is FxaServer.__NOOP -> "" } diff --git a/components/nimbus/android/src/main/java/org/mozilla/experiments/nimbus/Nimbus.kt b/components/nimbus/android/src/main/java/org/mozilla/experiments/nimbus/Nimbus.kt -index 8c05be9cf..6bf2ec15d 100644 +index 376ef90d9..d80eea50f 100644 --- a/components/nimbus/android/src/main/java/org/mozilla/experiments/nimbus/Nimbus.kt +++ b/components/nimbus/android/src/main/java/org/mozilla/experiments/nimbus/Nimbus.kt -@@ -532,6 +532,8 @@ open class Nimbus( +@@ -535,6 +535,8 @@ open class Nimbus( ), ) } @@ -22,10 +67,10 @@ index 8c05be9cf..6bf2ec15d 100644 } } diff --git a/megazords/full/Cargo.toml b/megazords/full/Cargo.toml -index 75f44a812..a51c0643b 100644 +index c5e9eea19..ce899aac1 100644 --- a/megazords/full/Cargo.toml +++ b/megazords/full/Cargo.toml -@@ -9,21 +9,21 @@ license = "MPL-2.0"9345a6ea +@@ -9,24 +9,24 @@ license = "MPL-2.0" crate-type = ["cdylib"] [dependencies] @@ -49,6 +94,8 @@ index 75f44a812..a51c0643b 100644 -crashtest = { path = "../../components/crashtest" } -error-support = { path = "../../components/support/error" } -suggest = { path = "../../components/suggest" } +-search = { path = "../../components/search" } +-tracing-support = { path = "../../components/support/tracing" } +# push = { path = "../../components/push" } +# remote_settings = { path = "../../components/remote_settings" } +# rust-log-forwarder = { path = "../../components/support/rust-log-forwarder" } @@ -58,13 +105,16 @@ index 75f44a812..a51c0643b 100644 +# crashtest = { path = "../../components/crashtest" } +# error-support = { path = "../../components/support/error" } +# suggest = { path = "../../components/suggest" } ++# search = { path = "../../components/search" } ++# tracing-support = { path = "../../components/support/tracing" } lazy_static = "1.4" + init_rust_components = { path = "../../components/init_rust_components" } diff --git a/megazords/full/src/lib.rs b/megazords/full/src/lib.rs -index 01d1be98b..a68eb647f 100644 +index 4b6ba4499..e4fde58ae 100644 --- a/megazords/full/src/lib.rs +++ b/megazords/full/src/lib.rs -@@ -8,20 +8,20 @@ +@@ -8,24 +8,24 @@ use std::ffi::CString; use std::os::raw::c_char; @@ -72,46 +122,37 @@ index 01d1be98b..a68eb647f 100644 -pub use crashtest; -pub use error_support; -pub use fxa_client; +-pub use init_rust_components; -pub use logins; +-pub use merino; -pub use nimbus; +// pub use autofill; +// pub use crashtest; +// pub use error_support; +// pub use fxa_client; ++// pub use init_rust_components; +// pub use logins; ++// pub use merino; +// pub use nimbus; pub use places; -pub use push; -pub use remote_settings; -pub use rust_log_forwarder; +-pub use search; -pub use suggest; -pub use sync_manager; -pub use tabs; +-pub use tracing_support; -pub use viaduct; +// pub use push; +// pub use remote_settings; +// pub use rust_log_forwarder; ++// pub use search; +// pub use suggest; +// pub use sync_manager; +// pub use tabs; ++// pub use tracing_support; +// pub use viaduct; // TODO: Uncomment this code when webext-storage component is integrated in android // pub use webext_storage; -diff --git a/publish.gradle b/publish.gradle -index 71f5d55b9..659e26489 100644 ---- a/publish.gradle -+++ b/publish.gradle -@@ -194,7 +194,11 @@ ext.configureUniFFIBindgen = { udlFilePath -> - def uniffiGeneratedPath = "generated/source/uniffi/${variant.name}/java" - def t = tasks.register("generate${variant.name.capitalize()}UniFFIBindings", Exec) { - workingDir project.rootDir -- commandLine '/usr/bin/env', 'cargo', 'uniffi-bindgen', 'generate', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', "${buildDir}/${uniffiGeneratedPath}" -+ if (udlFilePath.contains("places")) { -+ commandLine '/usr/bin/env', 'cargo', 'uniffi-bindgen', 'generate', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', "${buildDir}/${uniffiGeneratedPath}" -+ } else { -+ commandLine '/usr/bin/env', "${rootProject.projectDir}/uniffi-rs/uniffi-bindgen", 'generate', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', "${buildDir}/${uniffiGeneratedPath}" -+ } - outputs.dir "${buildDir}/${uniffiGeneratedPath}" - // Re-generate if the interface definition changes. - inputs.file "${project.projectDir}/${udlFilePath}" ===================================== projects/application-services/bug40485-nimbus-fml-reproducibility.diff deleted ===================================== @@ -1,48 +0,0 @@ -diff --git a/components/support/nimbus-fml/src/intermediate_representation.rs b/components/support/nimbus-fml/src/intermediate_representation.rs -index 97d545672..249406a0c 100644 ---- a/components/support/nimbus-fml/src/intermediate_representation.rs -+++ b/components/support/nimbus-fml/src/intermediate_representation.rs -@@ -237,10 +237,10 @@ pub struct FeatureManifest { - pub(crate) about: AboutBlock, - - #[serde(default)] -- pub(crate) imported_features: HashMap<ModuleId, BTreeSet<String>>, -+ pub(crate) imported_features: BTreeMap<ModuleId, BTreeSet<String>>, - - #[serde(default)] -- pub(crate) all_imports: HashMap<ModuleId, FeatureManifest>, -+ pub(crate) all_imports: BTreeMap<ModuleId, FeatureManifest>, - } - - impl TypeFinder for FeatureManifest { -diff --git a/components/support/nimbus-fml/src/parser.rs b/components/support/nimbus-fml/src/parser.rs -index 49cace525..cdf692b86 100644 ---- a/components/support/nimbus-fml/src/parser.rs -+++ b/components/support/nimbus-fml/src/parser.rs -@@ -223,7 +223,7 @@ impl Parser { - &self, - current: &FilePath, - channel: Option<&str>, -- imports: &mut HashMap<ModuleId, FeatureManifest>, -+ imports: &mut BTreeMap<ModuleId, FeatureManifest>, - // includes: &mut HashSet<ModuleId>, - ) -> Result<ModuleId> { - let id = current.try_into()?; -@@ -253,7 +253,7 @@ impl Parser { - // This loop does the work of merging the default blocks back into the imported manifests. - // We'll then attach all the manifests to the root (i.e. the one we're generating code for today), in `imports`. - // We associate only the feature ids with the manifest we're loading in this method. -- let mut imported_feature_id_map = HashMap::new(); -+ let mut imported_feature_id_map = BTreeMap::new(); - - for block in &frontend.imports { - // 1. Load the imported manifests in to the hash map. -@@ -328,7 +328,7 @@ impl Parser { - &self, - channel: Option<&str>, - ) -> Result<FeatureManifest, FMLError> { -- let mut manifests = HashMap::new(); -+ let mut manifests = BTreeMap::new(); - let id = self.load_imports(&self.source, channel, &mut manifests)?; - let mut fm = manifests - .remove(&id) ===================================== projects/application-services/build ===================================== @@ -6,8 +6,8 @@ gradle_tarfile => c("input_files_by_name/gradle"), }) %] pushd /var/tmp/dist/android-toolchain/android-sdk-linux/build-tools/ -unzip $rootdir/'[% c("input_files_by_name/build_tools_30") %]' -mv android-11 30.0.3 +unzip $rootdir/'[% c("input_files_by_name/build_tools_35") %]' +mv android-15 35.0 popd distdir=/var/tmp/dist/[% project %] @@ -73,6 +73,19 @@ tar -xf $rootdir/[% c('input_files_by_name/uniffi-rs') %] # latest versions of dependencies sometimes. sed -i '$ s/$/-TORBROWSER/' version.txt +pushd libs +ln -s $rootdir/[% c("input_files_by_name/nss") %] ./ +ln -s $rootdir/bug_13028.patch +patch -p2 < $rootdir/apply-bug-13028.diff +patch -p2 < $rootdir/no-ndk-lookup.diff +./build-all.sh desktop +./build-all.sh android +popd + +pushd megazords/full +NSS_DIR=$(pwd)/../../libs/desktop/linux-x86-64/nss cargo build --target-dir=$(pwd)/target +popd + cp $rootdir/cargo-no-build.sh megazords/full/android/ chmod +x megazords/full/android/cargo-no-build.sh patch -p1 < $rootdir/a-s-noop.diff @@ -83,15 +96,6 @@ cp $builddir/uniffi-rs/uniffi-bindgen glean-core/android-native/ patch -p1 < $rootdir/glean-noop.diff popd -pushd libs -ln -s $rootdir/[% c("input_files_by_name/nss") %] ./ -ln -s $rootdir/bug_13028.patch -patch -p2 < $rootdir/apply-bug-13028.diff -patch -p2 < $rootdir/no-ndk-lookup.diff -./build-all.sh desktop -./build-all.sh android -popd - [% IF c('var/fetch_gradle_dependencies') %] # XXX: `assemble` is still not enough to see all fetched dependencies via # Gradle's --debug. See: tor-browser-build#40056. @@ -104,8 +108,6 @@ popd export LC_ALL=C.UTF-8 export LANG=C.UTF-8 patch -p1 < $rootdir/local-repository.diff - patch -p1 < $rootdir/ohttp-no-git.diff - patch -p1 < $rootdir/bug40485-nimbus-fml-reproducibility.diff patch -p1 < $rootdir/offline-nimbus-fml.diff patch -p1 < $rootdir/41422-disable-viaduct.diff gradle_flags="--offline --no-daemon" ===================================== projects/application-services/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 -version: 128.0.1 -git_hash: 0e4777f4133a98f44bca164fcf0406e8f706dbe4 +version: 140.0 +git_hash: 8ee6cb6a23f96ff8e2161926441aea72d6f09249 git_url: https://github.com/mozilla/application-services git_submodule: 1 container: @@ -8,11 +8,11 @@ container: var: # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 11 - gradle_version: 8.8 - glean_parser: 14.0.1 - nss_version: '3.101' - nspr_version: '4.35' + gradle_dependencies_version: 12 + gradle_version: 8.13 + glean_parser: 17.1.0 + nss_version: '3.110' + nspr_version: '4.36' steps: build: @@ -21,7 +21,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: '2024-09-12' + rebuild_date: '2025-06-12' arch_deps: # Needed to build NSS - gyp @@ -43,16 +43,16 @@ steps: - project: uniffi-rs name: uniffi-rs pkg_type: build - # Only Application Services currently requires build tools 30.0.3. + # Only Application Services currently requires build tools 35. # So, download them only here, rather than adding them to the shared # toolchain. - - URL: 'https://dl.google.com/android/repository/build-tools_r30.0.3-linux.zip' - name: build_tools_30 - sha256sum: 24593500aa95d2f99fb4f10658aae7e65cb519be6cd33fa164f15f27f3c4a2d6 + - URL: 'https://dl.google.com/android/repository/build-tools_r35_linux.zip' + name: build_tools_35 + sha256sum: bd3a4966912eb8b30ed0d00b0cda6b6543b949d5ffe00bea54c04c81e1561d88 # NSS version ans sha256 are in libs/build-all.sh. - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("var/nss_version") | replace("\\.", "_") %]_RTM/src/nss-[% c("var/nss_version") %]-with-nspr-[% c("var/nspr_version") %].tar.gz' name: nss - sha256sum: 566faa9283ff3d9a7d6c44272df6e4330e3e06ca4e841a68840d31b27c9161c4 + sha256sum: 96114bef9e9692dda6e7793da26fedef0dc0449c3644ebe1122464e599a39dc0 - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' @@ -65,19 +65,14 @@ steps: project: application-services pkg_type: cargo_vendor norec: - sha256sum: 92ce1131b35bf78d86362670ba7e4930ecdd1117694996d7cce850e4860f90b6 + sha256sum: 4cf0235b525b5ce1d8bcc40e9763a13fd0e79c773749b900b4d7420551cf5114 - filename: local-repository.diff enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: gen_gradle_deps_file.sh enable: '[% c("var/fetch_gradle_dependencies") %]' - filename: bug_13028.patch - filename: apply-bug-13028.diff - # Delete when this patch is included upstream - - filename: bug40485-nimbus-fml-reproducibility.diff - filename: no-ndk-lookup.diff - # as-ohttp-client lists both the version for ohttp and a git repo + rev, - # but this breaks the vendoring for offline builds. - - filename: ohttp-no-git.diff - filename: offline-nimbus-fml.diff - filename: glean-noop.diff - filename: a-s-noop.diff ===================================== projects/application-services/glean-noop.diff ===================================== @@ -1,8 +1,8 @@ diff --git a/glean-core/android-native/build.gradle b/glean-core/android-native/build.gradle -index 48769651..ade00ec3 100644 +index 53716d523..d38af8320 100644 --- a/glean-core/android-native/build.gradle +++ b/glean-core/android-native/build.gradle -@@ -57,6 +57,8 @@ android { +@@ -48,6 +48,8 @@ android { } cargo { @@ -12,15 +12,15 @@ index 48769651..ade00ec3 100644 module = '../bundle-android' diff --git a/glean-core/android/build.gradle b/glean-core/android/build.gradle -index 3568e40b..05f28296 100644 +index 7748378b4..5af06b1c3 100644 --- a/glean-core/android/build.gradle +++ b/glean-core/android/build.gradle -@@ -221,7 +221,7 @@ android.libraryVariants.all { variant -> - def udlFilePath = "../src/glean.udl" - def t = tasks.register("generate${variant.name.capitalize()}UniFFIBindings", Exec) { - workingDir project.rootDir -- commandLine 'cargo', 'uniffi-bindgen', 'generate', '--no-format', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', "${buildDir}/${uniffiGeneratedPath}" -+ commandLine '${rootDir}/glean-core/android-native/uniffi-bindgen', 'generate', '--no-format', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', "${buildDir}/${uniffiGeneratedPath}" - outputs.dir "${buildDir}/${uniffiGeneratedPath}" - // Re-generate if the interface definition changes. - inputs.file "${project.projectDir}/../src/glean.udl" +@@ -197,7 +197,7 @@ def generateUniffiBindings = tasks.register("generateUniffiBindings") { + doFirst { + exec { + workingDir project.rootDir +- commandLine 'cargo', 'uniffi-bindgen', 'generate', '--no-format', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', UNIFFI_OUT_DIR.get() ++ commandLine '${rootDir}/glean-core/android-native/uniffi-bindgen', 'generate', '--no-format', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', UNIFFI_OUT_DIR.get() + } + } + outputs.dir UNIFFI_OUT_DIR ===================================== projects/application-services/gradle-dependencies-list.txt ===================================== The diff for this file was not included because it is too large. ===================================== projects/application-services/list_toolchain_updates_checks ===================================== @@ -8,7 +8,7 @@ if (m/^\\s*compileSdkVersion:\\s([^"]*),/) { } EOF needed=$(cat build.gradle | perl -ne "$p") -current=34 +current='[% pc("android-toolchain", "version") %]' check_update_needed compileSdkVersion "$needed" "$current" @@ -48,12 +48,12 @@ current='[% c("var/nss_version") %]-with-nspr-[% c("var/nspr_version") %]' check_update_needed nss-nspr "$needed" "$current" # uniffi -read -d '' p << 'EOF' || true -if (m/^\\s*uniffi\\s*=\\s*"([^"]*)"/) { - print $1; - exit; -} -EOF -needed=$(cat Cargo.toml | perl -ne "$p") +p='while (<>) { + if (m/^\s*uniffi\s*=\s*\{[^}]*version\s*=\s*"([^"]*)"/) { + print $1; + exit; + } +}' +needed=$(cat components/autofill/Cargo.toml | perl -ne "$p") current='[% pc("uniffi-rs", "version") %]' check_update_needed uniffi "$needed" "$current" ===================================== projects/application-services/local-repository.diff ===================================== @@ -1,10 +1,10 @@ diff --git a/build.gradle b/build.gradle -index b22a0737..d335aa5b 100644 +index bd516e58c..b30d552c9 100644 --- a/build.gradle +++ b/build.gradle -@@ -39,6 +39,13 @@ buildscript { - ] - +@@ -14,6 +14,14 @@ buildscript { + } + repositories { + maven { + url "file:///var/tmp/dist/gradle-dependencies" @@ -13,11 +13,12 @@ index b22a0737..d335aa5b 100644 + mavenPom() + } + } ++ mavenCentral() google() - jcenter() -@@ -88,6 +95,13 @@ apply plugin: 'de.undercouch.download' - + maven { +@@ -59,6 +67,14 @@ plugins { + allprojects { repositories { + maven { @@ -27,11 +28,12 @@ index b22a0737..d335aa5b 100644 + mavenPom() + } + } ++ google() - jcenter() + mavenCentral() maven { diff --git a/settings.gradle b/settings.gradle -index f652bd02..8c30a368 100644 +index 4117bc0d3..f1b028dad 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,19 @@ @@ -52,37 +54,39 @@ index f652bd02..8c30a368 100644 +} + import org.yaml.snakeyaml.Yaml - - includeBuild('tools/nimbus-gradle-plugin') { -@@ -14,6 +27,13 @@ buildscript { - classpath 'org.yaml:snakeyaml:2.0' - } - repositories { -+ maven { -+ url "file:///var/tmp/dist/gradle-dependencies" -+ metadataSources { -+ gradleMetadata() -+ mavenPom() + + // We prefer `appServicesRootDir` over `rootDir` to help us on the path to the monorepo. +@@ -23,6 +36,14 @@ buildscript { + if (!gradle.root.hasProperty("mozconfig")) { + // in app-services + repositories { ++ maven { ++ url "file:///var/tmp/dist/gradle-dependencies" ++ metadataSources { ++ gradleMetadata() ++ mavenPom() ++ } + } -+ } - jcenter() - } - } ++ + mavenCentral() + } + } else { diff --git a/tools/nimbus-gradle-plugin/settings.gradle b/tools/nimbus-gradle-plugin/settings.gradle -index 7db19be0..1f36b991 100644 +index 7d907f057..c0d213503 100644 --- a/tools/nimbus-gradle-plugin/settings.gradle +++ b/tools/nimbus-gradle-plugin/settings.gradle -@@ -8,6 +8,13 @@ buildscript { - classpath 'org.yaml:snakeyaml:2.0' - } - repositories { -+ maven { -+ url "file:///var/tmp/dist/gradle-dependencies" -+ metadataSources { -+ gradleMetadata() -+ mavenPom() +@@ -14,6 +14,14 @@ buildscript { + if (!gradle.root.hasProperty("mozconfig")) { + // in app-services + repositories { ++ maven { ++ url "file:///var/tmp/dist/gradle-dependencies" ++ metadataSources { ++ gradleMetadata() ++ mavenPom() ++ } + } -+ } - jcenter() - } - } ++ + mavenCentral() + } + } else { ===================================== projects/application-services/ohttp-no-git.diff deleted ===================================== @@ -1,15 +0,0 @@ -diff --git a/components/as-ohttp-client/Cargo.toml b/components/as-ohttp-client/Cargo.toml -index fd45a058b..b7070fc15 100644 ---- a/components/as-ohttp-client/Cargo.toml -+++ b/components/as-ohttp-client/Cargo.toml -@@ -19,8 +19,8 @@ rusqlite = { workspace = true, features = ["bundled"] } - [dependencies.ohttp] - version = "0.4" - default-features = false --git = "https://github.com/martinthomson/ohttp.git" --rev = "fc3f4c787d1f6a6a87bf5194f7152cc906b02973" -+# git = "https://github.com/martinthomson/ohttp.git" -+# rev = "fc3f4c787d1f6a6a87bf5194f7152cc906b02973" - features = ["client", "server", "app-svc", "external-sqlite"] - - [build-dependencies] ===================================== projects/glean/config ===================================== @@ -19,13 +19,15 @@ var: - torsocks glean_wheels_sha256sum: 14.0.1: 95f01d0e158ae7968680029b7d9c2908895e1d1ec1ba4e6a044648a05af4ee0c + 17.1.0: d96ef1995676fc3b838efb84283294befd5060ca64eea94fb67ae1f41d422664 glean_wheels_url: 14.0.1: https://build-sources.tbb.torproject.org/glean-wheels-14.0.1.tar.xz + 17.1.0: https://build-sources.tbb.torproject.org/glean-wheels-17.1.0.tar.xz steps: create_glean_deps_tarball: git_url: '' - version: 14.0.1 + version: 17.1.0 filename: 'glean-wheels-[% c("version") %].tar.xz' build_log: '-' container: ===================================== projects/gradle/config ===================================== @@ -7,6 +7,7 @@ container: var: gradle_sha256sum: 8.8: a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612 + 8.13: 20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 input_files: - project: container-image ===================================== projects/uniffi-rs/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 -version: 0.27.1 -git_hash: bfb52effb0292f16d4c030d622887781639cbd1f -git_url: https://gitlab.torproject.org/tpo/applications/uniffi-rs.git +version: 0.29.0 +git_hash: c69eba9eb08b16a66aab7b25df6c55d0b60541db +git_url: https://gitlab.torproject.org/tpo/applications/uniffi-rs container: use_container: 1 @@ -17,4 +17,4 @@ steps: project: uniffi-rs pkg_type: cargo_vendor norec: - sha256sum: 12a61a3dbe65a3946ed58fff3d849d11c9ade5818e2ef5771d2a2a531e25f553 + sha256sum: 23c79da9169064f42c34b9dadfee9dcf5ed251f9843615ca3e9a0e59a49f581d View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/df... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/df... You're receiving this email because of your account on gitlab.torproject.org.
participants (1)
-
brizental (＠brizental)