Prepare build system for the incoming migration to gecko 128.14.0

First of all we're specifying that the gecko substitution should be
done for the omni version of the GeckoView packages. By default if
omni is not specified then gradle expects the lite version. For a
full fledged browser the omni version should be used.

That brings some challenges. For example glean is provided both
by GV and android components so we had to had some dependency
analysis code to select the one from GV (this is also done by
Mozilla in their reference browser implementation).

Last but not least, the dependency analysis forced us to bump
the gradle and gradle plugin versions.

Author: svillar

app/build.gradle

@@ -16,7 +16,7 @@ if (getGradle().getStartParameter().getTaskRequests().toString() =~ /[Hh]vr/
 
 def getGitHash = { ->
     def stdout = new ByteArrayOutputStream()
-    exec {
+    project.exec {
         commandLine 'git', 'rev-parse', '--short', 'HEAD'
         standardOutput = stdout
     }
@@ -156,8 +156,6 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
-    project.archivesBaseName = "Wolvic"
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -202,6 +200,19 @@ android {
         }
     }
 
+    // Select the Glean from GeckoView.
+    // `service-sync-logins` requires Glean, which pulls in glean-native,
+    // but that's also provided by geckoview-omni, so now we need to select which one to use.
+    project.configurations.configureEach {
+        resolutionStrategy.capabilitiesResolution.withCapability("org.mozilla.telemetry:glean-native") {
+            def toBeSelected = candidates.find { it.id instanceof ModuleComponentIdentifier && it.id.module.contains('geckoview') }
+            if (toBeSelected != null) {
+                select(toBeSelected)
+            }
+            because 'use GeckoView Glean instead of standalone Glean'
+        }
+    }
+
     applicationVariants.configureEach { variant ->
         // Use different version names for release builds for each backend.
         def backend = variant.productFlavors.get(2).name

build.gradle

@@ -17,6 +17,10 @@ buildscript {
     }
 }
 
+plugins {
+    alias libs.plugins.dependency.analysis
+}
+
 allprojects {
     repositories {
         google()
@@ -26,6 +30,27 @@ allprojects {
     }
 }
 
+dependencyAnalysis {
+    structure {
+        // Ignore Android KTX dependencies. See https://developer.android.com/kotlin/ktx#modules
+        ignoreKtx(true)
+    }
+    issues {
+        all {
+            onAny {
+                // Fail the run if any issues are found (default = 'warn')
+                severity('fail')
+                // Ignore warnings about kotlin-stdlib since we don't directly control its usage
+                exclude('org.jetbrains.kotlin:kotlin-stdlib')
+            }
+            onUsedTransitiveDependencies {
+                // We explicitly want to pull in these dependencies transitively from AC
+                exclude('org.mozilla.appservices.nightly:fxaclient', 'org.mozilla.geckoview:geckoview-omni')
+            }
+        }
+    }
+}
+
 tasks.register("clean", Delete) {
     delete layout.buildDirectory
 }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.7.2"
+agp = "8.11.1"
 androidComponents = "128.0"
 androidxAnnotation = "1.6.0"
 androidxAppcompat = "1.6.1"
@@ -18,6 +18,7 @@ atslRunner = "1.5.2"
 atslJunit = "1.1.5"
 colorpickerpreference = "2.0.6"
 desugarJdkLibs = "2.1.4"
+dependency-analysis = "3.0.1"
 diskLruCache = "2.0.2"
 espresso= "3.5.1"
 gamesActivity = "4.0.0"
@@ -96,12 +97,12 @@ espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref =
 # Games Activity
 games-activity = { module = "androidx.games:games-activity", version.ref = "gamesActivity" }
 # GeckoView
-geckoview-beta-arm64 = { module = "org.mozilla.geckoview:geckoview-beta-arm64-v8", version.ref = "geckoviewBeta" }
-geckoview-beta-x64 = { module = "org.mozilla.geckoview:geckoview-beta-x86_64", version.ref = "geckoviewBeta" }
-geckoview-nightly-arm64 = { module = "org.mozilla.geckoview:geckoview-nightly-arm64-v8a", version.ref = "geckoviewNightly" }
-geckoview-nightly-x64 = { module = "org.mozilla.geckoview:geckoview-nightly-x86_64", version.ref = "geckoviewNightly" }
-geckoview-release-arm64 = { module = "org.mozilla.geckoview:geckoview-arm64-v8a", version.ref = "geckoviewRelease" }
-geckoview-release-x64 = { module = "org.mozilla.geckoview:geckoview-x86_64", version.ref = "geckoviewRelease" }
+geckoview-beta-arm64 = { module = "org.mozilla.geckoview:geckoview-omni-beta-arm64-v8", version.ref = "geckoviewBeta" }
+geckoview-beta-x64 = { module = "org.mozilla.geckoview:geckoview-omni-beta-x86_64", version.ref = "geckoviewBeta" }
+geckoview-nightly-arm64 = { module = "org.mozilla.geckoview:geckoview-nightly-omni-arm64-v8a", version.ref = "geckoviewNightly" }
+geckoview-nightly-x64 = { module = "org.mozilla.geckoview:geckoview-nightly-omni-x86_64", version.ref = "geckoviewNightly" }
+geckoview-release-arm64 = { module = "org.mozilla.geckoview:geckoview-omni-arm64-v8a", version.ref = "geckoviewRelease" }
+geckoview-release-x64 = { module = "org.mozilla.geckoview:geckoview-omni-x86_64", version.ref = "geckoviewRelease" }
 # GSON
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 # Huawei
@@ -161,4 +162,5 @@ work-testing = { module = "androidx.work:work-testing", version.ref = "androidxW
 zip4j = { module = "net.lingala.zip4j:zip4j", version.ref = "zip4j" }
 
 [plugins]
+dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependency-analysis" }
 jetbrains-python-envs = { id = "com.jetbrains.python.envs", version.ref = "jetbrainsPython" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Jul 21 16:13:31 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME