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 e6e880e6 authored by Georg Koppen's avatar Georg Koppen Committed by Matthew Finkel
Browse files

Bug 40156: Update GeckoView to 84.0b1

We need to make sure that we are actually using Java 1.8, otherwise the
build breaks.

The jaxb-parent-2.2.11.pom update is needed as it seems someone fixed
the line endings of that .pom file and replaced the one we had used in
previous dependency lists.
parent e923451e
......@@ -8,7 +8,7 @@ git_submodule: 1
gpg_keyring: torbutton.gpg
var:
geckoview_version: 83.0
geckoview_version: 84.0b1
torbrowser_branch: 10.0
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
deps:
......@@ -25,7 +25,7 @@ var:
container:
use_container: 1
# this should be updated when the list of gradle dependencies is changed
gradle_dependencies_version: 4
gradle_dependencies_version: 5
steps:
merge_aars:
......@@ -72,6 +72,7 @@ steps:
exit 1
fi
export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
gradle_repo=/var/tmp/dist/gradle-dependencies
export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo"
export GRADLE_FLAGS="--no-daemon --offline"
......
......@@ -65,7 +65,7 @@ c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4 | https://jcent
ebe7137b5fbfd050545f9a7f3f339ae55beb0b53755071b4fd62aa024c626d1c | https://jcenter.bintray.com/com/sun/istack/istack-commons-runtime/2.21/istack-commons-runtime-2.21.pom
c3071277f89b162982606b4e65c92077212efb6cbf1bdc365c51bd0b57ac818c | https://jcenter.bintray.com/com/sun/istack/istack-commons/2.21/istack-commons-2.21.pom
b25e0693de21cb92b039a2e4608f396590fb8773108f10d6dc9f1465f03b5be9 | https://jcenter.bintray.com/com/sun/xml/bind/jaxb-bom-ext/2.2.11/jaxb-bom-ext-2.2.11.pom
b5301b711c01547e571b615f9a0832ee525d34a4ce3372f53907a87cf20b0480 | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/jaxb-parent-2.2.11.pom
010b745ee463eb822ceca023089d00708f021811eb3c285fbba72a3b564a0774 | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/jaxb-parent-2.2.11.pom
21918cb8e4eda67f24251e909a5d81672201d93604c4ffbf33522ad836a58e90 | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.2.11/jaxb-runtime-parent-2.2.11.pom
9a398c699a5d3f3b56f1056c68890ede25d94a12d98eabc2a473733e6ab2362c | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-txw-parent/2.2.11/jaxb-txw-parent-2.2.11.pom
27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038 | https://jcenter.bintray.com/com/sun/xml/fastinfoset/FastInfoset/1.2.13/FastInfoset-1.2.13.jar
......@@ -493,5 +493,5 @@ feb4ebb1ddb76dc18ee9e6028205ac226a70d40247fcccaca092303c68f8b59d | https://maven
fdd93302c2eb94bbe6007caa28d072246d2875cda5cb774bb6299416b94d74a6 | https://maven.google.com/com/google/android/gms/play-services-tasks/17.0.0/play-services-tasks-17.0.0.pom
7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc | https://maven.google.com/com/google/android/material/material/1.0.0/material-1.0.0.aar
c9fff541d51c11195de305c50bbfe4d1dfc97841983d95f6d7101112603515ab | https://maven.google.com/com/google/android/material/material/1.0.0/material-1.0.0.pom
ece749bdea04522b04a7b0cfd391026f88808c4d0103b3bede8b42baf0b7d677 | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.3.1/apilint-0.3.1.jar
efd7067a5c6ed990ea698d42b56fb324062a2cb9556aff5d656b7c739d2134ba | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.3.1/apilint-0.3.1.pom
33850fe43f064f95068ca0d81cb99fdb6d67af5e07f0626e433b51b9c2683aee | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.0/apilint-0.4.0.jar
cf8acbecac4506eff7c2aead2f5f7c4aeb3120a57d6236f55e0e2f750fab1b55 | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.0/apilint-0.4.0.pom
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