From b08e82f1f66c89571014a7ffdee6990af7414019 Mon Sep 17 00:00:00 2001
From: Sergio Villar Senin <svillar@igalia.com>
Date: Mon, 31 Jul 2023 17:46:12 +0200
Subject: [PATCH 1/2] Support using maven GV from the release channel

We supported it at some point but it was broken for some time and
we eventually removed it. Now we can restore it. Release versions
of Wolvic must not use maven GeckoView versions because they don't
include our updates to the Wolvic-Gecko communication protocol,
meaning that WebXR won't work.

However we can still use it for super-quick bisects for example,
or to test 2D browser features in advance without having to
build Gecko.
---
 app/build.gradle | 4 ++--
 versions.gradle  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8f814fe6dc..cd5cd5ccba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -643,13 +643,13 @@ dependencies {
     spacesImplementation fileTree(dir: "${project.rootDir}/third_party/spaces", include: ['*.aar'])
 
     // gecko
-    def branch = "nightly" // "nightly" or "beta"
+    def branch = "release" // "release", "nightly" or "beta"
     geckoImplementation deps.gecko_view."${branch}_x86_64"
     geckoImplementation deps.gecko_view."${branch}_arm64"
     configurations.all {
          resolutionStrategy.capabilitiesResolution.withCapability('org.mozilla.geckoview:geckoview') {
             def abi = getName().toLowerCase().contains('x64') ? 'x86_64' : 'arm64'
-            def candidate = "geckoview-${branch}-${abi}"
+            def candidate = branch == "release" ? "geckoview-${abi}" : "geckoview-${branch}-${abi}"
             select(candidates.find { it.id.module.contains(candidate) })
         }
     }
diff --git a/versions.gradle b/versions.gradle
index b648154556..712a6514f0 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -24,6 +24,7 @@ ext.deps = [:]
 def versions = [:]
 // GeckoView versions can be found here:
 // https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/
+versions.gecko_view_release = "115.0.20230710165010"
 versions.gecko_view_nightly = "105.0.20220822095220"
 versions.gecko_view_beta = "104.0.20220816121120"
 versions.android_components = "105.0.8"

From a06d0950045ae7a85b66e4505bd6f93432a471b2 Mon Sep 17 00:00:00 2001
From: Sergio <svillar@igalia.com>
Date: Tue, 1 Aug 2023 12:27:19 +0200
Subject: [PATCH 2/2] Update versions.gradle

Co-authored-by: Hollow Man <hollowman@opensuse.org>
---
 versions.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.gradle b/versions.gradle
index 712a6514f0..7b5edf4adf 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -24,7 +24,7 @@ ext.deps = [:]
 def versions = [:]
 // GeckoView versions can be found here:
 // https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/
-versions.gecko_view_release = "115.0.20230710165010"
+versions.gecko_view_release = "105.0.20221007134813"
 versions.gecko_view_nightly = "105.0.20220822095220"
 versions.gecko_view_beta = "104.0.20220816121120"
 versions.android_components = "105.0.8"