Replace some Android support.v4 with androidx libraries

pull/1049/head
Michael Zanetti 2023-06-13 12:24:17 +02:00
parent 0667fd7678
commit 9c20227493
6 changed files with 11 additions and 6 deletions

View File

@ -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;

View File

@ -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
{

View File

@ -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">

View File

@ -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'

View File

@ -0,0 +1,3 @@
android.useAndroidX=true
android.enableJetifier=true
org.gradle.jvmargs=-Xmx4608m

View File

@ -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