Migrate to AndroidX (#1478)

stripe · Sep 5, 2019 · 92842d6 · 92842d6
1 parent 777e2e8
commit 92842d6
Show file tree

Hide file tree

Showing 231 changed files with 673 additions and 639 deletions.
diff --git a/example/build.gradle b/example/build.gradle
@@ -11,12 +11,12 @@ configurations {
 
 dependencies {
     implementation project(':stripe')
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation "com.android.support:appcompat-v7:28.0.0"
-    implementation "com.android.support:recyclerview-v7:28.0.0"
-    implementation "com.android.support:support-v4:28.0.0"
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
-    implementation 'com.google.android.gms:play-services-wallet:16.0.1'
+    implementation 'com.google.android.gms:play-services-wallet:18.0.0'
 
     /* Needed for RxAndroid */
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'

diff --git a/example/res/layout/activity_launcher.xml b/example/res/layout/activity_launcher.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     >
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/examples"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

diff --git a/example/res/layout/activity_polling.xml b/example/res/layout/activity_polling.xml
@@ -42,7 +42,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/ExampleApplication.kt b/example/src/main/java/com/stripe/example/ExampleApplication.kt
@@ -1,7 +1,7 @@
 package com.stripe.example
 
 import android.os.StrictMode
-import android.support.multidex.MultiDexApplication
+import androidx.multidex.MultiDexApplication
 
 import com.facebook.stetho.Stetho
 import com.squareup.leakcanary.LeakCanary

diff --git a/example/src/main/java/com/stripe/example/activity/CardTokenActivity.kt b/example/src/main/java/com/stripe/example/activity/CardTokenActivity.kt
@@ -1,7 +1,7 @@
 package com.stripe.example.activity
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import com.stripe.android.PaymentConfiguration
 import com.stripe.example.R
 import com.stripe.example.module.DependencyHandler

diff --git a/example/src/main/java/com/stripe/example/activity/CustomerSessionActivity.kt b/example/src/main/java/com/stripe/example/activity/CustomerSessionActivity.kt
@@ -3,11 +3,11 @@ package com.stripe.example.activity
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.view.View
 import android.widget.Button
 import android.widget.ProgressBar
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import com.stripe.android.CustomerSession
 import com.stripe.android.StripeError
 import com.stripe.android.model.Customer

diff --git a/example/src/main/java/com/stripe/example/activity/FragmentExamplesActivity.kt b/example/src/main/java/com/stripe/example/activity/FragmentExamplesActivity.kt
@@ -2,15 +2,14 @@ package com.stripe.example.activity
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.stripe.android.ApiResultCallback
 import com.stripe.android.CustomerSession
 import com.stripe.android.PaymentConfiguration
@@ -27,8 +26,8 @@ import com.stripe.android.model.Customer
 import com.stripe.android.view.ShippingInfoWidget
 import com.stripe.example.R
 import com.stripe.example.module.RetrofitFactory
-import com.stripe.example.service.ExampleEphemeralKeyProvider
 import com.stripe.example.service.BackendApi
+import com.stripe.example.service.ExampleEphemeralKeyProvider
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
@@ -55,7 +54,7 @@ class FragmentExamplesActivity : AppCompatActivity() {
             .commit()
     }
 
-    class LauncherFragment : Fragment() {
+    class LauncherFragment : androidx.fragment.app.Fragment() {
 
         private val compositeDisposable = CompositeDisposable()
 

diff --git a/example/src/main/java/com/stripe/example/activity/LauncherActivity.kt b/example/src/main/java/com/stripe/example/activity/LauncherActivity.kt
@@ -3,14 +3,12 @@ package com.stripe.example.activity
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.stripe.android.PaymentConfiguration
 import com.stripe.example.R
 import com.stripe.example.Settings
@@ -23,17 +21,17 @@ class LauncherActivity : AppCompatActivity() {
 
         PaymentConfiguration.init(this, Settings.PUBLISHABLE_KEY)
 
-        val examples = findViewById<RecyclerView>(R.id.examples)
-        val linearLayoutManager = LinearLayoutManager(this)
-        linearLayoutManager.orientation = LinearLayoutManager.VERTICAL
+        val examples = findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.examples)
+        val linearLayoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
+        linearLayoutManager.orientation = androidx.recyclerview.widget.LinearLayoutManager.VERTICAL
         examples.setHasFixedSize(true)
         examples.layoutManager = linearLayoutManager
         examples.adapter = ExamplesAdapter(this)
     }
 
     private class ExamplesAdapter constructor(
         private val activity: Activity
-    ) : RecyclerView.Adapter<ExamplesAdapter.ExamplesViewHolder>() {
+    ) : androidx.recyclerview.widget.RecyclerView.Adapter<ExamplesAdapter.ExamplesViewHolder>() {
         private val items = listOf(
             Item(activity.getString(R.string.launch_payment_intent_example),
                 PaymentIntentActivity::class.java),
@@ -78,6 +76,6 @@ class LauncherActivity : AppCompatActivity() {
 
         private class ExamplesViewHolder constructor(
             itemView: View
-        ) : RecyclerView.ViewHolder(itemView)
+        ) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView)
     }
 }
diff --git a/example/src/main/java/com/stripe/example/activity/PayWithGoogleActivity.kt b/example/src/main/java/com/stripe/example/activity/PayWithGoogleActivity.kt
@@ -3,10 +3,10 @@ package com.stripe.example.activity
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.view.View
 import android.widget.ProgressBar
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.wallet.AutoResolveHelper
 import com.google.android.gms.wallet.IsReadyToPayRequest

diff --git a/example/src/main/java/com/stripe/example/activity/PaymentAuthActivity.kt b/example/src/main/java/com/stripe/example/activity/PaymentAuthActivity.kt
@@ -2,11 +2,11 @@ package com.stripe.example.activity
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.view.View
 import android.widget.Button
 import android.widget.ProgressBar
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import com.stripe.android.ApiResultCallback
 import com.stripe.android.PaymentAuthConfig
 import com.stripe.android.PaymentConfiguration

diff --git a/example/src/main/java/com/stripe/example/activity/PaymentIntentActivity.kt b/example/src/main/java/com/stripe/example/activity/PaymentIntentActivity.kt
@@ -2,11 +2,11 @@ package com.stripe.example.activity
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.stripe.android.ApiResultCallback
 import com.stripe.android.PaymentConfiguration
 import com.stripe.android.PaymentIntentResult

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

diff --git a/example/src/main/java/com/stripe/example/activity/PaymentSessionActivity.kt b/example/src/main/java/com/stripe/example/activity/PaymentSessionActivity.kt
@@ -5,12 +5,12 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Bundle
-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.appcompat.app.AppCompatActivity
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.stripe.android.CustomerSession
 import com.stripe.android.PayWithGoogleUtils.getPriceString
 import com.stripe.android.PaymentSession

diff --git a/example/src/main/java/com/stripe/example/activity/RedirectActivity.kt b/example/src/main/java/com/stripe/example/activity/RedirectActivity.kt
@@ -2,10 +2,9 @@ package com.stripe.example.activity
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.stripe.android.PaymentConfiguration
 import com.stripe.android.Stripe
 import com.stripe.android.model.Card
@@ -57,7 +56,7 @@ class RedirectActivity : AppCompatActivity() {
         val threeDSyncButton = findViewById<Button>(R.id.btn_three_d_secure_sync)
         threeDSyncButton.setOnClickListener { beginSequence() }
 
-        val recyclerView = findViewById<RecyclerView>(R.id.recycler_view)
+        val recyclerView = findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.recycler_view)
         val linearLayoutManager = LinearLayoutManager(this)
         recyclerView.setHasFixedSize(true)
         recyclerView.layoutManager = linearLayoutManager

diff --git a/example/src/main/java/com/stripe/example/activity/SetupIntentActivity.kt b/example/src/main/java/com/stripe/example/activity/SetupIntentActivity.kt
@@ -2,11 +2,11 @@ package com.stripe.example.activity
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.stripe.android.ApiResultCallback
 import com.stripe.android.PaymentConfiguration
 import com.stripe.android.SetupIntentResult

diff --git a/example/src/main/java/com/stripe/example/adapter/RedirectAdapter.kt b/example/src/main/java/com/stripe/example/adapter/RedirectAdapter.kt
@@ -1,10 +1,10 @@
 package com.stripe.example.adapter
 
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import com.stripe.android.model.Source
 import com.stripe.example.R
 import java.util.ArrayList

diff --git a/example/src/main/java/com/stripe/example/controller/ErrorDialogHandler.kt b/example/src/main/java/com/stripe/example/controller/ErrorDialogHandler.kt
@@ -1,6 +1,6 @@
 package com.stripe.example.controller
 
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 
 import com.stripe.example.R
 import com.stripe.example.dialog.ErrorDialogFragment

diff --git a/example/src/main/java/com/stripe/example/controller/ProgressDialogController.kt b/example/src/main/java/com/stripe/example/controller/ProgressDialogController.kt
@@ -1,18 +1,15 @@
 package com.stripe.example.controller
 
 import android.content.res.Resources
-import android.support.annotation.StringRes
-import android.support.v4.app.FragmentManager
-
+import androidx.annotation.StringRes
 import com.stripe.example.dialog.ProgressDialogFragment
-
 import java.lang.ref.WeakReference
 
 /**
  * Class used to show and hide the progress spinner.
  */
 class ProgressDialogController(
-    private val fragmentManager: FragmentManager,
+    private val fragmentManager: androidx.fragment.app.FragmentManager,
     private val res: Resources
 ) {
     private var progressFragmentRef: WeakReference<ProgressDialogFragment>? = null

diff --git a/example/src/main/java/com/stripe/example/controller/RedirectDialogController.kt b/example/src/main/java/com/stripe/example/controller/RedirectDialogController.kt
@@ -3,7 +3,7 @@ package com.stripe.example.controller
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 
 import com.stripe.android.model.Card
 import com.stripe.example.R

diff --git a/example/src/main/java/com/stripe/example/dialog/ErrorDialogFragment.kt b/example/src/main/java/com/stripe/example/dialog/ErrorDialogFragment.kt
@@ -3,11 +3,9 @@ package com.stripe.example.dialog
 import android.app.AlertDialog
 import android.app.Dialog
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-
 import com.stripe.example.R
 
-class ErrorDialogFragment : DialogFragment() {
+class ErrorDialogFragment : androidx.fragment.app.DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val title = arguments!!.getString("title")

diff --git a/example/src/main/java/com/stripe/example/dialog/ProgressDialogFragment.kt b/example/src/main/java/com/stripe/example/dialog/ProgressDialogFragment.kt
@@ -3,9 +3,8 @@ package com.stripe.example.dialog
 import android.app.Dialog
 import android.app.ProgressDialog
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
 
-class ProgressDialogFragment : DialogFragment() {
+class ProgressDialogFragment : androidx.fragment.app.DialogFragment() {
 
     private val message: String?
         get() = if (arguments != null) arguments!!.getString("message") else null

diff --git a/example/src/main/java/com/stripe/example/module/DependencyHandler.kt b/example/src/main/java/com/stripe/example/module/DependencyHandler.kt
@@ -1,9 +1,9 @@
 package com.stripe.example.module
 
 import android.content.Context
-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.controller.AsyncTaskTokenController
 import com.stripe.example.controller.ErrorDialogHandler

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

diff --git a/example/src/main/java/com/stripe/example/service/TokenIntentService.kt b/example/src/main/java/com/stripe/example/service/TokenIntentService.kt
@@ -3,8 +3,6 @@ package com.stripe.example.service
 import android.app.Activity
 import android.app.IntentService
 import android.content.Intent
-import android.support.v4.content.LocalBroadcastManager
-
 import com.stripe.android.PaymentConfiguration
 import com.stripe.android.Stripe
 import com.stripe.android.exception.StripeException
@@ -48,7 +46,7 @@ class TokenIntentService : IntentService("TokenIntentService") {
         }
 
         // Broadcasts the Intent to receivers in this app.
-        LocalBroadcastManager.getInstance(this).sendBroadcast(localIntent)
+        androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(this).sendBroadcast(localIntent)
     }
 
     companion object {

diff --git a/gradle.properties b/gradle.properties
@@ -12,3 +12,5 @@ POM_DEVELOPER_NAME=Stripe
 POM_DEVELOPER_EMAIL[email protected]
 
 org.gradle.jvmargs=-XX\:MaxHeapSize\=2048m -Xmx4608M
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/samplestore/build.gradle b/samplestore/build.gradle
@@ -21,7 +21,7 @@ android {
         multiDexEnabled true
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         manifestPlaceholders = [
                 PRICE_MULTIPLIER: 1.0
@@ -52,10 +52,10 @@ android {
 
 dependencies {
     implementation project(':stripe')
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation "com.android.support:appcompat-v7:28.0.0"
-    implementation "com.android.support:recyclerview-v7:28.0.0"
-    implementation "com.android.support:design:28.0.0"
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
 
     /* Needed for RxAndroid */
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'