Merge branch 'fork-maintainers:iceraven' into iceraven

Author: itsnotsos

android-components

@@ -26,7 +26,7 @@
 package com.adjust.sdk;
 
 public class Adjust {
-    public static void onCreate(AdjustConfig adjustConfig) {
+    public static void initSdk(AdjustConfig adjustConfig) {
     }
 
     public static void onResume() {
@@ -35,9 +35,12 @@ public static void onResume() {
     public static void onPause() {
     }
 
-    public static void setEnabled(boolean enabled) {
+    public static void enable() {
     }
-    
+
+    public static void disable() {
+    }
+
     public static void gdprForgetMe(Object ignored) {
     }
 }

app/src/main/java/com/adjust/sdk/Adjust.java

@@ -30,7 +30,7 @@
  * Created by pfms on 11/03/15.
  */
 public enum LogLevel {
-    VERBOSE(Log.VERBOSE), DEBUG(Log.DEBUG), INFO(Log.INFO), WARN(Log.WARN), ERROR(Log.ERROR), ASSERT(Log.ASSERT), SUPRESS(8);
+    VERBOSE(Log.VERBOSE), DEBUG(Log.DEBUG), INFO(Log.INFO), WARN(Log.WARN), ERROR(Log.ERROR), ASSERT(Log.ASSERT), SUPPRESS(8);
     final int androidLogLevel;
 
     LogLevel(final int androidLogLevel) {

app/src/main/java/com/adjust/sdk/LogLevel.java

@@ -42,9 +42,6 @@ class InstallReferrerMetricsService(private val context: Context) : MetricsServi
     override fun shouldTrack(event: Event): Boolean = false
 
     private fun triggerPing() {
-        CoroutineScope(Dispatchers.IO).launch {
-            Pings.playStoreAttribution.submit()
-        }
     }
 }
 

app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt

@@ -82,8 +82,6 @@ import mozilla.components.lib.state.ext.observeAsState
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import mozilla.components.ui.tabcounter.TabCounterMenu
 import mozilla.telemetry.glean.private.NoExtras
-import org.mozilla.fenix.AuthenticationStatus
-import org.mozilla.fenix.BiometricAuthenticationManager
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.GleanMetrics.HomeScreen
 import org.mozilla.fenix.GleanMetrics.Homepage

app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt

@@ -12,7 +12,9 @@ do
 done
 
 sed -i "s#gleanPythonEnvDir#// gleanPythonEnvDir#g" android-components/**/*.gradle
-sed -i 's#\.\./version.txt#\./version.txt#g' android-components/plugins/config/src/main/java/ConfigPlugin.kt
+sed -i "s#\.\./\.\./\.\./\.\./\.\./gradle/libs.versions.toml#../../../gradle/libs.versions.toml#g" android-components/**/*.gradle
+
+sed -i 's#\.\./version.txt#./version.txt#g' android-components/plugins/config/src/main/java/ConfigPlugin.kt
 
 git -C android-components apply < automation/iceraven/patches/top_sites_no_most_visted_sites.patch
 git -C android-components apply < automation/iceraven/patches/toolbar.patch

automation/iceraven/patch_android_components.sh

@@ -1 +1 @@
-#define MOZ_BUILDID  20250421163656
+#define MOZ_BUILDID  20250505124357

buildid.h

@@ -13,7 +13,9 @@
 org.gradle.jvmargs=-Xmx7g -Xms2g -XX:MaxMetaspaceSize=6g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC
 org.gradle.configureondemand=true
 
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=false
+
+#org.gradle.configuration-cache.problems=warn
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle.properties

@@ -31,11 +31,11 @@ plugins {
 }
 
 //dependencyResolutionManagement {
-//    versionCatalogs {
-//        libs {
-//            from(files("../../../gradle/libs.versions.toml"))
-//        }
-//    }
+//   versionCatalogs {
+//       libs {
+//           from(files("./gradle/libs.versions.toml"))
+//       }
+//   }
 //}
 
 ext.topsrcdir = rootProject.projectDir.absolutePath.minus("mobile/android/fenix")

settings.gradle

@@ -14,7 +14,7 @@ buildscript {
     repositories {
         gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
             maven {
-                url repository
+                url = repository
                 if (gradle.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES) {
                     allowInsecureProtocol = true
                 }