Verified Commit 88ba0070 authored by aguestuser's avatar aguestuser
Browse files

Bug 40418: Update components for mozilla96: fenix part

parent 967e2822
Loading
Loading
Loading
Loading

projects/fenix/build

100644 → 100755
+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ cd $builddir-[% c("version") %]
cp $rootdir/[% c('input_files_by_name/topl') %]/* app/
cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/

# Avoid call to `getGitHash()`, which will fail b/c it invokes git, which is absent in
# the build container. Instead just inject the commit hash, which we know!
sed -i 's/\\"${Config.getGitHash()}\\"/\\"[% c('abbrev') %]\\"/' app/build.gradle

# XXX We need the build variant in lower case. Do something smarter here.
v=[% c("variant") %]
[% IF c("var/fetch_gradle_dependencies") %]
+3 −3
Original line number Diff line number Diff line
@@ -8,16 +8,16 @@ gpg_keyring: torbutton.gpg
variant: Beta

var:
  fenix_version: 94.1.1
  fenix_version: 96.3.0
  torbrowser_branch: 11.5
  git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1'
  copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
  container:
    use_container: 1
  # This should be updated when the list of gradle dependencies is changed.
  gradle_dependencies_version: 33
  gradle_dependencies_version: 34
  gradle_version: 7.0.2
  glean_parser: 4.0.0
  glean_parser: 4.2.0
  arch_deps:
    - python3-venv

+371 −332

File changed.

Preview size limit exceeded, changes collapsed.

+0 −1
Original line number Diff line number Diff line
@@ -70,4 +70,3 @@ EOF
needed=$(cat buildSrc/src/main/java/Dependencies.kt | perl -ne "$p")
current='7.0.0'
check_update_needed android-gradle-plugin "$needed" "$current"