Migrate to AndroidX (#306)

e7mac · web-flow · commit c89d6f4cc0a4 · 2019-01-23T12:26:19.000-08:00
diff --git a/AndroidSDKCore/build.gradle b/AndroidSDKCore/build.gradle
@@ -31,8 +31,8 @@ android {
 
 dependencies {
     // Compile dependencies will be added as dependency in pom file.
-    api "com.android.support:support-v4:[22.0.0,${SUPPORT_LIBRARY_VERSION}]"
-    api "com.android.support:appcompat-v7:[22.0.0,${SUPPORT_LIBRARY_VERSION}]"
+    api "androidx.legacy:legacy-support-v4:1.0.0"
+    api "androidx.appcompat:appcompat:${APPCOMPAT_LIBRARY_VERSION}"
 }
 
 task generateJavadoc(type: Javadoc) {
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/ActionContext.java b/AndroidSDKCore/src/main/java/com/leanplum/ActionContext.java
@@ -21,7 +21,7 @@
 
 package com.leanplum;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.leanplum.callbacks.VariablesChangedCallback;
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/Leanplum.java b/AndroidSDKCore/src/main/java/com/leanplum/Leanplum.java
@@ -23,10 +23,9 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.drm.DrmStore;
 import android.location.Location;
 import android.os.AsyncTask;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 
 import com.leanplum.ActionContext.ContextualValues;
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/internal/CountAggregator.java b/AndroidSDKCore/src/main/java/com/leanplum/internal/CountAggregator.java
@@ -1,7 +1,7 @@
 package com.leanplum.internal;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 
 import java.util.HashSet;
 import java.util.HashMap;
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/internal/FeatureFlagManager.java b/AndroidSDKCore/src/main/java/com/leanplum/internal/FeatureFlagManager.java
@@ -1,6 +1,6 @@
 package com.leanplum.internal;
 
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 
 import com.leanplum.Leanplum;
 
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/internal/LeanplumEventCallbackManager.java b/AndroidSDKCore/src/main/java/com/leanplum/internal/LeanplumEventCallbackManager.java
@@ -21,7 +21,7 @@
 package com.leanplum.internal;
 
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.leanplum.Leanplum;
 
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/internal/RequestOld.java b/AndroidSDKCore/src/main/java/com/leanplum/internal/RequestOld.java
@@ -25,8 +25,8 @@
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 
 import com.leanplum.Leanplum;
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/internal/Util.java b/AndroidSDKCore/src/main/java/com/leanplum/internal/Util.java
@@ -37,7 +37,7 @@
 import android.os.AsyncTask;
 import android.os.Build;
 import android.provider.Settings.Secure;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.RequiresPermission;
 import android.text.TextUtils;
 import android.util.TypedValue;
 
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/messagetemplates/HTMLTemplate.java b/AndroidSDKCore/src/main/java/com/leanplum/messagetemplates/HTMLTemplate.java
@@ -22,9 +22,8 @@
 package com.leanplum.messagetemplates;
 
 import android.app.Activity;
-import android.content.Context;
 import android.graphics.Point;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 import android.view.MotionEvent;
 
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/models/MessageArchiveData.java b/AndroidSDKCore/src/main/java/com/leanplum/models/MessageArchiveData.java
@@ -1,6 +1,6 @@
 package com.leanplum.models;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Date;
 
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/views/BackgroundImageView.java b/AndroidSDKCore/src/main/java/com/leanplum/views/BackgroundImageView.java
@@ -29,15 +29,15 @@
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
 import android.graphics.PorterDuff.Mode;
-import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.RelativeLayout.LayoutParams;
 
 import com.leanplum.utils.BitmapUtil;
 import com.leanplum.utils.SizeUtil;
 
+import androidx.appcompat.widget.AppCompatImageView;
+
 /**
  * The image background on a Center Popup or Interstitial dialog.
  *
diff --git a/AndroidSDKPush/src/main/java/com/leanplum/LeanplumNotificationHelper.java b/AndroidSDKPush/src/main/java/com/leanplum/LeanplumNotificationHelper.java
@@ -34,20 +34,18 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.TypedValue;
 import android.widget.RemoteViews;
 
 import com.leanplum.internal.Constants;
 import com.leanplum.internal.JsonConverter;
 import com.leanplum.internal.Log;
-import com.leanplum.internal.Util;
 import com.leanplum.utils.BitmapUtil;
 import com.leanplum.utils.BuildUtil;
 
-import java.util.IllegalFormatCodePointException;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
diff --git a/AndroidSDKPush/src/main/java/com/leanplum/LeanplumPushNotificationCustomizer.java b/AndroidSDKPush/src/main/java/com/leanplum/LeanplumPushNotificationCustomizer.java
@@ -23,8 +23,8 @@
 
 import android.app.Notification;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 
 /**
  * Implement LeanplumPushNotificationCustomizer to customize the appearance of notifications.
diff --git a/AndroidSDKPush/src/main/java/com/leanplum/LeanplumPushService.java b/AndroidSDKPush/src/main/java/com/leanplum/LeanplumPushService.java
@@ -33,7 +33,7 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 
 import com.leanplum.callbacks.VariablesChangedCallback;
 import com.leanplum.internal.ActionManager;
diff --git a/AndroidSDKTests/build.gradle b/AndroidSDKTests/build.gradle
@@ -46,7 +46,7 @@ dependencies {
     implementation project(':AndroidSDKLocation')
     implementation project(':AndroidSDKGcm')
     implementation project(':AndroidSDKFcm')
-    implementation "com.android.support:appcompat-v7:${SUPPORT_LIBRARY_VERSION}"
+    implementation "androidx.appcompat:appcompat:${APPCOMPAT_LIBRARY_VERSION}"
     implementation 'com.google.android.gms:play-services-gcm:11.6.0'
     implementation 'com.google.android.gms:play-services-location:11.6.0'
 
diff --git a/AndroidSDKTests/src/main/java/com/leanplum/tests/MainActivity.java b/AndroidSDKTests/src/main/java/com/leanplum/tests/MainActivity.java
@@ -1,8 +1,9 @@
 package com.leanplum.tests;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 public class MainActivity extends AppCompatActivity {
 
   @Override
diff --git a/AndroidSDKTests/src/main/res/layout/activity_main.xml b/AndroidSDKTests/src/main/res/layout/activity_main.xml
@@ -160,7 +160,7 @@
 
         </LinearLayout>
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/pager"
             android:layout_width="match_parent"
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/LeanplumPushServiceTest.java b/AndroidSDKTests/src/test/java/com/leanplum/LeanplumPushServiceTest.java
@@ -28,8 +28,8 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 
 import com.leanplum.__setup.LeanplumTestApp;
 import com.leanplum.__setup.TestClassUtil;
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/_whitebox/utilities/SynchronousExecutor.java b/AndroidSDKTests/src/test/java/com/leanplum/_whitebox/utilities/SynchronousExecutor.java
@@ -20,7 +20,7 @@
  */
 package com.leanplum._whitebox.utilities;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.concurrent.Executor;
 
diff --git a/common-methods.gradle b/common-methods.gradle
@@ -1,7 +1,7 @@
 // Export methods by turning them into closures
 ext {
     COMPILE_SDK_VERSION = 28
-    SUPPORT_LIBRARY_VERSION = '28.0.0'
+    APPCOMPAT_LIBRARY_VERSION = '1.0.2'
     MIN_SDK_VERSION = 14
 
     LEANPLUM_GROUP_ID = 'com.leanplum'
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ android {`
`31`	`31`
`32`	`32`	`dependencies {`
`33`	`33`	`// Compile dependencies will be added as dependency in pom file.`
`34`		`- api "com.android.support:support-v4:[22.0.0,${SUPPORT_LIBRARY_VERSION}]"`
`35`		`- api "com.android.support:appcompat-v7:[22.0.0,${SUPPORT_LIBRARY_VERSION}]"`
	`34`	`+ api "androidx.legacy:legacy-support-v4:1.0.0"`
	`35`	`+ api "androidx.appcompat:appcompat:${APPCOMPAT_LIBRARY_VERSION}"`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`task generateJavadoc(type: Javadoc) {`