boklm pushed to branch main at The Tor Project / Applications /
tor-browser-build
Commits:
3faf8d3e by Nicolas Vigier at 2025-06-18T12:02:43+02:00
Bug 41486: Track bundletool and osslicenses-plugin versions
- - - - -
7d4088cb by Nicolas Vigier at 2025-06-18T12:02:43+02:00
Bug 41486: Drop target_sdk check in
projects/geckoview/list_toolchain_updates_checks
- - - - -
1 changed file:
- projects/geckoview/list_toolchain_updates_checks
Changes:
=====================================
projects/geckoview/list_toolchain_updates_checks
=====================================
@@ -26,18 +26,6 @@ current='[% pc("android-toolchain", "version") %]'
check_update_needed build_tools "$needed" "$current"
-# target_sdk
-read -d '' p << 'EOF' || true
-if (m/target_sdk_version\\s*=\\s*"(.+)"/) {
- print $1;
- exit;
-}
-EOF
-needed=$(cat build/moz.configure/android-sdk.configure | perl -ne "$p")
-current='[% pc("android-toolchain", "var/android_api_level") %]'
-check_update_needed target_sdk "$needed" "$current"
-
-
# cmdline-tools
read -d '' p << 'EOF' || true
my $v, $s;
@@ -104,3 +92,27 @@ EOF
needed=$(cat gradle/wrapper/gradle-wrapper.properties | perl -ne "$p")
current='[% c("var/gradle_version") %]'
check_update_needed gradle "$needed" "$current"
+
+
+# bundletool
+read -d '' p << 'EOF' || true
+if (m{^BUNDLETOOL_VERSION\\s*=\\s*"(.+)"}) {
+ print $1;
+ exit;
+}
+EOF
+needed=$(cat python/mozboot/mozboot/android.py | perl -ne "$p")
+current='[% c("var/bundletool_version") %]'
+check_update_needed bundletool "$needed" "$current"
+
+
+# oss-licenses-plugin
+read -d '' p << 'EOF' || true
+if (m{^osslicenses-plugin\\s*=\\s*"(.+)"}) {
+ print $1;
+ exit;
+}
+EOF
+needed=$(cat gradle/libs.versions.toml | perl -ne "$p")
+current='[% pc("oss-licenses-plugin", "version") %]'
+check_update_needed oss-licenses-plugin "$needed" "$current"
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/0e4bfa9db18058f3db028fea41f0bc21709321e0...7d4088cba62bf621c92358845799d2da3f5527c8
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/0e4bfa9db18058f3db028fea41f0bc21709321e0...7d4088cba62bf621c92358845799d2da3f5527c8
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
