From 9c202274938d75b41beb0c46bc1013fd711c6a9b Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Tue, 13 Jun 2023 12:24:17 +0200
Subject: [PATCH] Replace some Android support.v4 with androidx libraries

---
 .../io/guh/nymeaapp/NymeaAppNotificationService.java         | 3 ++-
 .../android/java/io/guh/nymeaapp/NymeaAppActivity.java       | 2 +-
 packaging/android/AndroidManifest.xml                        | 2 +-
 packaging/android/build.gradle                               | 5 +++--
 packaging/android/gradle.properties                          | 3 +++
 packaging/android/gradle/wrapper/gradle-wrapper.properties   | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 packaging/android/gradle.properties

diff --git a/nymea-app/platformintegration/android/java-firebase/io/guh/nymeaapp/NymeaAppNotificationService.java b/nymea-app/platformintegration/android/java-firebase/io/guh/nymeaapp/NymeaAppNotificationService.java
index 6aba9707..f9c8a25d 100644
--- a/nymea-app/platformintegration/android/java-firebase/io/guh/nymeaapp/NymeaAppNotificationService.java
+++ b/nymea-app/platformintegration/android/java-firebase/io/guh/nymeaapp/NymeaAppNotificationService.java
@@ -18,7 +18,8 @@ import android.provider.Settings.System;
 import android.os.Build;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.support.v4.app.NotificationCompat;
+
+import androidx.core.app.NotificationCompat;
 
 import java.util.Random;
 
diff --git a/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java b/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java
index a3f8726b..1f18dbb9 100644
--- a/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java
+++ b/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java
@@ -12,11 +12,11 @@ import android.provider.Settings;
 import android.provider.Settings.Secure;
 import android.os.Vibrator;
 import android.net.Uri;
-import android.support.v4.content.FileProvider;
 import android.content.res.Configuration;
 import android.content.IntentFilter;
 import android.content.BroadcastReceiver;
 import android.location.LocationManager;
+import androidx.core.content.FileProvider;
 
 public class NymeaAppActivity extends org.qtproject.qt5.android.bindings.QtActivity
 {
diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml
index 6f259537..eb09c850 100644
--- a/packaging/android/AndroidManifest.xml
+++ b/packaging/android/AndroidManifest.xml
@@ -149,7 +149,7 @@
         </service>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="io.guh.nymeaapp.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/packaging/android/build.gradle b/packaging/android/build.gradle
index a5825677..c3c03bdf 100644
--- a/packaging/android/build.gradle
+++ b/packaging/android/build.gradle
@@ -15,8 +15,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
-        classpath 'com.google.gms:google-services:3.2.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.google.gms:google-services:4.3.8'
     }
 }
 
@@ -39,6 +39,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'org.reactivestreams:reactive-streams:1.0.3'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.0'
+    implementation 'androidx.core:core:1.3.2'
 
     if ("${useFirebase}" == "true") {
         implementation 'com.google.android.gms:play-services-base:15.0.1'
diff --git a/packaging/android/gradle.properties b/packaging/android/gradle.properties
new file mode 100644
index 00000000..ffbfe84e
--- /dev/null
+++ b/packaging/android/gradle.properties
@@ -0,0 +1,3 @@
+android.useAndroidX=true
+android.enableJetifier=true
+org.gradle.jvmargs=-Xmx4608m
diff --git a/packaging/android/gradle/wrapper/gradle-wrapper.properties b/packaging/android/gradle/wrapper/gradle-wrapper.properties
index 541c09d3..40998d2f 100644
--- a/packaging/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packaging/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip