status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-01-23 23:19:06 +00:00
Code Issues Projects Releases Wiki Activity

Migrate to use AndroidX

Browse Source
This commit is contained in:
Pedro Pombeiro 2019-08-07 15:08:22 +02:00
parent 46e3b52809
commit e4eabd2810
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/app/build.gradle
View File

@ -311,9 +311,8 @@ dependencies {
implementation jscFlavor implementation jscFlavor
} }
implementation 'com.android.support:multidex:1.0.2' implementation 'androidx.multidex:multidex:2.0.1' // only needed if minSdkVersion is less than 21 (https://developer.android.com/studio/build/multidex)
implementation project(':react-native-dialogs') implementation project(':react-native-dialogs')
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
// Force using exact RN version instead of relying on gradle dependency resolution // Force using exact RN version instead of relying on gradle dependency resolution
// https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution // https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution
// NOTE: Uncomment if building RN from a fork // NOTE: Uncomment if building RN from a fork

2
android/app/src/main/AndroidManifest.xml
View File

@ -85,7 +85,7 @@
</service> </service>
<service android:name="io.invertase.firebase.messaging.RNFirebaseBackgroundMessagingService" /> <service android:name="io.invertase.firebase.messaging.RNFirebaseBackgroundMessagingService" />
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider" android:authorities="${applicationId}.provider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true" android:grantUriPermissions="true"

4
android/app/src/main/java/im/status/ethereum/MainActivity.java
View File

@ -2,7 +2,7 @@ package im.status.ethereum;
import android.content.Context; import android.content.Context;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -13,7 +13,7 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Looper; import android.os.Looper;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import android.util.Log; import android.util.Log;
import android.view.WindowManager; import android.view.WindowManager;
import android.content.Intent; import android.content.Intent;

2
android/app/src/main/java/im/status/ethereum/MainApplication.java
View File

@ -1,6 +1,6 @@
package im.status.ethereum; package im.status.ethereum;
import android.support.multidex.MultiDexApplication; import androidx.multidex.MultiDexApplication;
import android.util.Log; import android.util.Log;
import com.facebook.react.PackageList; import com.facebook.react.PackageList;
import com.facebook.hermes.reactexecutor.HermesExecutorFactory; import com.facebook.hermes.reactexecutor.HermesExecutorFactory;

2
modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
View File

@ -10,7 +10,7 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.content.FileProvider; import androidx.core.content.FileProvider;
import android.util.Log; import android.util.Log;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;

3
nix/mobile/android/maven-and-npm-deps/default.nix
View File

@ -145,6 +145,9 @@ let
'nodeExecutableAndArgs: ["node"' \ 'nodeExecutableAndArgs: ["node"' \
'nodeExecutableAndArgs: ["${nodejs}/bin/node"' 'nodeExecutableAndArgs: ["${nodejs}/bin/node"'
# Patch dependencies which are not yet ported to AndroidX
npx jetify
set $prevSet set $prevSet
runHook postPatch runHook postPatch