From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 mobile/android/examples/messaging_example/app/build.gradle     | 10 ++++------
 .../messaging_example/app/src/main/AndroidManifest.xml         |  1 -
 .../android/examples/port_messaging_example/app/build.gradle   | 10 ++++------
 .../port_messaging_example/app/src/main/AndroidManifest.xml    |  1 -
 4 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'mobile/android/examples')

diff --git a/mobile/android/examples/messaging_example/app/build.gradle b/mobile/android/examples/messaging_example/app/build.gradle
index 1fbc89b457..52934be74f 100644
--- a/mobile/android/examples/messaging_example/app/build.gradle
+++ b/mobile/android/examples/messaging_example/app/build.gradle
@@ -18,7 +18,6 @@ android {
         minSdkVersion project.ext.minSdkVersion
         versionCode 1
         versionName "1.0"
-        multiDexEnabled true
     }
     buildTypes {
         release {
@@ -45,11 +44,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "androidx.annotation:annotation:1.6.0"
-    implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    testImplementation 'junit:junit:4.13.2'
+    implementation ComponentsDependencies.androidx_annotation
+    implementation ComponentsDependencies.androidx_appcompat
+    implementation ComponentsDependencies.androidx_constraintlayout
+    testImplementation ComponentsDependencies.testing_junit
     // Replace this with implementation "org.mozilla.geckoview:geckoview-${geckoviewChannel}:${geckoviewVersion}"
     implementation project(path: ':geckoview')
 }
diff --git a/mobile/android/examples/messaging_example/app/src/main/AndroidManifest.xml b/mobile/android/examples/messaging_example/app/src/main/AndroidManifest.xml
index a4bab45e72..95129df7be 100644
--- a/mobile/android/examples/messaging_example/app/src/main/AndroidManifest.xml
+++ b/mobile/android/examples/messaging_example/app/src/main/AndroidManifest.xml
@@ -10,7 +10,6 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:name="androidx.multidex.MultiDexApplication"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
diff --git a/mobile/android/examples/port_messaging_example/app/build.gradle b/mobile/android/examples/port_messaging_example/app/build.gradle
index b9eab053fd..819dc81fce 100644
--- a/mobile/android/examples/port_messaging_example/app/build.gradle
+++ b/mobile/android/examples/port_messaging_example/app/build.gradle
@@ -18,7 +18,6 @@ android {
         minSdkVersion project.ext.minSdkVersion
         versionCode 1
         versionName "1.0"
-        multiDexEnabled true
     }
     buildTypes {
         release {
@@ -45,10 +44,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "androidx.annotation:annotation:1.6.0"
-    implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    testImplementation 'junit:junit:4.13.2'
+    implementation ComponentsDependencies.androidx_annotation
+    implementation ComponentsDependencies.androidx_appcompat
+    implementation ComponentsDependencies.androidx_constraintlayout
+    testImplementation ComponentsDependencies.testing_junit
     implementation project(path: ':geckoview')
 }
diff --git a/mobile/android/examples/port_messaging_example/app/src/main/AndroidManifest.xml b/mobile/android/examples/port_messaging_example/app/src/main/AndroidManifest.xml
index a4bab45e72..95129df7be 100644
--- a/mobile/android/examples/port_messaging_example/app/src/main/AndroidManifest.xml
+++ b/mobile/android/examples/port_messaging_example/app/src/main/AndroidManifest.xml
@@ -10,7 +10,6 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:name="androidx.multidex.MultiDexApplication"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-- 
cgit v1.2.3