GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 690f9b5b authored by Georg Koppen's avatar Georg Koppen Committed by Matthew Finkel
Browse files

Bug 40127: Update android-components for mozilla83-based Fenix

parent 82fae194
......@@ -3,6 +3,7 @@
[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
distdir=/var/tmp/dist
builddir=/var/tmp/build/[% project %]
gradle_path=$GRADLE_HOME/gradle-[% c("var/gradle_version") %]/bin
mkdir $distdir/[% project %]
mkdir /var/tmp/build
......@@ -26,17 +27,16 @@ EOF
# according to the Gradle dependencies list.
cp -rf $distdir/application-services/maven/org $gradle_repo
[% END %]
unzip -d $GRADLE_HOME [% c('input_files_by_name/gradle') %]
tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
cd $builddir-[% c('version') %]
patch -p1 < $rootdir/git.patch
# We need to pick up a newer glean_parser until an updates glean lands in
# android-components.
[% IF c("var/fetch_gradle_dependencies") %]
# XXX: fetching deps for `assembleGeckoBeta -x lint` by using that same target
# results in some missing dependencies for yet unknown reasons. Thus, we use
# `assemble` instead for now.
gradle --debug --no-daemon assemble
$gradle_path/gradle --debug --no-daemon assemble
[% ELSE %]
# Prepare Glean dependencies for offline build
tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2
......@@ -70,8 +70,8 @@ patch -p1 < $rootdir/git.patch
cd ../../
gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo"
gradle $gradle_args assembleGecko[% c('variant') %] -x lint
gradle $gradle_args publish
$gradle_path/gradle $gradle_args assembleGecko[% c('variant') %] -x lint
$gradle_path/gradle $gradle_args publish
# We only need the archives and .pom files for now.
find components -regex '.*[% c('var/android_components_version') %].\(aar\|jar\|pom\)' -exec cp --parents {} $distdir \;
......
......@@ -8,14 +8,15 @@ gpg_keyring: torbutton.gpg
variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'
var:
android_components_version: 60.0.5
torbrowser_branch: 10.0
android_components_version: 63.0.1
torbrowser_branch: 10.5
container:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 7
gradle_dependencies_version: 8
# Switch to make it easier to grab all dependencies during a dry-run.
fetch_gradle_dependencies: 0
gradle_version: 6.6.1
targets:
nightly:
......@@ -46,3 +47,6 @@ input_files:
- URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2
sha256sum: bdbb421fdcc9b66aebe8f41b33e254cab722355c59c0f43f10a8322d7d6da6a4
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version") %]-bin.zip
name: gradle
sha256sum: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment