Migrate to Android X (stripe#778)

**Summary** The vast majority of changes in this patch are changes in package names/imports which were auto-generated via Android Studio's Android X migration tool. - Ran "Refactor -> Migrate to Android X..." in Android Studio - Updated Gradle dependency versions - Fixed import order to satisfy checkstyle **Motivation** AndroidX is the replacement for the original Android Support Library. All further development will occur in AndroidX. We should migrate to AndroidX to ensure that we are taking advantage of improvements and fixes to Android components. https://developer.android.com/jetpack/androidx/
52inc · Jan 23, 2019 · 8fcd9cc · 8fcd9cc
1 parent 81dc2e3
commit 8fcd9cc
Show file tree

Hide file tree

Showing 157 changed files with 508 additions and 431 deletions.
diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,11 @@ allprojects {
 ext {
     buildToolsVersion = "28.0.3"
     compileSdkVersion = 28
-    supportLibVersion = "28.0.0"
+
+    androidxAppCompatVersion = '1.0.2'
+    androidxMaterialVersion = '1.0.0'
+    androidxAnnotationVersion = '1.0.0'
+    androidxRecyclerViewVersion = '1.0.0'
 
     javaAnnotationVersion = "1.0"
     junitVersion = "4.12"

diff --git a/example/build.gradle b/example/build.gradle
@@ -2,12 +2,10 @@ apply plugin: 'com.android.application'
 
 dependencies {
     implementation project(':stripe')
-    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
+    implementation "androidx.appcompat:appcompat:${rootProject.ext.androidxAppCompatVersion}"
+    implementation "androidx.recyclerview:recyclerview:${rootProject.ext.androidxRecyclerViewVersion}"
 
     implementation 'com.google.android.gms:play-services-wallet:16.0.1'
-    implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
-    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
 
     /* Needed for RxAndroid */
     implementation 'io.reactivex:rxandroid:1.2.1'

diff --git a/example/res/layout/activity_polling.xml b/example/res/layout/activity_polling.xml
@@ -44,7 +44,7 @@
 
     <include layout="@layout/polling_list_headers"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="0dp"

diff --git a/example/src/main/java/com/stripe/example/activity/CustomerSessionActivity.java b/example/src/main/java/com/stripe/example/activity/CustomerSessionActivity.java
@@ -2,14 +2,15 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.stripe.android.CustomerSession;
 import com.stripe.android.model.Customer;
 import com.stripe.android.model.Source;

diff --git a/example/src/main/java/com/stripe/example/activity/LauncherActivity.java b/example/src/main/java/com/stripe/example/activity/LauncherActivity.java
@@ -2,9 +2,10 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.stripe.android.PaymentConfiguration;
 import com.stripe.example.R;
 

diff --git a/example/src/main/java/com/stripe/example/activity/PayWithGoogleActivity.java b/example/src/main/java/com/stripe/example/activity/PayWithGoogleActivity.java
@@ -3,12 +3,13 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.google.android.gms.common.api.ApiException;
 import com.google.android.gms.common.api.Status;
 import com.google.android.gms.identity.intents.model.UserAddress;

diff --git a/example/src/main/java/com/stripe/example/activity/PaymentActivity.java b/example/src/main/java/com/stripe/example/activity/PaymentActivity.java
@@ -1,10 +1,11 @@
 package com.stripe.example.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.Button;
 import android.widget.ListView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.stripe.android.view.CardInputWidget;
 import com.stripe.example.R;
 import com.stripe.example.module.DependencyHandler;

diff --git a/example/src/main/java/com/stripe/example/activity/PaymentIntentActivity.java b/example/src/main/java/com/stripe/example/activity/PaymentIntentActivity.java
@@ -3,13 +3,14 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.stripe.android.PaymentConfiguration;
 import com.stripe.android.Stripe;
 import com.stripe.android.model.Card;

diff --git a/example/src/main/java/com/stripe/example/activity/PaymentMultilineActivity.java b/example/src/main/java/com/stripe/example/activity/PaymentMultilineActivity.java
@@ -1,11 +1,12 @@
 package com.stripe.example.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.jakewharton.rxbinding.view.RxView;
 import com.stripe.android.PaymentConfiguration;
 import com.stripe.android.Stripe;

diff --git a/example/src/main/java/com/stripe/example/activity/PaymentSessionActivity.java b/example/src/main/java/com/stripe/example/activity/PaymentSessionActivity.java
@@ -5,15 +5,16 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import com.stripe.android.CustomerSession;
 import com.stripe.android.PaymentSession;
 import com.stripe.android.PaymentSessionConfig;

diff --git a/example/src/main/java/com/stripe/example/activity/RedirectActivity.java b/example/src/main/java/com/stripe/example/activity/RedirectActivity.java
@@ -2,14 +2,15 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.stripe.android.PaymentConfiguration;
 import com.stripe.android.Stripe;
 import com.stripe.android.model.Card;

diff --git a/example/src/main/java/com/stripe/example/adapter/RedirectAdapter.java b/example/src/main/java/com/stripe/example/adapter/RedirectAdapter.java
@@ -1,11 +1,12 @@
 package com.stripe.example.adapter;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.stripe.android.model.Source;
 import com.stripe.example.R;
 

diff --git a/example/src/main/java/com/stripe/example/controller/AsyncTaskTokenController.java b/example/src/main/java/com/stripe/example/controller/AsyncTaskTokenController.java
@@ -1,10 +1,11 @@
 package com.stripe.example.controller;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.view.View;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
+
 import com.stripe.android.PaymentConfiguration;
 import com.stripe.android.Stripe;
 import com.stripe.android.TokenCallback;

diff --git a/example/src/main/java/com/stripe/example/controller/ErrorDialogHandler.java b/example/src/main/java/com/stripe/example/controller/ErrorDialogHandler.java
@@ -1,7 +1,7 @@
 package com.stripe.example.controller;
 
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
 
 import com.stripe.example.R;
 import com.stripe.example.dialog.ErrorDialogFragment;

diff --git a/example/src/main/java/com/stripe/example/controller/IntentServiceTokenController.java b/example/src/main/java/com/stripe/example/controller/IntentServiceTokenController.java
@@ -5,12 +5,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.annotation.NonNull;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import com.stripe.android.model.Card;
 import com.stripe.android.view.CardInputWidget;
 import com.stripe.example.service.TokenIntentService;

diff --git a/example/src/main/java/com/stripe/example/controller/ListViewController.java b/example/src/main/java/com/stripe/example/controller/ListViewController.java
@@ -1,10 +1,11 @@
 package com.stripe.example.controller;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
 
+import androidx.annotation.NonNull;
+
 import com.stripe.android.model.Token;
 import com.stripe.example.R;
 

diff --git a/example/src/main/java/com/stripe/example/controller/ProgressDialogController.java b/example/src/main/java/com/stripe/example/controller/ProgressDialogController.java
@@ -1,8 +1,8 @@
 package com.stripe.example.controller;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.FragmentManager;
 
 import com.stripe.example.R;
 import com.stripe.example.dialog.ProgressDialogFragment;

diff --git a/example/src/main/java/com/stripe/example/controller/RedirectDialogController.java b/example/src/main/java/com/stripe/example/controller/RedirectDialogController.java
@@ -2,12 +2,13 @@
 
 import android.content.Intent;
 import android.net.Uri;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.stripe.example.R;
 
 /**

diff --git a/example/src/main/java/com/stripe/example/controller/RxTokenController.java b/example/src/main/java/com/stripe/example/controller/RxTokenController.java
@@ -1,9 +1,10 @@
 package com.stripe.example.controller;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
+
 import com.jakewharton.rxbinding.view.RxView;
 import com.stripe.android.PaymentConfiguration;
 import com.stripe.android.Stripe;

diff --git a/example/src/main/java/com/stripe/example/dialog/ErrorDialogFragment.java b/example/src/main/java/com/stripe/example/dialog/ErrorDialogFragment.java
@@ -4,7 +4,8 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+
+import androidx.fragment.app.DialogFragment;
 
 import com.stripe.example.R;
 

diff --git a/example/src/main/java/com/stripe/example/dialog/ProgressDialogFragment.java b/example/src/main/java/com/stripe/example/dialog/ProgressDialogFragment.java
@@ -3,7 +3,8 @@
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+
+import androidx.fragment.app.DialogFragment;
 
 public class ProgressDialogFragment extends DialogFragment {
     public static ProgressDialogFragment newInstance(int msgId) {

diff --git a/example/src/main/java/com/stripe/example/module/DependencyHandler.java b/example/src/main/java/com/stripe/example/module/DependencyHandler.java
@@ -1,11 +1,12 @@
 package com.stripe.example.module;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.Button;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.stripe.android.model.Card;
 import com.stripe.android.view.CardInputWidget;
 import com.stripe.example.controller.AsyncTaskTokenController;

diff --git a/example/src/main/java/com/stripe/example/service/ExampleEphemeralKeyProvider.java b/example/src/main/java/com/stripe/example/service/ExampleEphemeralKeyProvider.java
@@ -1,7 +1,7 @@
 package com.stripe.example.service;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Size;
+import androidx.annotation.NonNull;
+import androidx.annotation.Size;
 
 import com.stripe.android.EphemeralKeyProvider;
 import com.stripe.android.EphemeralKeyUpdateListener;

diff --git a/example/src/main/java/com/stripe/example/service/TokenIntentService.java b/example/src/main/java/com/stripe/example/service/TokenIntentService.java
@@ -3,9 +3,10 @@
 import android.app.Activity;
 import android.app.IntentService;
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.stripe.android.PaymentConfiguration;
 import com.stripe.android.Stripe;

diff --git a/gradle.properties b/gradle.properties
@@ -10,3 +10,5 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=stripe
 POM_DEVELOPER_NAME=Stripe
 POM_DEVELOPER_EMAIL[email protected]
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/samplestore/build.gradle b/samplestore/build.gradle
@@ -10,7 +10,7 @@ android {
         targetSdkVersion rootProject.ext.compileSdkVersion
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     lintOptions {
@@ -29,9 +29,9 @@ android {
 dependencies {
     implementation project(':stripe')
 
-    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
-    implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
+    implementation "androidx.appcompat:appcompat:${rootProject.ext.androidxAppCompatVersion}"
+    implementation "androidx.recyclerview:recyclerview:${rootProject.ext.androidxRecyclerViewVersion}"
+    implementation "com.google.android.material:material:${rootProject.ext.androidxMaterialVersion}"
 
     /* Needed for RxAndroid */
     implementation 'io.reactivex:rxandroid:1.2.1'

diff --git a/samplestore/src/main/java/com/stripe/samplestore/ItemDivider.java b/samplestore/src/main/java/com/stripe/samplestore/ItemDivider.java
@@ -3,10 +3,11 @@
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 class ItemDivider extends RecyclerView.ItemDecoration {
 
     private Drawable divider;