Migrate to AndroidX

moeiscool · Mar 7, 2019 · 1afdd17 · 1afdd17
1 parent 4f05876
commit 1afdd17
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -58,7 +58,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
@@ -72,5 +72,5 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
 }
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/android/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/android/src/main/java/org/strongswan/android/logic/CharonVpnService.java
@@ -28,7 +28,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.ParcelFileDescriptor;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.system.OsConstants;
 import android.util.Log;
 
@@ -265,7 +265,7 @@ private void stopCurrentConnection() {
      */
     private Notification buildNotification() {
         NotificationCompat.Builder builder = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL)
-                .setSmallIcon(android.support.v7.appcompat.R.drawable.abc_ic_star_black_36dp)
+                .setSmallIcon(androidx.appcompat.R.drawable.abc_ic_star_black_36dp)
                 .setCategory(NotificationCompat.CATEGORY_SERVICE)
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
         builder.setContentTitle("VPN Connected");

diff --git a/android/src/main/java/org/strongswan/android/logic/SimpleFetcher.java b/android/src/main/java/org/strongswan/android/logic/SimpleFetcher.java
@@ -15,7 +15,7 @@
 
 package org.strongswan.android.logic;
 
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
 
 import java.io.*;
 import java.net.HttpURLConnection;

diff --git a/android/src/main/java/org/strongswan/android/utils/IPRange.java b/android/src/main/java/org/strongswan/android/utils/IPRange.java
@@ -15,7 +15,7 @@
 
 package org.strongswan.android.utils;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

diff --git a/android/src/main/kotlin/io/xdea/flutter_vpn/FlutterVpnPlugin.kt b/android/src/main/kotlin/io/xdea/flutter_vpn/FlutterVpnPlugin.kt
@@ -18,7 +18,7 @@ import android.app.Activity.RESULT_OK
 import android.content.Intent
 import android.net.VpnService
 import android.os.Bundle
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import io.flutter.plugin.common.EventChannel
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel