diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /mobile/android/examples/messaging_example | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mobile/android/examples/messaging_example')
| -rw-r--r-- | mobile/android/examples/messaging_example/app/build.gradle | 10 | ||||
| -rw-r--r-- | mobile/android/examples/messaging_example/app/src/main/AndroidManifest.xml | 1 |
2 files changed, 4 insertions, 7 deletions
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"> |