diff --git a/example/build.gradle b/example/build.gradle
index e5ccc9a6a96..4ffbd0c2498 100644
--- 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
index 055165024ea..435b08c5486 100644
--- 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
index bf67888c6d6..997adcbcb97 100644
--- 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
index 6a8045b66a1..e2fbe0ae06e 100644
--- 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
index f9bd97d5440..c19c87be2c3 100644
--- 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
index 44b9aef1a06..f2da78e205f 100644
--- 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
index 45d6bde0987..375dcda5093 100644
--- a/example/src/main/java/com/stripe/example/activity/FragmentExamplesActivity.kt
+++ b/example/src/main/java/com/stripe/example/activity/FragmentExamplesActivity.kt
@@ -2,8 +2,6 @@ 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
@@ -11,6 +9,7 @@ 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
index ca7d87b853f..a49e841d842 100644
--- 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,9 +21,9 @@ 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)
@@ -33,7 +31,7 @@ class LauncherActivity : AppCompatActivity() {
 
     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
index 77f89ee2adf..b8aa6e50f9a 100644
--- 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
index f667a392b3e..3af18b34558 100644
--- 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
index a95e17a427a..c9e2e26a3e2 100644
--- 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
index 3576d1b003a..4063305dea4 100644
--- 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
index 071f2a54295..c066e4085a2 100644
--- 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
index 9abc03a50fd..fe4a0466859 100644
--- 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
index e31ee4446a7..6bda565995a 100644
--- 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
index 17407ca653e..f97876f50a3 100644
--- 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
index be0aaf94a6b..c89693c49fd 100644
--- 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
index 3b90b869a9a..ef8d4fe1c14 100644
--- 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
index 763f70ffca8..73fd8083778 100644
--- 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
index 7d2a32566c2..c0f5f8e2761 100644
--- 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
index 92d1bf67c26..3f9b1d703cd 100644
--- 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
index 3ad9dfa6124..ff8c2dc7c3e 100644
--- 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
index 1fbb199deef..6103e978bc4 100644
--- 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
index bdcb17d9942..d8bd2589c12 100644
--- 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
index ce4ea15e71c..dd29ed9659c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,3 +12,5 @@ POM_DEVELOPER_NAME=Stripe
 POM_DEVELOPER_EMAIL=support+android@stripe.com
 
 org.gradle.jvmargs=-XX\:MaxHeapSize\=2048m -Xmx4608M
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/samplestore/build.gradle b/samplestore/build.gradle
index a54c91bdac5..a40835284cc 100644
--- 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'
diff --git a/samplestore/src/main/java/com/stripe/samplestore/ItemDivider.kt b/samplestore/src/main/java/com/stripe/samplestore/ItemDivider.kt
index 7f7ce0c222f..5c67771cdd7 100644
--- a/samplestore/src/main/java/com/stripe/samplestore/ItemDivider.kt
+++ b/samplestore/src/main/java/com/stripe/samplestore/ItemDivider.kt
@@ -3,9 +3,8 @@ package com.stripe.samplestore
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.drawable.Drawable
-import android.support.annotation.DrawableRes
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
 
 /**
  * Custom divider will be used in the list.
@@ -13,11 +12,11 @@ import android.support.v7.widget.RecyclerView
 internal class ItemDivider(
     context: Context,
     @DrawableRes resId: Int
-) : RecyclerView.ItemDecoration() {
+) : androidx.recyclerview.widget.RecyclerView.ItemDecoration() {
 
     private val divider: Drawable = ContextCompat.getDrawable(context, resId)!!
 
-    override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+    override fun onDraw(c: Canvas, parent: androidx.recyclerview.widget.RecyclerView, state: androidx.recyclerview.widget.RecyclerView.State) {
         val start = parent.paddingStart
         val end = parent.width - parent.paddingEnd
 
@@ -25,7 +24,7 @@ internal class ItemDivider(
         for (i in 0 until childCount) {
             val child = parent.getChildAt(i)
 
-            val params = child.layoutParams as RecyclerView.LayoutParams
+            val params = child.layoutParams as androidx.recyclerview.widget.RecyclerView.LayoutParams
 
             val top = child.bottom + params.bottomMargin
             val bottom = top + divider.intrinsicHeight
diff --git a/samplestore/src/main/java/com/stripe/samplestore/PaymentActivity.kt b/samplestore/src/main/java/com/stripe/samplestore/PaymentActivity.kt
index 6b4d8fefd3a..faf6a5da0da 100644
--- a/samplestore/src/main/java/com/stripe/samplestore/PaymentActivity.kt
+++ b/samplestore/src/main/java/com/stripe/samplestore/PaymentActivity.kt
@@ -6,15 +6,14 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Bundle
-import android.support.annotation.Size
-import android.support.v4.content.LocalBroadcastManager
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
 import android.view.View
 import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.ProgressBar
 import android.widget.TextView
+import androidx.annotation.Size
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
 import com.jakewharton.rxbinding2.view.RxView
 import com.stripe.android.ApiResultCallback
 import com.stripe.android.CustomerSession
@@ -147,7 +146,7 @@ class PaymentActivity : AppCompatActivity() {
                 customerSession.retrieveCurrentCustomer(
                     SetupIntentCustomerRetrievalListener(this@PaymentActivity))
             })
-        val localBroadcastManager = LocalBroadcastManager.getInstance(this)
+        val localBroadcastManager = androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(this)
 
         broadcastReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context, intent: Intent) {
@@ -181,7 +180,7 @@ class PaymentActivity : AppCompatActivity() {
      */
     override fun onDestroy() {
         compositeDisposable.dispose()
-        LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver)
+        androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver)
         paymentSession.onDestroy()
         super.onDestroy()
     }
diff --git a/samplestore/src/main/java/com/stripe/samplestore/SampleStoreApplication.kt b/samplestore/src/main/java/com/stripe/samplestore/SampleStoreApplication.kt
index 24e8922a3df..6aad0e36be0 100644
--- a/samplestore/src/main/java/com/stripe/samplestore/SampleStoreApplication.kt
+++ b/samplestore/src/main/java/com/stripe/samplestore/SampleStoreApplication.kt
@@ -1,7 +1,7 @@
 package com.stripe.samplestore
 
 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/samplestore/src/main/java/com/stripe/samplestore/StoreActivity.kt b/samplestore/src/main/java/com/stripe/samplestore/StoreActivity.kt
index 5a405d41bd2..2ae5ce97db1 100644
--- a/samplestore/src/main/java/com/stripe/samplestore/StoreActivity.kt
+++ b/samplestore/src/main/java/com/stripe/samplestore/StoreActivity.kt
@@ -4,13 +4,11 @@ import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
-import android.support.design.widget.FloatingActionButton
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.stripe.android.CustomerSession
 import com.stripe.android.PaymentConfiguration
 import com.stripe.samplestore.service.SampleStoreEphemeralKeyProvider
@@ -47,8 +45,8 @@ class StoreActivity : AppCompatActivity(), StoreAdapter.TotalItemsChangedListene
         goToCartButton.hide()
         setSupportActionBar(findViewById(R.id.my_toolbar))
 
-        val recyclerView = findViewById<RecyclerView>(R.id.rv_store_items)
-        recyclerView.layoutManager = LinearLayoutManager(this)
+        val recyclerView = findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.rv_store_items)
+        recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
         recyclerView.addItemDecoration(ItemDivider(this, R.drawable.item_divider))
         recyclerView.adapter = storeAdapter
 
diff --git a/samplestore/src/main/java/com/stripe/samplestore/StoreAdapter.kt b/samplestore/src/main/java/com/stripe/samplestore/StoreAdapter.kt
index 593dcec3dc7..8891c2fc2bf 100644
--- a/samplestore/src/main/java/com/stripe/samplestore/StoreAdapter.kt
+++ b/samplestore/src/main/java/com/stripe/samplestore/StoreAdapter.kt
@@ -1,13 +1,12 @@
 package com.stripe.samplestore
 
 import android.app.Activity
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
 import android.widget.TextView
-
+import androidx.recyclerview.widget.RecyclerView
 import java.util.Currency
 
 class StoreAdapter internal constructor(
diff --git a/samplestore/src/main/java/com/stripe/samplestore/service/SampleStoreEphemeralKeyProvider.kt b/samplestore/src/main/java/com/stripe/samplestore/service/SampleStoreEphemeralKeyProvider.kt
index 38baf6757b8..22048be32d9 100644
--- a/samplestore/src/main/java/com/stripe/samplestore/service/SampleStoreEphemeralKeyProvider.kt
+++ b/samplestore/src/main/java/com/stripe/samplestore/service/SampleStoreEphemeralKeyProvider.kt
@@ -1,6 +1,6 @@
 package com.stripe.samplestore.service
 
-import android.support.annotation.Size
+import androidx.annotation.Size
 import com.stripe.android.EphemeralKeyProvider
 import com.stripe.android.EphemeralKeyUpdateListener
 import com.stripe.samplestore.RetrofitFactory
diff --git a/samplestore/src/main/res/layout/activity_store.xml b/samplestore/src/main/res/layout/activity_store.xml
index be6539658b2..aa590c2f553 100644
--- a/samplestore/src/main/res/layout/activity_store.xml
+++ b/samplestore/src/main/res/layout/activity_store.xml
@@ -14,7 +14,7 @@
         android:layout_height="match_parent"
         >
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/my_toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -24,7 +24,7 @@
             app:popupTheme="@style/WhiteTextTheme"
             tools:ignore="UnusedAttribute" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_store_items"
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -33,7 +33,7 @@
 
     </LinearLayout>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_checkout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/settings/checkstyle.xml b/settings/checkstyle.xml
index 2916460d06c..d47299cbe38 100644
--- a/settings/checkstyle.xml
+++ b/settings/checkstyle.xml
@@ -53,7 +53,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
         </module>
 
         <module name="ImportOrder">
-            <property name="groups" value="android,com,org,java,javax"/>
+            <property name="groups" value="android,androidx,com,java,javax,org"/>
             <property name="ordered" value="true"/>
             <property name="separated" value="true"/>
             <property name="option" value="bottom"/>
diff --git a/stripe/build.gradle b/stripe/build.gradle
index 3d89a355b1c..59a507d8efa 100644
--- a/stripe/build.gradle
+++ b/stripe/build.gradle
@@ -14,18 +14,18 @@ configurations {
 }
 
 dependencies {
-    implementation "com.android.support:support-annotations:28.0.0"
-    implementation "com.android.support:appcompat-v7:28.0.0"
-    implementation "com.android.support:recyclerview-v7:28.0.0"
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
     // Api for this import because we use reflection to alter TextInputLayout
-    api "com.android.support:design:28.0.0"
+    api 'com.google.android.material:material:1.0.0'
 
     implementation "com.stripe:stripe-3ds2-android:1.2.2"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
-    javadocDeps "com.android.support:support-annotations:28.0.0"
-    javadocDeps "com.android.support:appcompat-v7:28.0.0"
-    javadocDeps "com.android.support:design:28.0.0"
+    javadocDeps 'androidx.annotation:annotation:1.1.0'
+    javadocDeps 'androidx.appcompat:appcompat:1.0.2'
+    javadocDeps 'com.google.android.material:material:1.0.0'
     compileOnly "javax.annotation:jsr250-api:${rootProject.ext.javaAnnotationVersion}"
 
     testImplementation 'junit:junit:4.13-beta-3'
@@ -34,8 +34,8 @@ dependencies {
     testImplementation 'androidx.test:core:1.2.0'
     testImplementation 'org.json:json:20190722'
 
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestUtil 'androidx.test:orchestrator:1.2.0'
 
diff --git a/stripe/res/layout/activity_payment_methods.xml b/stripe/res/layout/activity_payment_methods.xml
index 4874e6c2f2b..a0d4c287e03 100644
--- a/stripe/res/layout/activity_payment_methods.xml
+++ b/stripe/res/layout/activity_payment_methods.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     >
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/payment_methods_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -26,7 +26,7 @@
         android:visibility="gone"
         />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/payment_methods_recycler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/stripe/res/layout/activity_shipping_flow.xml b/stripe/res/layout/activity_shipping_flow.xml
index c7867251a01..ede93870685 100644
--- a/stripe/res/layout/activity_shipping_flow.xml
+++ b/stripe/res/layout/activity_shipping_flow.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     >
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/shipping_flow_viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/stripe/res/layout/activity_stripe.xml b/stripe/res/layout/activity_stripe.xml
index 0765621ea0c..bc9badf33e8 100644
--- a/stripe/res/layout/activity_stripe.xml
+++ b/stripe/res/layout/activity_stripe.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     >
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar_as"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
diff --git a/stripe/res/layout/add_address_widget.xml b/stripe/res/layout/add_address_widget.xml
index eee7e36c849..912cd518625 100644
--- a/stripe/res/layout/add_address_widget.xml
+++ b/stripe/res/layout/add_address_widget.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tl_name_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -22,9 +22,9 @@
             android:layout_height="wrap_content"
             android:inputType="text"
             />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tl_address_line1_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -37,9 +37,9 @@
             android:layout_height="wrap_content"
             android:inputType="text"
             />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tl_address_line2_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -52,9 +52,9 @@
             android:layout_height="wrap_content"
             android:inputType="text"
             />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tl_city_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -67,10 +67,10 @@
             android:layout_height="wrap_content"
             android:inputType="text"
             />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tl_state_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -83,9 +83,9 @@
             android:layout_height="wrap_content"
             android:inputType="text"
             />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tl_postal_code_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -97,9 +97,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tl_phone_number_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -112,6 +112,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
 </merge>
diff --git a/stripe/res/layout/add_payment_method_card_row.xml b/stripe/res/layout/add_payment_method_card_row.xml
index 972a4297829..cc5b106b156 100644
--- a/stripe/res/layout/add_payment_method_card_row.xml
+++ b/stripe/res/layout/add_payment_method_card_row.xml
@@ -13,7 +13,7 @@
     android:background="@drawable/simple_button_background"
     android:orientation="horizontal">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
         android:layout_height="@dimen/masked_card_icon_width"
         android:src="@drawable/ic_add_black_32dp"
@@ -23,7 +23,7 @@
         android:layout_gravity="center_vertical|start"
         />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
diff --git a/stripe/res/layout/add_payment_method_fpx_layout.xml b/stripe/res/layout/add_payment_method_fpx_layout.xml
index 7f9ca10cc08..fecc806745d 100644
--- a/stripe/res/layout/add_payment_method_fpx_layout.xml
+++ b/stripe/res/layout/add_payment_method_fpx_layout.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/fpx_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/stripe/res/layout/add_payment_method_fpx_row.xml b/stripe/res/layout/add_payment_method_fpx_row.xml
index c485fa16902..b825a384290 100644
--- a/stripe/res/layout/add_payment_method_fpx_row.xml
+++ b/stripe/res/layout/add_payment_method_fpx_row.xml
@@ -13,7 +13,7 @@
     android:background="@drawable/simple_button_background"
     android:orientation="horizontal">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
         android:layout_height="@dimen/masked_card_icon_width"
         android:src="@drawable/ic_add_black_32dp"
@@ -23,7 +23,7 @@
         android:layout_gravity="center_vertical|start"
         />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
diff --git a/stripe/res/layout/card_multiline_widget.xml b/stripe/res/layout/card_multiline_widget.xml
index 9f77212aeab..d543e76f093 100644
--- a/stripe/res/layout/card_multiline_widget.xml
+++ b/stripe/res/layout/card_multiline_widget.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal"
         >
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/tl_add_source_expiry_ml"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -55,9 +55,9 @@
                 android:nextFocusForward="@+id/et_add_source_cvc_ml"
                 />
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/tl_add_source_cvc_ml"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -76,9 +76,9 @@
                 android:nextFocusForward="@+id/et_add_source_postal_ml"
                 />
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/tl_add_source_postal_ml"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -98,6 +98,6 @@
                 android:maxLength="5"
                 />
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
 </merge>
diff --git a/stripe/res/layout/country_autocomplete_textview.xml b/stripe/res/layout/country_autocomplete_textview.xml
index b7482157b1f..bf104d86fe3 100644
--- a/stripe/res/layout/country_autocomplete_textview.xml
+++ b/stripe/res/layout/country_autocomplete_textview.xml
@@ -4,7 +4,7 @@
        android:layout_height="wrap_content"
     >
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tl_country_cat"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -16,5 +16,5 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 </merge>
diff --git a/stripe/res/layout/fpx_bank.xml b/stripe/res/layout/fpx_bank.xml
index 438002bad6d..b92f7ad6ec0 100644
--- a/stripe/res/layout/fpx_bank.xml
+++ b/stripe/res/layout/fpx_bank.xml
@@ -7,14 +7,14 @@
     android:paddingStart="16dp"
     android:paddingEnd="12dp">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="@dimen/masked_card_icon_width"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|start"
         android:src="@drawable/ic_bank_generic" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/name"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|start"
@@ -23,7 +23,7 @@
         android:layout_marginStart="8dp"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" />
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/check_icon"
         android:layout_width="@dimen/masked_card_icon_width"
         android:layout_height="wrap_content"
diff --git a/stripe/res/layout/masked_card_view.xml b/stripe/res/layout/masked_card_view.xml
index 39461bd59c7..e0f35fdd34f 100644
--- a/stripe/res/layout/masked_card_view.xml
+++ b/stripe/res/layout/masked_card_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/masked_icon_view"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/masked_card_icon_width"
@@ -9,7 +9,7 @@
         android:layout_gravity="center_vertical|start"
         />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/masked_card_info_view"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -19,7 +19,7 @@
         android:layout_gravity="center_vertical|start"
         />
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/masked_check_icon"
         android:layout_width="@dimen/masked_card_icon_width"
         android:layout_height="wrap_content"
diff --git a/stripe/res/layout/payment_auth_web_view_layout.xml b/stripe/res/layout/payment_auth_web_view_layout.xml
index d373c7e2fb9..baa7718e6de 100644
--- a/stripe/res/layout/payment_auth_web_view_layout.xml
+++ b/stripe/res/layout/payment_auth_web_view_layout.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/payment_auth_web_view_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
diff --git a/stripe/res/layout/select_shipping_method_widget.xml b/stripe/res/layout/select_shipping_method_widget.xml
index a925352e17f..7a24c443499 100644
--- a/stripe/res/layout/select_shipping_method_widget.xml
+++ b/stripe/res/layout/select_shipping_method_widget.xml
@@ -4,7 +4,7 @@
        android:layout_height="match_parent"
     >
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_shipping_methods_ssmw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/stripe/res/layout/shipping_method_view.xml b/stripe/res/layout/shipping_method_view.xml
index a836dfa26ed..2072ef9d89a 100644
--- a/stripe/res/layout/shipping_method_view.xml
+++ b/stripe/res/layout/shipping_method_view.xml
@@ -40,7 +40,7 @@
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
         />
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_selected_icon"
         android:layout_width="@dimen/shipping_check_icon_width"
         android:layout_height="wrap_content"
diff --git a/stripe/src/androidTest/java/com/stripe/android/AddPaymentMethodActivityTest.kt b/stripe/src/androidTest/java/com/stripe/android/AddPaymentMethodActivityTest.kt
index 53c0bde30f0..dbb266eccc2 100644
--- a/stripe/src/androidTest/java/com/stripe/android/AddPaymentMethodActivityTest.kt
+++ b/stripe/src/androidTest/java/com/stripe/android/AddPaymentMethodActivityTest.kt
@@ -1,11 +1,11 @@
 package com.stripe.android
 
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withText
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
 import com.stripe.android.view.AddPaymentMethodActivity
 import org.junit.Rule
 import org.junit.Test
diff --git a/stripe/src/main/java/com/stripe/android/ActivitySourceCallback.java b/stripe/src/main/java/com/stripe/android/ActivitySourceCallback.java
index 1709158fd04..9ef69c90e0d 100644
--- a/stripe/src/main/java/com/stripe/android/ActivitySourceCallback.java
+++ b/stripe/src/main/java/com/stripe/android/ActivitySourceCallback.java
@@ -1,8 +1,9 @@
 package com.stripe.android;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.model.Source;
 
diff --git a/stripe/src/main/java/com/stripe/android/AnalyticsDataFactory.kt b/stripe/src/main/java/com/stripe/android/AnalyticsDataFactory.kt
index a85c3cf6a89..b5c2727aca2 100644
--- a/stripe/src/main/java/com/stripe/android/AnalyticsDataFactory.kt
+++ b/stripe/src/main/java/com/stripe/android/AnalyticsDataFactory.kt
@@ -3,8 +3,8 @@ package com.stripe.android
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
-import android.support.annotation.StringDef
-import android.support.annotation.VisibleForTesting
+import androidx.annotation.StringDef
+import androidx.annotation.VisibleForTesting
 import com.stripe.android.model.Source
 import com.stripe.android.model.Token
 import com.stripe.android.stripe3ds2.transaction.ProtocolErrorEvent
diff --git a/stripe/src/main/java/com/stripe/android/ApiOperation.java b/stripe/src/main/java/com/stripe/android/ApiOperation.java
index 20d62d66514..bfa1825739b 100644
--- a/stripe/src/main/java/com/stripe/android/ApiOperation.java
+++ b/stripe/src/main/java/com/stripe/android/ApiOperation.java
@@ -1,8 +1,9 @@
 package com.stripe.android;
 
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.exception.StripeException;
 
diff --git a/stripe/src/main/java/com/stripe/android/ApiRequest.java b/stripe/src/main/java/com/stripe/android/ApiRequest.java
index 7d087c5bbbc..a2c9944b5ea 100644
--- a/stripe/src/main/java/com/stripe/android/ApiRequest.java
+++ b/stripe/src/main/java/com/stripe/android/ApiRequest.java
@@ -1,19 +1,20 @@
 package com.stripe.android;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.exception.InvalidRequestException;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONObject;
-
 import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
+import org.json.JSONObject;
+
 /**
  * A class representing a Stripe API or Analytics request.
  */
diff --git a/stripe/src/main/java/com/stripe/android/ApiResultCallback.java b/stripe/src/main/java/com/stripe/android/ApiResultCallback.java
index 267bd1c5c10..921eee2d050 100644
--- a/stripe/src/main/java/com/stripe/android/ApiResultCallback.java
+++ b/stripe/src/main/java/com/stripe/android/ApiResultCallback.java
@@ -1,6 +1,6 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Generic interface for an API operation callback that either returns a
diff --git a/stripe/src/main/java/com/stripe/android/AppInfo.java b/stripe/src/main/java/com/stripe/android/AppInfo.java
index 6e3b1faf4e6..bf09be1db7d 100644
--- a/stripe/src/main/java/com/stripe/android/AppInfo.java
+++ b/stripe/src/main/java/com/stripe/android/AppInfo.java
@@ -1,17 +1,17 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONObject;
-
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
+import org.json.JSONObject;
+
 /**
  * Data for identifying your plug-in or library.
  *
diff --git a/stripe/src/main/java/com/stripe/android/CardUtils.java b/stripe/src/main/java/com/stripe/android/CardUtils.java
index 5200346a141..c0a39e20c02 100644
--- a/stripe/src/main/java/com/stripe/android/CardUtils.java
+++ b/stripe/src/main/java/com/stripe/android/CardUtils.java
@@ -1,7 +1,7 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.model.Card;
 
diff --git a/stripe/src/main/java/com/stripe/android/CustomerSession.java b/stripe/src/main/java/com/stripe/android/CustomerSession.java
index ae65c3bf838..ceb23aea7f6 100644
--- a/stripe/src/main/java/com/stripe/android/CustomerSession.java
+++ b/stripe/src/main/java/com/stripe/android/CustomerSession.java
@@ -7,12 +7,13 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.content.LocalBroadcastManager;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.VisibleForTesting;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.stripe.android.exception.StripeException;
 import com.stripe.android.model.Customer;
diff --git a/stripe/src/main/java/com/stripe/android/EphemeralKey.java b/stripe/src/main/java/com/stripe/android/EphemeralKey.java
index 403e87d7d28..dd69be51772 100644
--- a/stripe/src/main/java/com/stripe/android/EphemeralKey.java
+++ b/stripe/src/main/java/com/stripe/android/EphemeralKey.java
@@ -2,18 +2,19 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.model.StripeModel;
 import com.stripe.android.utils.ObjectUtils;
 
+import java.util.Objects;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.Objects;
-
 /**
  * Represents an Ephemeral Key that can be used temporarily for API operations that typically
  * require a secret key.
diff --git a/stripe/src/main/java/com/stripe/android/EphemeralKeyManager.java b/stripe/src/main/java/com/stripe/android/EphemeralKeyManager.java
index a2b5cc4bc87..9678f1766ec 100644
--- a/stripe/src/main/java/com/stripe/android/EphemeralKeyManager.java
+++ b/stripe/src/main/java/com/stripe/android/EphemeralKeyManager.java
@@ -1,16 +1,16 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import org.json.JSONException;
-import org.json.JSONObject;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.net.HttpURLConnection;
 import java.util.Calendar;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 class EphemeralKeyManager<TEphemeralKey extends EphemeralKey> {
 
     @NonNull private final EphemeralKeyProvider mEphemeralKeyProvider;
diff --git a/stripe/src/main/java/com/stripe/android/EphemeralKeyProvider.java b/stripe/src/main/java/com/stripe/android/EphemeralKeyProvider.java
index 70e1a6dbb2b..86407e23dc9 100644
--- a/stripe/src/main/java/com/stripe/android/EphemeralKeyProvider.java
+++ b/stripe/src/main/java/com/stripe/android/EphemeralKeyProvider.java
@@ -1,7 +1,7 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Size;
+import androidx.annotation.NonNull;
+import androidx.annotation.Size;
 
 /**
  * Represents an object that can call to a server and create
diff --git a/stripe/src/main/java/com/stripe/android/EphemeralKeyUpdateListener.java b/stripe/src/main/java/com/stripe/android/EphemeralKeyUpdateListener.java
index 36a7c671166..2ace1c37cdd 100644
--- a/stripe/src/main/java/com/stripe/android/EphemeralKeyUpdateListener.java
+++ b/stripe/src/main/java/com/stripe/android/EphemeralKeyUpdateListener.java
@@ -1,6 +1,6 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Represents a listener for Ephemeral Key Update events.
diff --git a/stripe/src/main/java/com/stripe/android/ErrorParser.kt b/stripe/src/main/java/com/stripe/android/ErrorParser.kt
index 9bc12c22400..df5f1f087b7 100644
--- a/stripe/src/main/java/com/stripe/android/ErrorParser.kt
+++ b/stripe/src/main/java/com/stripe/android/ErrorParser.kt
@@ -1,6 +1,6 @@
 package com.stripe.android
 
-import android.support.annotation.VisibleForTesting
+import androidx.annotation.VisibleForTesting
 import org.json.JSONException
 import org.json.JSONObject
 
diff --git a/stripe/src/main/java/com/stripe/android/FingerprintRequest.java b/stripe/src/main/java/com/stripe/android/FingerprintRequest.java
index 336e216db03..74577d07ab1 100644
--- a/stripe/src/main/java/com/stripe/android/FingerprintRequest.java
+++ b/stripe/src/main/java/com/stripe/android/FingerprintRequest.java
@@ -1,20 +1,20 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.exception.InvalidRequestException;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  * A class representing a fingerprint request.
  */
diff --git a/stripe/src/main/java/com/stripe/android/FingerprintRequestFactory.kt b/stripe/src/main/java/com/stripe/android/FingerprintRequestFactory.kt
index 96e0c66132a..f37c5790fba 100644
--- a/stripe/src/main/java/com/stripe/android/FingerprintRequestFactory.kt
+++ b/stripe/src/main/java/com/stripe/android/FingerprintRequestFactory.kt
@@ -1,7 +1,7 @@
 package com.stripe.android
 
 import android.content.Context
-import android.support.annotation.VisibleForTesting
+import androidx.annotation.VisibleForTesting
 
 internal class FingerprintRequestFactory @VisibleForTesting constructor(
     private val telemetryClientUtil: TelemetryClientUtil
diff --git a/stripe/src/main/java/com/stripe/android/GooglePayConfig.java b/stripe/src/main/java/com/stripe/android/GooglePayConfig.java
index d1764051c98..922cd64ca06 100644
--- a/stripe/src/main/java/com/stripe/android/GooglePayConfig.java
+++ b/stripe/src/main/java/com/stripe/android/GooglePayConfig.java
@@ -1,7 +1,8 @@
 package com.stripe.android;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/stripe/src/main/java/com/stripe/android/IssuingCardPinService.java b/stripe/src/main/java/com/stripe/android/IssuingCardPinService.java
index 3b58be08c2a..a7912c88de1 100644
--- a/stripe/src/main/java/com/stripe/android/IssuingCardPinService.java
+++ b/stripe/src/main/java/com/stripe/android/IssuingCardPinService.java
@@ -1,23 +1,24 @@
 package com.stripe.android;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 import com.stripe.android.exception.APIConnectionException;
 import com.stripe.android.exception.APIException;
 import com.stripe.android.exception.AuthenticationException;
 import com.stripe.android.exception.CardException;
 import com.stripe.android.exception.InvalidRequestException;
 
-import org.json.JSONException;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
+import org.json.JSONException;
+
 /**
  * Methods for retrieval / update of a Stripe Issuing card
  */
diff --git a/stripe/src/main/java/com/stripe/android/PayWithGoogleUtils.java b/stripe/src/main/java/com/stripe/android/PayWithGoogleUtils.java
index 74eb3ad2810..a5fcb16e845 100644
--- a/stripe/src/main/java/com/stripe/android/PayWithGoogleUtils.java
+++ b/stripe/src/main/java/com/stripe/android/PayWithGoogleUtils.java
@@ -1,6 +1,6 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
diff --git a/stripe/src/main/java/com/stripe/android/PaymentAuthConfig.java b/stripe/src/main/java/com/stripe/android/PaymentAuthConfig.java
index e381b8b66f6..3333728b20a 100644
--- a/stripe/src/main/java/com/stripe/android/PaymentAuthConfig.java
+++ b/stripe/src/main/java/com/stripe/android/PaymentAuthConfig.java
@@ -1,10 +1,11 @@
 package com.stripe.android;
 
 import android.app.Activity;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.stripe.android.stripe3ds2.init.ui.ButtonCustomization;
 import com.stripe.android.stripe3ds2.init.ui.LabelCustomization;
diff --git a/stripe/src/main/java/com/stripe/android/PaymentConfiguration.java b/stripe/src/main/java/com/stripe/android/PaymentConfiguration.java
index a01aadd381a..0166f12275a 100644
--- a/stripe/src/main/java/com/stripe/android/PaymentConfiguration.java
+++ b/stripe/src/main/java/com/stripe/android/PaymentConfiguration.java
@@ -4,9 +4,10 @@
 import android.content.SharedPreferences;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.stripe.android.utils.ObjectUtils;
 
diff --git a/stripe/src/main/java/com/stripe/android/PaymentController.kt b/stripe/src/main/java/com/stripe/android/PaymentController.kt
index d4e4768c227..e5724107c2b 100644
--- a/stripe/src/main/java/com/stripe/android/PaymentController.kt
+++ b/stripe/src/main/java/com/stripe/android/PaymentController.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Handler
 import android.os.HandlerThread
-import android.support.annotation.VisibleForTesting
+import androidx.annotation.VisibleForTesting
 import com.stripe.android.exception.StripeException
 import com.stripe.android.model.ConfirmPaymentIntentParams
 import com.stripe.android.model.ConfirmSetupIntentParams
diff --git a/stripe/src/main/java/com/stripe/android/PaymentIntentResult.java b/stripe/src/main/java/com/stripe/android/PaymentIntentResult.java
index 4580f4d5580..3a0b5f5d4a4 100644
--- a/stripe/src/main/java/com/stripe/android/PaymentIntentResult.java
+++ b/stripe/src/main/java/com/stripe/android/PaymentIntentResult.java
@@ -1,6 +1,6 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stripe.android.model.PaymentIntent;
 
diff --git a/stripe/src/main/java/com/stripe/android/PaymentSession.java b/stripe/src/main/java/com/stripe/android/PaymentSession.java
index 03082a0db38..cedf692b1a4 100644
--- a/stripe/src/main/java/com/stripe/android/PaymentSession.java
+++ b/stripe/src/main/java/com/stripe/android/PaymentSession.java
@@ -4,11 +4,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.app.Fragment;
+
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
 
 import com.stripe.android.model.Customer;
 import com.stripe.android.model.PaymentMethod;
diff --git a/stripe/src/main/java/com/stripe/android/PaymentSessionConfig.java b/stripe/src/main/java/com/stripe/android/PaymentSessionConfig.java
index 9992761b87f..f495d2f771c 100644
--- a/stripe/src/main/java/com/stripe/android/PaymentSessionConfig.java
+++ b/stripe/src/main/java/com/stripe/android/PaymentSessionConfig.java
@@ -2,8 +2,9 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.model.ShippingInformation;
 import com.stripe.android.utils.ObjectUtils;
diff --git a/stripe/src/main/java/com/stripe/android/PaymentSessionData.java b/stripe/src/main/java/com/stripe/android/PaymentSessionData.java
index 40d059114ff..349b4555a36 100644
--- a/stripe/src/main/java/com/stripe/android/PaymentSessionData.java
+++ b/stripe/src/main/java/com/stripe/android/PaymentSessionData.java
@@ -2,8 +2,9 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.model.PaymentMethod;
 import com.stripe.android.model.ShippingInformation;
diff --git a/stripe/src/main/java/com/stripe/android/SetupIntentResult.java b/stripe/src/main/java/com/stripe/android/SetupIntentResult.java
index bf7cca0afbb..60b86d18a31 100644
--- a/stripe/src/main/java/com/stripe/android/SetupIntentResult.java
+++ b/stripe/src/main/java/com/stripe/android/SetupIntentResult.java
@@ -1,6 +1,6 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stripe.android.model.SetupIntent;
 
diff --git a/stripe/src/main/java/com/stripe/android/Stripe.java b/stripe/src/main/java/com/stripe/android/Stripe.java
index 4f7afdeb972..73801ef40b6 100644
--- a/stripe/src/main/java/com/stripe/android/Stripe.java
+++ b/stripe/src/main/java/com/stripe/android/Stripe.java
@@ -4,11 +4,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Size;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.app.Fragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
 
 import com.stripe.android.exception.APIConnectionException;
 import com.stripe.android.exception.APIException;
diff --git a/stripe/src/main/java/com/stripe/android/Stripe3ds2CompletionStarter.kt b/stripe/src/main/java/com/stripe/android/Stripe3ds2CompletionStarter.kt
index bcd0cb9289b..3e0357d3b04 100644
--- a/stripe/src/main/java/com/stripe/android/Stripe3ds2CompletionStarter.kt
+++ b/stripe/src/main/java/com/stripe/android/Stripe3ds2CompletionStarter.kt
@@ -1,7 +1,7 @@
 package com.stripe.android
 
 import android.os.Bundle
-import android.support.annotation.IntDef
+import androidx.annotation.IntDef
 import com.stripe.android.model.StripeIntent
 import com.stripe.android.view.AuthActivityStarter
 import com.stripe.android.view.PaymentRelayActivity
diff --git a/stripe/src/main/java/com/stripe/android/StripeApiRepository.kt b/stripe/src/main/java/com/stripe/android/StripeApiRepository.kt
index 56491c5c8b0..9acbbc33ca3 100644
--- a/stripe/src/main/java/com/stripe/android/StripeApiRepository.kt
+++ b/stripe/src/main/java/com/stripe/android/StripeApiRepository.kt
@@ -1,8 +1,8 @@
 package com.stripe.android
 
 import android.content.Context
-import android.support.annotation.VisibleForTesting
 import android.util.Pair
+import androidx.annotation.VisibleForTesting
 import com.stripe.android.exception.APIConnectionException
 import com.stripe.android.exception.APIException
 import com.stripe.android.exception.AuthenticationException
@@ -34,7 +34,7 @@ import org.json.JSONObject
 /**
  * An implementation of [StripeRepository] that makes network requests to the Stripe API.
  */
-internal class StripeApiRepository @VisibleForTesting @JvmOverloads constructor(
+internal class StripeApiRepository @JvmOverloads constructor(
     context: Context,
     private val appInfo: AppInfo? = null,
     private val stripeApiRequestExecutor: ApiRequestExecutor = StripeApiRequestExecutor(),
diff --git a/stripe/src/main/java/com/stripe/android/StripeError.java b/stripe/src/main/java/com/stripe/android/StripeError.java
index a50d9ae2a32..4d84cf9f95d 100644
--- a/stripe/src/main/java/com/stripe/android/StripeError.java
+++ b/stripe/src/main/java/com/stripe/android/StripeError.java
@@ -1,6 +1,6 @@
 package com.stripe.android;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.Serializable;
 
diff --git a/stripe/src/main/java/com/stripe/android/StripeFireAndForgetRequestExecutor.kt b/stripe/src/main/java/com/stripe/android/StripeFireAndForgetRequestExecutor.kt
index 6ce986699fc..f4a72edda07 100644
--- a/stripe/src/main/java/com/stripe/android/StripeFireAndForgetRequestExecutor.kt
+++ b/stripe/src/main/java/com/stripe/android/StripeFireAndForgetRequestExecutor.kt
@@ -2,7 +2,7 @@ package com.stripe.android
 
 import android.os.Handler
 import android.os.HandlerThread
-import android.support.annotation.VisibleForTesting
+import androidx.annotation.VisibleForTesting
 import com.stripe.android.exception.APIConnectionException
 import com.stripe.android.exception.InvalidRequestException
 import java.io.Closeable
diff --git a/stripe/src/main/java/com/stripe/android/StripeIntentResult.java b/stripe/src/main/java/com/stripe/android/StripeIntentResult.java
index 607cb29b72d..508a760341e 100644
--- a/stripe/src/main/java/com/stripe/android/StripeIntentResult.java
+++ b/stripe/src/main/java/com/stripe/android/StripeIntentResult.java
@@ -1,9 +1,10 @@
 package com.stripe.android;
 
 import android.app.Activity;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.model.ConfirmPaymentIntentParams;
 import com.stripe.android.model.StripeIntent;
diff --git a/stripe/src/main/java/com/stripe/android/StripeNetworkUtils.java b/stripe/src/main/java/com/stripe/android/StripeNetworkUtils.java
index 9eb0322085f..c926b55d8ca 100644
--- a/stripe/src/main/java/com/stripe/android/StripeNetworkUtils.java
+++ b/stripe/src/main/java/com/stripe/android/StripeNetworkUtils.java
@@ -1,8 +1,9 @@
 package com.stripe.android;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 
 import com.stripe.android.model.Card;
 import com.stripe.android.model.ConfirmPaymentIntentParams;
diff --git a/stripe/src/main/java/com/stripe/android/StripeRequest.java b/stripe/src/main/java/com/stripe/android/StripeRequest.java
index e4cf850dbe7..40a87402236 100644
--- a/stripe/src/main/java/com/stripe/android/StripeRequest.java
+++ b/stripe/src/main/java/com/stripe/android/StripeRequest.java
@@ -1,7 +1,7 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.exception.InvalidRequestException;
 import com.stripe.android.utils.ObjectUtils;
diff --git a/stripe/src/main/java/com/stripe/android/StripeTextUtils.java b/stripe/src/main/java/com/stripe/android/StripeTextUtils.java
index 90f744fff97..ae55dbb3489 100644
--- a/stripe/src/main/java/com/stripe/android/StripeTextUtils.java
+++ b/stripe/src/main/java/com/stripe/android/StripeTextUtils.java
@@ -1,7 +1,7 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
diff --git a/stripe/src/main/java/com/stripe/android/TelemetryClientUtil.kt b/stripe/src/main/java/com/stripe/android/TelemetryClientUtil.kt
index 449396d74bb..332e4f2dd8a 100644
--- a/stripe/src/main/java/com/stripe/android/TelemetryClientUtil.kt
+++ b/stripe/src/main/java/com/stripe/android/TelemetryClientUtil.kt
@@ -3,8 +3,8 @@ package com.stripe.android
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
-import android.support.annotation.VisibleForTesting
 import android.util.DisplayMetrics
+import androidx.annotation.VisibleForTesting
 import java.math.BigDecimal
 import java.math.MathContext
 import java.util.Locale
diff --git a/stripe/src/main/java/com/stripe/android/exception/APIConnectionException.java b/stripe/src/main/java/com/stripe/android/exception/APIConnectionException.java
index a560c04af2d..6030ee556df 100644
--- a/stripe/src/main/java/com/stripe/android/exception/APIConnectionException.java
+++ b/stripe/src/main/java/com/stripe/android/exception/APIConnectionException.java
@@ -1,7 +1,7 @@
 package com.stripe.android.exception;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Locale;
 
diff --git a/stripe/src/main/java/com/stripe/android/exception/APIException.java b/stripe/src/main/java/com/stripe/android/exception/APIException.java
index eb614948dfd..c9f666efbab 100644
--- a/stripe/src/main/java/com/stripe/android/exception/APIException.java
+++ b/stripe/src/main/java/com/stripe/android/exception/APIException.java
@@ -1,6 +1,6 @@
 package com.stripe.android.exception;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.StripeError;
 
diff --git a/stripe/src/main/java/com/stripe/android/exception/AuthenticationException.java b/stripe/src/main/java/com/stripe/android/exception/AuthenticationException.java
index 5c11b20862d..0feab6ac6d5 100644
--- a/stripe/src/main/java/com/stripe/android/exception/AuthenticationException.java
+++ b/stripe/src/main/java/com/stripe/android/exception/AuthenticationException.java
@@ -1,6 +1,6 @@
 package com.stripe.android.exception;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.StripeError;
 
diff --git a/stripe/src/main/java/com/stripe/android/exception/CardException.java b/stripe/src/main/java/com/stripe/android/exception/CardException.java
index 9c616c72106..7778a8dc601 100644
--- a/stripe/src/main/java/com/stripe/android/exception/CardException.java
+++ b/stripe/src/main/java/com/stripe/android/exception/CardException.java
@@ -1,7 +1,7 @@
 package com.stripe.android.exception;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.StripeError;
 
diff --git a/stripe/src/main/java/com/stripe/android/exception/InvalidRequestException.java b/stripe/src/main/java/com/stripe/android/exception/InvalidRequestException.java
index 19becc1b308..1ef2462b68b 100644
--- a/stripe/src/main/java/com/stripe/android/exception/InvalidRequestException.java
+++ b/stripe/src/main/java/com/stripe/android/exception/InvalidRequestException.java
@@ -1,7 +1,7 @@
 package com.stripe.android.exception;
 
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.StripeError;
 
diff --git a/stripe/src/main/java/com/stripe/android/exception/PermissionException.java b/stripe/src/main/java/com/stripe/android/exception/PermissionException.java
index ad4611332fa..a492b2a4dd1 100644
--- a/stripe/src/main/java/com/stripe/android/exception/PermissionException.java
+++ b/stripe/src/main/java/com/stripe/android/exception/PermissionException.java
@@ -1,6 +1,6 @@
 package com.stripe.android.exception;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.StripeError;
 
diff --git a/stripe/src/main/java/com/stripe/android/exception/RateLimitException.java b/stripe/src/main/java/com/stripe/android/exception/RateLimitException.java
index b01fcb3d767..14e26dcc1e4 100644
--- a/stripe/src/main/java/com/stripe/android/exception/RateLimitException.java
+++ b/stripe/src/main/java/com/stripe/android/exception/RateLimitException.java
@@ -1,6 +1,6 @@
 package com.stripe.android.exception;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.StripeError;
 
diff --git a/stripe/src/main/java/com/stripe/android/exception/StripeException.java b/stripe/src/main/java/com/stripe/android/exception/StripeException.java
index 9e0dda9da1b..c9215f033e0 100644
--- a/stripe/src/main/java/com/stripe/android/exception/StripeException.java
+++ b/stripe/src/main/java/com/stripe/android/exception/StripeException.java
@@ -1,7 +1,7 @@
 package com.stripe.android.exception;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.StripeError;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/AccountParams.java b/stripe/src/main/java/com/stripe/android/model/AccountParams.java
index 442412ca05e..cdbf3d7b3ef 100644
--- a/stripe/src/main/java/com/stripe/android/model/AccountParams.java
+++ b/stripe/src/main/java/com/stripe/android/model/AccountParams.java
@@ -1,7 +1,7 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.utils.ObjectUtils;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/Address.java b/stripe/src/main/java/com/stripe/android/model/Address.java
index b5330d49378..91f6e470195 100644
--- a/stripe/src/main/java/com/stripe/android/model/Address.java
+++ b/stripe/src/main/java/com/stripe/android/model/Address.java
@@ -2,22 +2,23 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import static com.stripe.android.model.StripeJsonUtils.optString;
 
 /**
diff --git a/stripe/src/main/java/com/stripe/android/model/BankAccount.java b/stripe/src/main/java/com/stripe/android/model/BankAccount.java
index 6c9d388eeef..a0a8e2b2e5f 100644
--- a/stripe/src/main/java/com/stripe/android/model/BankAccount.java
+++ b/stripe/src/main/java/com/stripe/android/model/BankAccount.java
@@ -1,22 +1,22 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Size;
-import android.support.annotation.StringDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
+import androidx.annotation.StringDef;
 
 import com.stripe.android.StripeTextUtils;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  * Model class representing a bank account that can be used to create a token
  * via the protocol outlined in
diff --git a/stripe/src/main/java/com/stripe/android/model/Card.java b/stripe/src/main/java/com/stripe/android/model/Card.java
index 2b4ef289d3b..7057d5c218d 100644
--- a/stripe/src/main/java/com/stripe/android/model/Card.java
+++ b/stripe/src/main/java/com/stripe/android/model/Card.java
@@ -1,11 +1,11 @@
 package com.stripe.android.model;
 
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Size;
-import android.support.annotation.StringDef;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
+import androidx.annotation.StringDef;
 
 import com.stripe.android.CardUtils;
 import com.stripe.android.ObjectBuilder;
@@ -13,9 +13,6 @@
 import com.stripe.android.StripeTextUtils;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -24,6 +21,9 @@
 import java.util.List;
 import java.util.Map;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import static com.stripe.android.model.StripeJsonUtils.optCountryCode;
 import static com.stripe.android.model.StripeJsonUtils.optCurrency;
 import static com.stripe.android.model.StripeJsonUtils.optHash;
diff --git a/stripe/src/main/java/com/stripe/android/model/ConfirmPaymentIntentParams.java b/stripe/src/main/java/com/stripe/android/model/ConfirmPaymentIntentParams.java
index 428a9361a5a..bbc66293ca1 100644
--- a/stripe/src/main/java/com/stripe/android/model/ConfirmPaymentIntentParams.java
+++ b/stripe/src/main/java/com/stripe/android/model/ConfirmPaymentIntentParams.java
@@ -1,8 +1,8 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.utils.ObjectUtils;
diff --git a/stripe/src/main/java/com/stripe/android/model/ConfirmSetupIntentParams.java b/stripe/src/main/java/com/stripe/android/model/ConfirmSetupIntentParams.java
index e3c71b8d085..6fe7f67d123 100644
--- a/stripe/src/main/java/com/stripe/android/model/ConfirmSetupIntentParams.java
+++ b/stripe/src/main/java/com/stripe/android/model/ConfirmSetupIntentParams.java
@@ -1,8 +1,8 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.utils.ObjectUtils;
diff --git a/stripe/src/main/java/com/stripe/android/model/ConfirmStripeIntentParams.java b/stripe/src/main/java/com/stripe/android/model/ConfirmStripeIntentParams.java
index cc0754add8a..10363646fef 100644
--- a/stripe/src/main/java/com/stripe/android/model/ConfirmStripeIntentParams.java
+++ b/stripe/src/main/java/com/stripe/android/model/ConfirmStripeIntentParams.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public interface ConfirmStripeIntentParams extends StripeParamsModel {
 
diff --git a/stripe/src/main/java/com/stripe/android/model/Customer.java b/stripe/src/main/java/com/stripe/android/model/Customer.java
index 95ca36bd8ff..74131919d79 100644
--- a/stripe/src/main/java/com/stripe/android/model/Customer.java
+++ b/stripe/src/main/java/com/stripe/android/model/Customer.java
@@ -1,17 +1,17 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.utils.ObjectUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import static com.stripe.android.model.StripeJsonUtils.optBoolean;
 import static com.stripe.android.model.StripeJsonUtils.optInteger;
 import static com.stripe.android.model.StripeJsonUtils.optString;
diff --git a/stripe/src/main/java/com/stripe/android/model/CustomerSource.java b/stripe/src/main/java/com/stripe/android/model/CustomerSource.java
index 8256940d09c..67046254b9e 100644
--- a/stripe/src/main/java/com/stripe/android/model/CustomerSource.java
+++ b/stripe/src/main/java/com/stripe/android/model/CustomerSource.java
@@ -1,7 +1,7 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.utils.ObjectUtils;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/CvcTokenParams.java b/stripe/src/main/java/com/stripe/android/model/CvcTokenParams.java
index 068c2251340..fb595d65385 100644
--- a/stripe/src/main/java/com/stripe/android/model/CvcTokenParams.java
+++ b/stripe/src/main/java/com/stripe/android/model/CvcTokenParams.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/stripe/src/main/java/com/stripe/android/model/ModelUtils.java b/stripe/src/main/java/com/stripe/android/model/ModelUtils.java
index 97c1716488c..8ce2f86a13f 100644
--- a/stripe/src/main/java/com/stripe/android/model/ModelUtils.java
+++ b/stripe/src/main/java/com/stripe/android/model/ModelUtils.java
@@ -1,7 +1,7 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Calendar;
 import java.util.Locale;
diff --git a/stripe/src/main/java/com/stripe/android/model/PaymentIntent.java b/stripe/src/main/java/com/stripe/android/model/PaymentIntent.java
index 1033b0304d4..989f240b146 100644
--- a/stripe/src/main/java/com/stripe/android/model/PaymentIntent.java
+++ b/stripe/src/main/java/com/stripe/android/model/PaymentIntent.java
@@ -1,18 +1,19 @@
 package com.stripe.android.model;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.List;
 import java.util.Map;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import static com.stripe.android.model.StripeJsonUtils.optBoolean;
 import static com.stripe.android.model.StripeJsonUtils.optCurrency;
 import static com.stripe.android.model.StripeJsonUtils.optLong;
diff --git a/stripe/src/main/java/com/stripe/android/model/PaymentMethod.java b/stripe/src/main/java/com/stripe/android/model/PaymentMethod.java
index 3ac57fff4a6..a8851964a41 100644
--- a/stripe/src/main/java/com/stripe/android/model/PaymentMethod.java
+++ b/stripe/src/main/java/com/stripe/android/model/PaymentMethod.java
@@ -2,23 +2,24 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringDef;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringDef;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.model.wallets.Wallet;
 import com.stripe.android.model.wallets.WalletFactory;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import static com.stripe.android.model.StripeJsonUtils.optBoolean;
 import static com.stripe.android.model.StripeJsonUtils.optHash;
 import static com.stripe.android.model.StripeJsonUtils.optInteger;
diff --git a/stripe/src/main/java/com/stripe/android/model/PaymentMethodCreateParams.java b/stripe/src/main/java/com/stripe/android/model/PaymentMethodCreateParams.java
index ad8ab97fbe7..c290b0c12f1 100644
--- a/stripe/src/main/java/com/stripe/android/model/PaymentMethodCreateParams.java
+++ b/stripe/src/main/java/com/stripe/android/model/PaymentMethodCreateParams.java
@@ -1,20 +1,20 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.Stripe;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  * Model for PaymentMethod creation parameters.
  *
diff --git a/stripe/src/main/java/com/stripe/android/model/PiiTokenParams.java b/stripe/src/main/java/com/stripe/android/model/PiiTokenParams.java
index c13e3746348..28878bd61c2 100644
--- a/stripe/src/main/java/com/stripe/android/model/PiiTokenParams.java
+++ b/stripe/src/main/java/com/stripe/android/model/PiiTokenParams.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/stripe/src/main/java/com/stripe/android/model/SetupIntent.java b/stripe/src/main/java/com/stripe/android/model/SetupIntent.java
index 5b3cfe3d538..b56bfd365b6 100644
--- a/stripe/src/main/java/com/stripe/android/model/SetupIntent.java
+++ b/stripe/src/main/java/com/stripe/android/model/SetupIntent.java
@@ -1,19 +1,20 @@
 package com.stripe.android.model;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import static com.stripe.android.model.StripeJsonUtils.optMap;
 import static com.stripe.android.model.StripeJsonUtils.optString;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/ShippingInformation.java b/stripe/src/main/java/com/stripe/android/model/ShippingInformation.java
index 7d1d6f0f3a6..f1a31c37544 100644
--- a/stripe/src/main/java/com/stripe/android/model/ShippingInformation.java
+++ b/stripe/src/main/java/com/stripe/android/model/ShippingInformation.java
@@ -2,16 +2,17 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
-import com.stripe.android.utils.ObjectUtils;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import org.json.JSONObject;
+import com.stripe.android.utils.ObjectUtils;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.json.JSONObject;
+
 import static com.stripe.android.model.StripeJsonUtils.optString;
 
 /**
diff --git a/stripe/src/main/java/com/stripe/android/model/ShippingMethod.java b/stripe/src/main/java/com/stripe/android/model/ShippingMethod.java
index 60b7505d64a..85e8b31b234 100644
--- a/stripe/src/main/java/com/stripe/android/model/ShippingMethod.java
+++ b/stripe/src/main/java/com/stripe/android/model/ShippingMethod.java
@@ -2,9 +2,10 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Size;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
 
 import com.stripe.android.utils.ObjectUtils;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/Source.java b/stripe/src/main/java/com/stripe/android/model/Source.java
index 5f7359cb10c..4f1f6b03612 100644
--- a/stripe/src/main/java/com/stripe/android/model/Source.java
+++ b/stripe/src/main/java/com/stripe/android/model/Source.java
@@ -1,15 +1,12 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Size;
-import android.support.annotation.StringDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
+import androidx.annotation.StringDef;
 
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
@@ -19,6 +16,9 @@
 import java.util.Objects;
 import java.util.Set;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import static com.stripe.android.model.StripeJsonUtils.optLong;
 import static com.stripe.android.model.StripeJsonUtils.optString;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/SourceCardData.java b/stripe/src/main/java/com/stripe/android/model/SourceCardData.java
index a3ec12e8280..4acf813dff6 100644
--- a/stripe/src/main/java/com/stripe/android/model/SourceCardData.java
+++ b/stripe/src/main/java/com/stripe/android/model/SourceCardData.java
@@ -1,15 +1,12 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringDef;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringDef;
+import androidx.annotation.VisibleForTesting;
 
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
@@ -17,6 +14,9 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import static com.stripe.android.model.StripeJsonUtils.optInteger;
 import static com.stripe.android.model.StripeJsonUtils.optString;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/SourceCodeVerification.java b/stripe/src/main/java/com/stripe/android/model/SourceCodeVerification.java
index 6d85577b6f1..9c0f12a0922 100644
--- a/stripe/src/main/java/com/stripe/android/model/SourceCodeVerification.java
+++ b/stripe/src/main/java/com/stripe/android/model/SourceCodeVerification.java
@@ -1,17 +1,17 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringDef;
 
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import static com.stripe.android.model.StripeJsonUtils.optString;
 
 /**
diff --git a/stripe/src/main/java/com/stripe/android/model/SourceOwner.java b/stripe/src/main/java/com/stripe/android/model/SourceOwner.java
index d8cb3294997..34d44a030c8 100644
--- a/stripe/src/main/java/com/stripe/android/model/SourceOwner.java
+++ b/stripe/src/main/java/com/stripe/android/model/SourceOwner.java
@@ -1,7 +1,7 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.utils.ObjectUtils;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/SourceParams.java b/stripe/src/main/java/com/stripe/android/model/SourceParams.java
index b4c5f664115..ced4cf7f1b4 100644
--- a/stripe/src/main/java/com/stripe/android/model/SourceParams.java
+++ b/stripe/src/main/java/com/stripe/android/model/SourceParams.java
@@ -1,20 +1,20 @@
 package com.stripe.android.model;
 
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Size;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import static com.stripe.android.model.Source.SourceType;
 
 /**
diff --git a/stripe/src/main/java/com/stripe/android/model/SourceReceiver.java b/stripe/src/main/java/com/stripe/android/model/SourceReceiver.java
index 45675e66409..b482c3781ad 100644
--- a/stripe/src/main/java/com/stripe/android/model/SourceReceiver.java
+++ b/stripe/src/main/java/com/stripe/android/model/SourceReceiver.java
@@ -1,7 +1,7 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.utils.ObjectUtils;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/SourceRedirect.java b/stripe/src/main/java/com/stripe/android/model/SourceRedirect.java
index 043b52e6880..35781182be4 100644
--- a/stripe/src/main/java/com/stripe/android/model/SourceRedirect.java
+++ b/stripe/src/main/java/com/stripe/android/model/SourceRedirect.java
@@ -1,18 +1,18 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringDef;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringDef;
+import androidx.annotation.VisibleForTesting;
 
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import static com.stripe.android.model.StripeJsonUtils.optString;
 
 /**
diff --git a/stripe/src/main/java/com/stripe/android/model/SourceSepaDebitData.java b/stripe/src/main/java/com/stripe/android/model/SourceSepaDebitData.java
index caff83c4e91..476ba217835 100644
--- a/stripe/src/main/java/com/stripe/android/model/SourceSepaDebitData.java
+++ b/stripe/src/main/java/com/stripe/android/model/SourceSepaDebitData.java
@@ -1,19 +1,19 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import static com.stripe.android.model.StripeJsonUtils.optString;
 
 /**
diff --git a/stripe/src/main/java/com/stripe/android/model/Stripe3ds2Fingerprint.kt b/stripe/src/main/java/com/stripe/android/model/Stripe3ds2Fingerprint.kt
index 901ea691dd8..dc66470c4fc 100644
--- a/stripe/src/main/java/com/stripe/android/model/Stripe3ds2Fingerprint.kt
+++ b/stripe/src/main/java/com/stripe/android/model/Stripe3ds2Fingerprint.kt
@@ -1,6 +1,6 @@
 package com.stripe.android.model
 
-import android.support.annotation.VisibleForTesting
+import androidx.annotation.VisibleForTesting
 import java.io.ByteArrayInputStream
 import java.security.PublicKey
 import java.security.cert.CertificateException
diff --git a/stripe/src/main/java/com/stripe/android/model/Stripe3dsRedirect.java b/stripe/src/main/java/com/stripe/android/model/Stripe3dsRedirect.java
index b22c7ea8abe..96ee85fb702 100644
--- a/stripe/src/main/java/com/stripe/android/model/Stripe3dsRedirect.java
+++ b/stripe/src/main/java/com/stripe/android/model/Stripe3dsRedirect.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Objects;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/StripeIntent.java b/stripe/src/main/java/com/stripe/android/model/StripeIntent.java
index 579ec2e24b7..dfd7d910684 100644
--- a/stripe/src/main/java/com/stripe/android/model/StripeIntent.java
+++ b/stripe/src/main/java/com/stripe/android/model/StripeIntent.java
@@ -1,8 +1,9 @@
 package com.stripe.android.model;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.List;
 import java.util.Map;
diff --git a/stripe/src/main/java/com/stripe/android/model/StripeJsonUtils.java b/stripe/src/main/java/com/stripe/android/model/StripeJsonUtils.java
index 05ac81da1cb..b58b9017c85 100644
--- a/stripe/src/main/java/com/stripe/android/model/StripeJsonUtils.java
+++ b/stripe/src/main/java/com/stripe/android/model/StripeJsonUtils.java
@@ -1,12 +1,8 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Size;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -15,6 +11,10 @@
 import java.util.List;
 import java.util.Map;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  * A set of JSON parsing utility functions.
  */
diff --git a/stripe/src/main/java/com/stripe/android/model/StripeModel.java b/stripe/src/main/java/com/stripe/android/model/StripeModel.java
index 6b119904fa8..41a173ba570 100644
--- a/stripe/src/main/java/com/stripe/android/model/StripeModel.java
+++ b/stripe/src/main/java/com/stripe/android/model/StripeModel.java
@@ -1,14 +1,14 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import org.json.JSONArray;
-import org.json.JSONException;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+
 /**
  * Model for a Stripe API object.
  */
diff --git a/stripe/src/main/java/com/stripe/android/model/StripeParamsModel.java b/stripe/src/main/java/com/stripe/android/model/StripeParamsModel.java
index 6a6bc3e451f..b42b8c346bb 100644
--- a/stripe/src/main/java/com/stripe/android/model/StripeParamsModel.java
+++ b/stripe/src/main/java/com/stripe/android/model/StripeParamsModel.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Map;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/StripePaymentSource.java b/stripe/src/main/java/com/stripe/android/model/StripePaymentSource.java
index 619112c4f23..668ba5a7af5 100644
--- a/stripe/src/main/java/com/stripe/android/model/StripePaymentSource.java
+++ b/stripe/src/main/java/com/stripe/android/model/StripePaymentSource.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Represents an object that has an ID field that can be used to create payments with Stripe.
diff --git a/stripe/src/main/java/com/stripe/android/model/StripeSourceTypeModel.java b/stripe/src/main/java/com/stripe/android/model/StripeSourceTypeModel.java
index 500e53569fe..fb73e2b542e 100644
--- a/stripe/src/main/java/com/stripe/android/model/StripeSourceTypeModel.java
+++ b/stripe/src/main/java/com/stripe/android/model/StripeSourceTypeModel.java
@@ -1,19 +1,19 @@
 package com.stripe.android.model;
 
-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONObject;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
+import org.json.JSONObject;
+
 public abstract class StripeSourceTypeModel extends StripeModel {
     @NonNull private final Map<String, Object> mAdditionalFields;
     private static final String NULL = "null";
diff --git a/stripe/src/main/java/com/stripe/android/model/Token.java b/stripe/src/main/java/com/stripe/android/model/Token.java
index 54bade74633..63c14bf5544 100644
--- a/stripe/src/main/java/com/stripe/android/model/Token.java
+++ b/stripe/src/main/java/com/stripe/android/model/Token.java
@@ -1,19 +1,19 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringDef;
 
 import com.stripe.android.StripeTextUtils;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Date;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  * Tokenization is the process Stripe uses to collect sensitive card, bank account details, Stripe
  * account details or personally identifiable information (PII), directly from your customers in a
diff --git a/stripe/src/main/java/com/stripe/android/model/WeChat.java b/stripe/src/main/java/com/stripe/android/model/WeChat.java
index 2c4b891e30b..1764a029e7d 100644
--- a/stripe/src/main/java/com/stripe/android/model/WeChat.java
+++ b/stripe/src/main/java/com/stripe/android/model/WeChat.java
@@ -1,15 +1,15 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONObject;
-
 import java.util.Objects;
 
+import org.json.JSONObject;
+
 /**
  * <a href="https://stripe.com/docs/sources/wechat-pay">WeChat Pay Payments with Sources</a>
  */
diff --git a/stripe/src/main/java/com/stripe/android/model/wallets/AmexExpressCheckoutWallet.java b/stripe/src/main/java/com/stripe/android/model/wallets/AmexExpressCheckoutWallet.java
index 4ec6c6fc517..e119cd54596 100644
--- a/stripe/src/main/java/com/stripe/android/model/wallets/AmexExpressCheckoutWallet.java
+++ b/stripe/src/main/java/com/stripe/android/model/wallets/AmexExpressCheckoutWallet.java
@@ -2,7 +2,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public final class AmexExpressCheckoutWallet extends Wallet {
     private AmexExpressCheckoutWallet(@NonNull Builder builder) {
diff --git a/stripe/src/main/java/com/stripe/android/model/wallets/ApplePayWallet.java b/stripe/src/main/java/com/stripe/android/model/wallets/ApplePayWallet.java
index 383ab69e731..6d1df0a1985 100644
--- a/stripe/src/main/java/com/stripe/android/model/wallets/ApplePayWallet.java
+++ b/stripe/src/main/java/com/stripe/android/model/wallets/ApplePayWallet.java
@@ -2,7 +2,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public final class ApplePayWallet extends Wallet {
     private ApplePayWallet(@NonNull Builder builder) {
diff --git a/stripe/src/main/java/com/stripe/android/model/wallets/GooglePayWallet.java b/stripe/src/main/java/com/stripe/android/model/wallets/GooglePayWallet.java
index 168df92b2ad..18278515487 100644
--- a/stripe/src/main/java/com/stripe/android/model/wallets/GooglePayWallet.java
+++ b/stripe/src/main/java/com/stripe/android/model/wallets/GooglePayWallet.java
@@ -2,7 +2,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public final class GooglePayWallet extends Wallet {
     private GooglePayWallet(@NonNull Builder builder) {
diff --git a/stripe/src/main/java/com/stripe/android/model/wallets/MasterpassWallet.java b/stripe/src/main/java/com/stripe/android/model/wallets/MasterpassWallet.java
index 53f22a2e1c6..b235abe9f10 100644
--- a/stripe/src/main/java/com/stripe/android/model/wallets/MasterpassWallet.java
+++ b/stripe/src/main/java/com/stripe/android/model/wallets/MasterpassWallet.java
@@ -2,8 +2,9 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.utils.ObjectUtils;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/wallets/SamsungPayWallet.java b/stripe/src/main/java/com/stripe/android/model/wallets/SamsungPayWallet.java
index 619ecd2afd5..6c066f21b8d 100644
--- a/stripe/src/main/java/com/stripe/android/model/wallets/SamsungPayWallet.java
+++ b/stripe/src/main/java/com/stripe/android/model/wallets/SamsungPayWallet.java
@@ -2,7 +2,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public final class SamsungPayWallet extends Wallet {
     private SamsungPayWallet(@NonNull Builder builder) {
diff --git a/stripe/src/main/java/com/stripe/android/model/wallets/VisaCheckoutWallet.java b/stripe/src/main/java/com/stripe/android/model/wallets/VisaCheckoutWallet.java
index 261c171aec8..fd02b188741 100644
--- a/stripe/src/main/java/com/stripe/android/model/wallets/VisaCheckoutWallet.java
+++ b/stripe/src/main/java/com/stripe/android/model/wallets/VisaCheckoutWallet.java
@@ -2,8 +2,9 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.utils.ObjectUtils;
 
diff --git a/stripe/src/main/java/com/stripe/android/model/wallets/Wallet.java b/stripe/src/main/java/com/stripe/android/model/wallets/Wallet.java
index a5cd7d8a957..65fcfd8e1d3 100644
--- a/stripe/src/main/java/com/stripe/android/model/wallets/Wallet.java
+++ b/stripe/src/main/java/com/stripe/android/model/wallets/Wallet.java
@@ -2,17 +2,18 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.model.StripeModel;
 import com.stripe.android.utils.ObjectUtils;
 
-import org.json.JSONObject;
-
 import java.util.Objects;
 
+import org.json.JSONObject;
+
 import static com.stripe.android.model.StripeJsonUtils.optString;
 
 public abstract class Wallet extends StripeModel implements Parcelable {
diff --git a/stripe/src/main/java/com/stripe/android/model/wallets/WalletFactory.java b/stripe/src/main/java/com/stripe/android/model/wallets/WalletFactory.java
index aadd464c01e..3b52c571858 100644
--- a/stripe/src/main/java/com/stripe/android/model/wallets/WalletFactory.java
+++ b/stripe/src/main/java/com/stripe/android/model/wallets/WalletFactory.java
@@ -1,7 +1,7 @@
 package com.stripe.android.model.wallets;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.json.JSONObject;
 
diff --git a/stripe/src/main/java/com/stripe/android/utils/ObjectUtils.java b/stripe/src/main/java/com/stripe/android/utils/ObjectUtils.java
index 5a729ceefa0..7b5a6d18ac7 100644
--- a/stripe/src/main/java/com/stripe/android/utils/ObjectUtils.java
+++ b/stripe/src/main/java/com/stripe/android/utils/ObjectUtils.java
@@ -1,7 +1,7 @@
 package com.stripe.android.utils;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/stripe/src/main/java/com/stripe/android/view/ActivityStarter.java b/stripe/src/main/java/com/stripe/android/view/ActivityStarter.java
index b06ad081e6d..883d00ca8a6 100644
--- a/stripe/src/main/java/com/stripe/android/view/ActivityStarter.java
+++ b/stripe/src/main/java/com/stripe/android/view/ActivityStarter.java
@@ -3,9 +3,10 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 import java.util.Objects;
 
diff --git a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodActivity.java b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodActivity.java
index 2e495cbcff0..b9ea68a6174 100644
--- a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodActivity.java
+++ b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodActivity.java
@@ -4,13 +4,14 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.annotation.VisibleForTesting;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
+
 import com.stripe.android.ApiResultCallback;
 import com.stripe.android.CustomerSession;
 import com.stripe.android.PaymentConfiguration;
diff --git a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodActivityStarter.java b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodActivityStarter.java
index 21b16b898ce..fa5fa3e2762 100644
--- a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodActivityStarter.java
+++ b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodActivityStarter.java
@@ -4,8 +4,9 @@
 import android.content.Intent;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.PaymentConfiguration;
diff --git a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodFpxView.kt b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodFpxView.kt
index d80c62af6f0..daa3a879c07 100644
--- a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodFpxView.kt
+++ b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodFpxView.kt
@@ -4,14 +4,12 @@ import android.content.Context
 import android.content.res.ColorStateList
 import android.os.Parcel
 import android.os.Parcelable
-import android.support.v4.widget.ImageViewCompat
-import android.support.v7.widget.AppCompatImageView
-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.widget.AppCompatImageView
+import androidx.core.widget.ImageViewCompat
 import com.stripe.android.R
 import com.stripe.android.model.PaymentMethodCreateParams
 
@@ -37,10 +35,10 @@ internal class AddPaymentMethodFpxView private constructor(
         // an id is required for state to be saved
         id = R.id.payment_methods_add_fpx
 
-        val recyclerView = findViewById<RecyclerView>(R.id.fpx_list)
+        val recyclerView = findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.fpx_list)
         recyclerView.adapter = adapter
         recyclerView.setHasFixedSize(true)
-        recyclerView.layoutManager = LinearLayoutManager(context)
+        recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
         recyclerView.itemAnimator = null
     }
 
@@ -59,7 +57,7 @@ internal class AddPaymentMethodFpxView private constructor(
 
     private class Adapter constructor(
         private val themeConfig: ThemeConfig
-    ) : RecyclerView.Adapter<Adapter.ViewHolder>() {
+    ) : androidx.recyclerview.widget.RecyclerView.Adapter<Adapter.ViewHolder>() {
         var selectedPosition = -1
 
         internal val selectedBank: FpxBank?
@@ -110,7 +108,7 @@ internal class AddPaymentMethodFpxView private constructor(
         private class ViewHolder constructor(
             itemView: View,
             private val themeConfig: ThemeConfig
-        ) : RecyclerView.ViewHolder(itemView) {
+        ) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
             private val name: TextView = itemView.findViewById(R.id.name)
             private val icon: AppCompatImageView = itemView.findViewById(R.id.icon)
diff --git a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodRowView.kt b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodRowView.kt
index b7b2ba09da0..1f151b2e984 100644
--- a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodRowView.kt
+++ b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodRowView.kt
@@ -1,10 +1,10 @@
 package com.stripe.android.view
 
 import android.app.Activity
-import android.support.annotation.IdRes
-import android.support.annotation.LayoutRes
 import android.view.View
 import android.widget.FrameLayout
+import androidx.annotation.IdRes
+import androidx.annotation.LayoutRes
 
 internal abstract class AddPaymentMethodRowView(
     activity: Activity,
diff --git a/stripe/src/main/java/com/stripe/android/view/AuthActivityStarter.kt b/stripe/src/main/java/com/stripe/android/view/AuthActivityStarter.kt
index e82c0e3653f..d39ec2161b1 100644
--- a/stripe/src/main/java/com/stripe/android/view/AuthActivityStarter.kt
+++ b/stripe/src/main/java/com/stripe/android/view/AuthActivityStarter.kt
@@ -3,7 +3,6 @@ package com.stripe.android.view
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import java.lang.ref.WeakReference
 
 internal interface AuthActivityStarter<StartDataType> {
@@ -12,9 +11,9 @@ internal interface AuthActivityStarter<StartDataType> {
     /**
      * A representation of an object (i.e. Activity or Fragment) that can start an activity.
      */
-    class Host private constructor(activity: Activity, fragment: Fragment?) {
+    class Host private constructor(activity: Activity, fragment: androidx.fragment.app.Fragment?) {
         private val activityRef: WeakReference<Activity> = WeakReference(activity)
-        private val fragmentRef: WeakReference<Fragment>? =
+        private val fragmentRef: WeakReference<androidx.fragment.app.Fragment>? =
             if (fragment != null) WeakReference(fragment) else null
 
         val activity: Activity?
@@ -35,7 +34,7 @@ internal interface AuthActivityStarter<StartDataType> {
 
         companion object {
             @JvmStatic
-            fun create(fragment: Fragment): Host {
+            fun create(fragment: androidx.fragment.app.Fragment): Host {
                 return Host(fragment.requireActivity(), fragment)
             }
 
diff --git a/stripe/src/main/java/com/stripe/android/view/CardInputListener.java b/stripe/src/main/java/com/stripe/android/view/CardInputListener.java
index 59c8bf441e4..2b8e449ae3c 100644
--- a/stripe/src/main/java/com/stripe/android/view/CardInputListener.java
+++ b/stripe/src/main/java/com/stripe/android/view/CardInputListener.java
@@ -1,6 +1,6 @@
 package com.stripe.android.view;
 
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/stripe/src/main/java/com/stripe/android/view/CardInputWidget.java b/stripe/src/main/java/com/stripe/android/view/CardInputWidget.java
index 488af0e366a..f2af63b3cb0 100644
--- a/stripe/src/main/java/com/stripe/android/view/CardInputWidget.java
+++ b/stripe/src/main/java/com/stripe/android/view/CardInputWidget.java
@@ -6,16 +6,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.IdRes;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.view.AccessibilityDelegateCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
 import android.text.InputFilter;
 import android.text.Layout;
 import android.text.TextWatcher;
@@ -30,6 +20,17 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.IdRes;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+
 import com.stripe.android.R;
 import com.stripe.android.model.Card;
 import com.stripe.android.model.PaymentMethodCreateParams;
diff --git a/stripe/src/main/java/com/stripe/android/view/CardMultilineWidget.java b/stripe/src/main/java/com/stripe/android/view/CardMultilineWidget.java
index 6921fd9b6a5..7c733e64b22 100644
--- a/stripe/src/main/java/com/stripe/android/view/CardMultilineWidget.java
+++ b/stripe/src/main/java/com/stripe/android/view/CardMultilineWidget.java
@@ -5,17 +5,6 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.annotation.VisibleForTesting;
-import android.support.design.widget.TextInputLayout;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.text.InputFilter;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -24,6 +13,18 @@
 import android.view.inputmethod.EditorInfo;
 import android.widget.LinearLayout;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+
+import com.google.android.material.textfield.TextInputLayout;
 import com.stripe.android.CardUtils;
 import com.stripe.android.R;
 import com.stripe.android.model.Address;
diff --git a/stripe/src/main/java/com/stripe/android/view/CardNumberEditText.java b/stripe/src/main/java/com/stripe/android/view/CardNumberEditText.java
index e981f2afc47..e3716d18747 100644
--- a/stripe/src/main/java/com/stripe/android/view/CardNumberEditText.java
+++ b/stripe/src/main/java/com/stripe/android/view/CardNumberEditText.java
@@ -1,9 +1,6 @@
 package com.stripe.android.view;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.TextWatcher;
@@ -11,6 +8,10 @@
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.EditText;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 import com.stripe.android.CardUtils;
 import com.stripe.android.R;
 import com.stripe.android.StripeTextUtils;
diff --git a/stripe/src/main/java/com/stripe/android/view/CardWidget.java b/stripe/src/main/java/com/stripe/android/view/CardWidget.java
index 94171457d8b..a806adeecb7 100644
--- a/stripe/src/main/java/com/stripe/android/view/CardWidget.java
+++ b/stripe/src/main/java/com/stripe/android/view/CardWidget.java
@@ -1,8 +1,8 @@
 package com.stripe.android.view;
 
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.model.Card;
 import com.stripe.android.model.PaymentMethodCreateParams;
diff --git a/stripe/src/main/java/com/stripe/android/view/CountryAutoCompleteTextView.kt b/stripe/src/main/java/com/stripe/android/view/CountryAutoCompleteTextView.kt
index d59667b5998..44ac4b2d7ff 100644
--- a/stripe/src/main/java/com/stripe/android/view/CountryAutoCompleteTextView.kt
+++ b/stripe/src/main/java/com/stripe/android/view/CountryAutoCompleteTextView.kt
@@ -1,14 +1,14 @@
 package com.stripe.android.view
 
 import android.content.Context
-import android.support.annotation.VisibleForTesting
-import android.support.v4.os.ConfigurationCompat
 import android.util.AttributeSet
 import android.view.View
 import android.view.View.OnFocusChangeListener
 import android.widget.AdapterView
 import android.widget.AutoCompleteTextView
 import android.widget.FrameLayout
+import androidx.annotation.VisibleForTesting
+import androidx.core.os.ConfigurationCompat
 import com.stripe.android.R
 import java.util.Locale
 
diff --git a/stripe/src/main/java/com/stripe/android/view/DateUtils.kt b/stripe/src/main/java/com/stripe/android/view/DateUtils.kt
index a5b2ae6e441..6263d33fc48 100644
--- a/stripe/src/main/java/com/stripe/android/view/DateUtils.kt
+++ b/stripe/src/main/java/com/stripe/android/view/DateUtils.kt
@@ -1,8 +1,8 @@
 package com.stripe.android.view
 
-import android.support.annotation.IntRange
-import android.support.annotation.Size
-import android.support.annotation.VisibleForTesting
+import androidx.annotation.IntRange
+import androidx.annotation.Size
+import androidx.annotation.VisibleForTesting
 import java.util.Calendar
 
 internal object DateUtils {
diff --git a/stripe/src/main/java/com/stripe/android/view/ErrorListener.kt b/stripe/src/main/java/com/stripe/android/view/ErrorListener.kt
index 384ae255e4c..480ddf40d4e 100644
--- a/stripe/src/main/java/com/stripe/android/view/ErrorListener.kt
+++ b/stripe/src/main/java/com/stripe/android/view/ErrorListener.kt
@@ -1,6 +1,6 @@
 package com.stripe.android.view
 
-import android.support.design.widget.TextInputLayout
+import com.google.android.material.textfield.TextInputLayout
 
 internal class ErrorListener(
     private val textInputLayout: TextInputLayout
diff --git a/stripe/src/main/java/com/stripe/android/view/ExpiryDateEditText.java b/stripe/src/main/java/com/stripe/android/view/ExpiryDateEditText.java
index d507ac06dfa..efff36e7d5a 100644
--- a/stripe/src/main/java/com/stripe/android/view/ExpiryDateEditText.java
+++ b/stripe/src/main/java/com/stripe/android/view/ExpiryDateEditText.java
@@ -1,16 +1,17 @@
 package com.stripe.android.view;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Size;
-import android.support.annotation.VisibleForTesting;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.EditText;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
+import androidx.annotation.VisibleForTesting;
+
 import com.stripe.android.R;
 
 /**
diff --git a/stripe/src/main/java/com/stripe/android/view/IconTextInputLayout.java b/stripe/src/main/java/com/stripe/android/view/IconTextInputLayout.java
index 16bb670d066..48a96713441 100644
--- a/stripe/src/main/java/com/stripe/android/view/IconTextInputLayout.java
+++ b/stripe/src/main/java/com/stripe/android/view/IconTextInputLayout.java
@@ -2,10 +2,11 @@
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.support.annotation.VisibleForTesting;
-import android.support.design.widget.TextInputLayout;
 import android.util.AttributeSet;
 
+import androidx.annotation.VisibleForTesting;
+
+import com.google.android.material.textfield.TextInputLayout;
 import com.stripe.android.utils.ClassUtils;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/stripe/src/main/java/com/stripe/android/view/MaskedCardView.kt b/stripe/src/main/java/com/stripe/android/view/MaskedCardView.kt
index 2682a088b88..8f935dabe56 100644
--- a/stripe/src/main/java/com/stripe/android/view/MaskedCardView.kt
+++ b/stripe/src/main/java/com/stripe/android/view/MaskedCardView.kt
@@ -1,13 +1,6 @@
 package com.stripe.android.view
 
 import android.content.Context
-import android.support.annotation.ColorInt
-import android.support.annotation.DrawableRes
-import android.support.annotation.VisibleForTesting
-import android.support.v4.content.ContextCompat
-import android.support.v4.graphics.drawable.DrawableCompat
-import android.support.v7.widget.AppCompatImageView
-import android.support.v7.widget.AppCompatTextView
 import android.text.Spannable
 import android.text.SpannableString
 import android.text.Spanned
@@ -17,6 +10,13 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
+import androidx.annotation.VisibleForTesting
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
 import com.stripe.android.R
 import com.stripe.android.model.PaymentMethod
 
diff --git a/stripe/src/main/java/com/stripe/android/view/PaymentAuthWebViewActivity.java b/stripe/src/main/java/com/stripe/android/view/PaymentAuthWebViewActivity.java
index 8a0bbfb6de0..c43e8a8e2da 100644
--- a/stripe/src/main/java/com/stripe/android/view/PaymentAuthWebViewActivity.java
+++ b/stripe/src/main/java/com/stripe/android/view/PaymentAuthWebViewActivity.java
@@ -4,16 +4,17 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ProgressBar;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import com.stripe.android.PaymentAuthWebViewStarter;
 import com.stripe.android.R;
 import com.stripe.android.StripeTextUtils;
diff --git a/stripe/src/main/java/com/stripe/android/view/PaymentFlowActivity.java b/stripe/src/main/java/com/stripe/android/view/PaymentFlowActivity.java
index 7701efff6f8..8e65bbcd20a 100644
--- a/stripe/src/main/java/com/stripe/android/view/PaymentFlowActivity.java
+++ b/stripe/src/main/java/com/stripe/android/view/PaymentFlowActivity.java
@@ -5,10 +5,11 @@
 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.v4.view.ViewPager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.viewpager.widget.ViewPager;
 
 import com.stripe.android.CustomerSession;
 import com.stripe.android.PaymentSessionData;
diff --git a/stripe/src/main/java/com/stripe/android/view/PaymentFlowActivityStarter.java b/stripe/src/main/java/com/stripe/android/view/PaymentFlowActivityStarter.java
index afefe87d33a..799cae4c239 100644
--- a/stripe/src/main/java/com/stripe/android/view/PaymentFlowActivityStarter.java
+++ b/stripe/src/main/java/com/stripe/android/view/PaymentFlowActivityStarter.java
@@ -4,9 +4,10 @@
 import android.content.Intent;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.PaymentSessionConfig;
diff --git a/stripe/src/main/java/com/stripe/android/view/PaymentFlowPagerAdapter.kt b/stripe/src/main/java/com/stripe/android/view/PaymentFlowPagerAdapter.kt
index 7a6ea0ab47d..9d09596fc78 100644
--- a/stripe/src/main/java/com/stripe/android/view/PaymentFlowPagerAdapter.kt
+++ b/stripe/src/main/java/com/stripe/android/view/PaymentFlowPagerAdapter.kt
@@ -1,7 +1,6 @@
 package com.stripe.android.view
 
 import android.content.Context
-import android.support.v4.view.PagerAdapter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,7 +13,7 @@ import java.util.ArrayList
 internal class PaymentFlowPagerAdapter(
     private val context: Context,
     private val paymentSessionConfig: PaymentSessionConfig
-) : PagerAdapter() {
+) : androidx.viewpager.widget.PagerAdapter() {
     private val pages: MutableList<PaymentFlowPagerEnum>
 
     private var shippingInfoSaved: Boolean = false
diff --git a/stripe/src/main/java/com/stripe/android/view/PaymentFlowPagerEnum.kt b/stripe/src/main/java/com/stripe/android/view/PaymentFlowPagerEnum.kt
index 6d88c6bc784..0630624d9c4 100644
--- a/stripe/src/main/java/com/stripe/android/view/PaymentFlowPagerEnum.kt
+++ b/stripe/src/main/java/com/stripe/android/view/PaymentFlowPagerEnum.kt
@@ -1,7 +1,7 @@
 package com.stripe.android.view
 
-import android.support.annotation.LayoutRes
-import android.support.annotation.StringRes
+import androidx.annotation.LayoutRes
+import androidx.annotation.StringRes
 import com.stripe.android.R
 
 internal enum class PaymentFlowPagerEnum(
diff --git a/stripe/src/main/java/com/stripe/android/view/PaymentMethodsActivity.java b/stripe/src/main/java/com/stripe/android/view/PaymentMethodsActivity.java
index 018a6366d8f..925bf4704e8 100644
--- a/stripe/src/main/java/com/stripe/android/view/PaymentMethodsActivity.java
+++ b/stripe/src/main/java/com/stripe/android/view/PaymentMethodsActivity.java
@@ -5,20 +5,21 @@
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.stripe.android.CustomerSession;
 import com.stripe.android.R;
 import com.stripe.android.StripeError;
diff --git a/stripe/src/main/java/com/stripe/android/view/PaymentMethodsActivityStarter.java b/stripe/src/main/java/com/stripe/android/view/PaymentMethodsActivityStarter.java
index 0d5c7afd04f..d066c8a64a2 100644
--- a/stripe/src/main/java/com/stripe/android/view/PaymentMethodsActivityStarter.java
+++ b/stripe/src/main/java/com/stripe/android/view/PaymentMethodsActivityStarter.java
@@ -5,9 +5,10 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 import com.stripe.android.ObjectBuilder;
 import com.stripe.android.PaymentConfiguration;
diff --git a/stripe/src/main/java/com/stripe/android/view/PaymentMethodsAdapter.kt b/stripe/src/main/java/com/stripe/android/view/PaymentMethodsAdapter.kt
index c635e3247e4..1e54ef328a4 100644
--- a/stripe/src/main/java/com/stripe/android/view/PaymentMethodsAdapter.kt
+++ b/stripe/src/main/java/com/stripe/android/view/PaymentMethodsAdapter.kt
@@ -1,10 +1,10 @@
 package com.stripe.android.view
 
-import android.support.annotation.LayoutRes
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.recyclerview.widget.RecyclerView
 import com.stripe.android.R
 import com.stripe.android.model.PaymentMethod
 import java.util.ArrayList
@@ -13,7 +13,7 @@ import java.util.ArrayList
  * A [RecyclerView.Adapter] that holds a set of [MaskedCardView] items for a given set
  * of [PaymentMethod] objects.
  */
-internal class PaymentMethodsAdapter : RecyclerView.Adapter<PaymentMethodsAdapter.ViewHolder>() {
+internal class PaymentMethodsAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<PaymentMethodsAdapter.ViewHolder>() {
     private val paymentMethods = ArrayList<PaymentMethod>()
     private var selectedIndex = NO_SELECTION
 
@@ -121,7 +121,7 @@ internal class PaymentMethodsAdapter : RecyclerView.Adapter<PaymentMethodsAdapte
         this.selectedIndex = selectedIndex
     }
 
-    internal class ViewHolder constructor(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    internal class ViewHolder constructor(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
         private val cardView: MaskedCardView = itemView.findViewById(R.id.masked_card_item)
 
         fun setPaymentMethod(paymentMethod: PaymentMethod) {
diff --git a/stripe/src/main/java/com/stripe/android/view/PaymentRelayActivity.kt b/stripe/src/main/java/com/stripe/android/view/PaymentRelayActivity.kt
index b1e778340a8..725631d85cb 100644
--- a/stripe/src/main/java/com/stripe/android/view/PaymentRelayActivity.kt
+++ b/stripe/src/main/java/com/stripe/android/view/PaymentRelayActivity.kt
@@ -3,8 +3,7 @@ package com.stripe.android.view
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.content.LocalBroadcastManager
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import com.ults.listeners.SdkChallengeInterface.UL_HANDLE_CHALLENGE_ACTION
 
 /**
@@ -13,7 +12,7 @@ import com.ults.listeners.SdkChallengeInterface.UL_HANDLE_CHALLENGE_ACTION
 internal class PaymentRelayActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        LocalBroadcastManager.getInstance(this)
+        androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(this)
             .sendBroadcast(Intent().setAction(UL_HANDLE_CHALLENGE_ACTION))
         setResult(Activity.RESULT_OK, Intent().putExtras(intent.extras!!))
         finish()
diff --git a/stripe/src/main/java/com/stripe/android/view/SelectShippingMethodWidget.java b/stripe/src/main/java/com/stripe/android/view/SelectShippingMethodWidget.java
index 2e93cc794c2..340807ec297 100644
--- a/stripe/src/main/java/com/stripe/android/view/SelectShippingMethodWidget.java
+++ b/stripe/src/main/java/com/stripe/android/view/SelectShippingMethodWidget.java
@@ -1,13 +1,14 @@
 package com.stripe.android.view;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.stripe.android.R;
 import com.stripe.android.model.ShippingMethod;
 
diff --git a/stripe/src/main/java/com/stripe/android/view/ShippingInfoWidget.java b/stripe/src/main/java/com/stripe/android/view/ShippingInfoWidget.java
index 8841255230f..92b31e0cf82 100644
--- a/stripe/src/main/java/com/stripe/android/view/ShippingInfoWidget.java
+++ b/stripe/src/main/java/com/stripe/android/view/ShippingInfoWidget.java
@@ -2,15 +2,16 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringDef;
-import android.support.design.widget.TextInputLayout;
 import android.telephony.PhoneNumberFormattingTextWatcher;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringDef;
+
+import com.google.android.material.textfield.TextInputLayout;
 import com.stripe.android.R;
 import com.stripe.android.model.Address;
 import com.stripe.android.model.ShippingInformation;
diff --git a/stripe/src/main/java/com/stripe/android/view/ShippingMethodAdapter.kt b/stripe/src/main/java/com/stripe/android/view/ShippingMethodAdapter.kt
index 9d9ec925493..dbed190bbfa 100644
--- a/stripe/src/main/java/com/stripe/android/view/ShippingMethodAdapter.kt
+++ b/stripe/src/main/java/com/stripe/android/view/ShippingMethodAdapter.kt
@@ -1,6 +1,5 @@
 package com.stripe.android.view
 
-import android.support.v7.widget.RecyclerView
 import android.view.ViewGroup
 import com.stripe.android.model.ShippingMethod
 import java.util.ArrayList
@@ -8,7 +7,7 @@ import java.util.ArrayList
 /**
  * Adapter that populates a list with shipping methods
  */
-internal class ShippingMethodAdapter : RecyclerView.Adapter<ShippingMethodAdapter.ViewHolder>() {
+internal class ShippingMethodAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<ShippingMethodAdapter.ViewHolder>() {
 
     private var shippingMethods: List<ShippingMethod> = ArrayList()
     private var selectedIndex = 0
@@ -52,7 +51,7 @@ internal class ShippingMethodAdapter : RecyclerView.Adapter<ShippingMethodAdapte
     internal class ViewHolder constructor(
         private val shippingMethodView: ShippingMethodView,
         adapter: ShippingMethodAdapter
-    ) : RecyclerView.ViewHolder(shippingMethodView) {
+    ) : androidx.recyclerview.widget.RecyclerView.ViewHolder(shippingMethodView) {
 
         init {
             shippingMethodView.setOnClickListener {
diff --git a/stripe/src/main/java/com/stripe/android/view/ShippingMethodView.kt b/stripe/src/main/java/com/stripe/android/view/ShippingMethodView.kt
index 521edcf5378..bd5d9a09b8d 100644
--- a/stripe/src/main/java/com/stripe/android/view/ShippingMethodView.kt
+++ b/stripe/src/main/java/com/stripe/android/view/ShippingMethodView.kt
@@ -1,8 +1,6 @@
 package com.stripe.android.view
 
 import android.content.Context
-import android.support.annotation.ColorInt
-import android.support.v4.content.ContextCompat
 import android.util.AttributeSet
 import android.view.Gravity
 import android.view.View
@@ -10,6 +8,8 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.RelativeLayout
 import android.widget.TextView
+import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
 import com.stripe.android.R
 import com.stripe.android.model.ShippingMethod
 import com.stripe.android.view.ViewUtils.getThemeAccentColor
diff --git a/stripe/src/main/java/com/stripe/android/view/StripeActivity.kt b/stripe/src/main/java/com/stripe/android/view/StripeActivity.kt
index d9577fd6bfa..e04f3be248b 100644
--- a/stripe/src/main/java/com/stripe/android/view/StripeActivity.kt
+++ b/stripe/src/main/java/com/stripe/android/view/StripeActivity.kt
@@ -5,15 +5,14 @@ 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.AlertDialog
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewStub
 import android.widget.ProgressBar
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
 import com.stripe.android.CustomerSession
 import com.stripe.android.R
 import com.stripe.android.exception.StripeException
@@ -51,12 +50,12 @@ internal abstract class StripeActivity : AppCompatActivity() {
 
     override fun onPause() {
         super.onPause()
-        LocalBroadcastManager.getInstance(this).unregisterReceiver(alertBroadcastReceiver)
+        androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(this).unregisterReceiver(alertBroadcastReceiver)
     }
 
     override fun onResume() {
         super.onResume()
-        LocalBroadcastManager.getInstance(this)
+        androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(this)
             .registerReceiver(
                 alertBroadcastReceiver,
                 IntentFilter(CustomerSession.ACTION_API_EXCEPTION)
diff --git a/stripe/src/main/java/com/stripe/android/view/StripeEditText.java b/stripe/src/main/java/com/stripe/android/view/StripeEditText.java
index 0af90fae720..49b01756d9f 100644
--- a/stripe/src/main/java/com/stripe/android/view/StripeEditText.java
+++ b/stripe/src/main/java/com/stripe/android/view/StripeEditText.java
@@ -3,14 +3,6 @@
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.os.Handler;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.design.widget.TextInputEditText;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.AppCompatEditText;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
@@ -20,6 +12,15 @@
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputConnectionWrapper;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.widget.AppCompatEditText;
+import androidx.core.content.ContextCompat;
+
+import com.google.android.material.textfield.TextInputEditText;
 import com.stripe.android.R;
 
 import static com.stripe.android.view.ViewUtils.isColorDark;
@@ -49,7 +50,7 @@ public StripeEditText(@NonNull Context context) {
     }
 
     public StripeEditText(@NonNull Context context, @Nullable AttributeSet attrs) {
-        this(context, attrs, android.support.v7.appcompat.R.attr.editTextStyle);
+        this(context, attrs, androidx.appcompat.R.attr.editTextStyle);
     }
 
     public StripeEditText(@NonNull Context context, @Nullable AttributeSet attrs,
diff --git a/stripe/src/main/java/com/stripe/android/view/ThemeConfig.kt b/stripe/src/main/java/com/stripe/android/view/ThemeConfig.kt
index 4978392a910..fd697c77288 100644
--- a/stripe/src/main/java/com/stripe/android/view/ThemeConfig.kt
+++ b/stripe/src/main/java/com/stripe/android/view/ThemeConfig.kt
@@ -1,10 +1,10 @@
 package com.stripe.android.view
 
 import android.content.Context
-import android.support.annotation.ColorInt
-import android.support.annotation.ColorRes
-import android.support.v4.content.ContextCompat
-import android.support.v4.graphics.ColorUtils
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
 import com.stripe.android.R
 import com.stripe.android.view.ViewUtils.getThemeAccentColor
 import com.stripe.android.view.ViewUtils.getThemeColorControlNormal
diff --git a/stripe/src/main/java/com/stripe/android/view/ViewUtils.java b/stripe/src/main/java/com/stripe/android/view/ViewUtils.java
index b927ab914de..68b31cbd18e 100644
--- a/stripe/src/main/java/com/stripe/android/view/ViewUtils.java
+++ b/stripe/src/main/java/com/stripe/android/view/ViewUtils.java
@@ -5,16 +5,17 @@
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.AttrRes;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.util.TypedValue;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+
 import com.stripe.android.model.Card;
 
 import static com.stripe.android.model.Card.CVC_LENGTH_AMERICAN_EXPRESS;
diff --git a/stripe/src/main/java/com/stripe/android/view/i18n/ErrorMessageTranslator.java b/stripe/src/main/java/com/stripe/android/view/i18n/ErrorMessageTranslator.java
index 00f3135d0ab..1ec77846cf1 100644
--- a/stripe/src/main/java/com/stripe/android/view/i18n/ErrorMessageTranslator.java
+++ b/stripe/src/main/java/com/stripe/android/view/i18n/ErrorMessageTranslator.java
@@ -1,7 +1,7 @@
 package com.stripe.android.view.i18n;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.StripeError;
 
diff --git a/stripe/src/main/java/com/stripe/android/view/i18n/TranslatorManager.java b/stripe/src/main/java/com/stripe/android/view/i18n/TranslatorManager.java
index f7895ac62b3..3802f6d4ace 100644
--- a/stripe/src/main/java/com/stripe/android/view/i18n/TranslatorManager.java
+++ b/stripe/src/main/java/com/stripe/android/view/i18n/TranslatorManager.java
@@ -1,8 +1,9 @@
 package com.stripe.android.view.i18n;
 
 import android.app.Application;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * A class that provides a {@link ErrorMessageTranslator} for translating server-provided error
diff --git a/stripe/src/test/java/com/stripe/android/AbsFakeStripeRepository.java b/stripe/src/test/java/com/stripe/android/AbsFakeStripeRepository.java
index 095e257db35..09b76a6ac49 100644
--- a/stripe/src/test/java/com/stripe/android/AbsFakeStripeRepository.java
+++ b/stripe/src/test/java/com/stripe/android/AbsFakeStripeRepository.java
@@ -1,7 +1,7 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.exception.APIException;
 import com.stripe.android.model.ConfirmPaymentIntentParams;
diff --git a/stripe/src/test/java/com/stripe/android/AnalyticsDataFactoryTest.java b/stripe/src/test/java/com/stripe/android/AnalyticsDataFactoryTest.java
index db6d0c29891..c05b2ebb786 100644
--- a/stripe/src/test/java/com/stripe/android/AnalyticsDataFactoryTest.java
+++ b/stripe/src/test/java/com/stripe/android/AnalyticsDataFactoryTest.java
@@ -3,8 +3,8 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.stripe.android.model.Source;
diff --git a/stripe/src/test/java/com/stripe/android/ApiRequestMatcher.java b/stripe/src/test/java/com/stripe/android/ApiRequestMatcher.java
index ab09a097836..01a9144436e 100644
--- a/stripe/src/test/java/com/stripe/android/ApiRequestMatcher.java
+++ b/stripe/src/test/java/com/stripe/android/ApiRequestMatcher.java
@@ -1,7 +1,7 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.exception.InvalidRequestException;
 
diff --git a/stripe/src/test/java/com/stripe/android/ApiRequestTest.java b/stripe/src/test/java/com/stripe/android/ApiRequestTest.java
index 7be979ec4bd..bdb05f4bcde 100644
--- a/stripe/src/test/java/com/stripe/android/ApiRequestTest.java
+++ b/stripe/src/test/java/com/stripe/android/ApiRequestTest.java
@@ -1,7 +1,8 @@
 package com.stripe.android;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import com.stripe.android.exception.InvalidRequestException;
 import com.stripe.android.model.CardFixtures;
diff --git a/stripe/src/test/java/com/stripe/android/CustomerSessionTest.java b/stripe/src/test/java/com/stripe/android/CustomerSessionTest.java
index 64ed8db7fac..5583d0444a0 100644
--- a/stripe/src/test/java/com/stripe/android/CustomerSessionTest.java
+++ b/stripe/src/test/java/com/stripe/android/CustomerSessionTest.java
@@ -4,10 +4,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-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 androidx.test.core.app.ApplicationProvider;
 
 import com.stripe.android.exception.APIConnectionException;
diff --git a/stripe/src/test/java/com/stripe/android/CustomerSessionTestHelper.java b/stripe/src/test/java/com/stripe/android/CustomerSessionTestHelper.java
index 4ab1977ab24..bfd970a79f0 100644
--- a/stripe/src/test/java/com/stripe/android/CustomerSessionTestHelper.java
+++ b/stripe/src/test/java/com/stripe/android/CustomerSessionTestHelper.java
@@ -1,6 +1,6 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class CustomerSessionTestHelper {
     private CustomerSessionTestHelper() {
diff --git a/stripe/src/test/java/com/stripe/android/EphemeralKeyManagerTest.java b/stripe/src/test/java/com/stripe/android/EphemeralKeyManagerTest.java
index b42745f49c5..e7c4dedc26d 100644
--- a/stripe/src/test/java/com/stripe/android/EphemeralKeyManagerTest.java
+++ b/stripe/src/test/java/com/stripe/android/EphemeralKeyManagerTest.java
@@ -1,7 +1,7 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.testharness.TestEphemeralKeyProvider;
 
diff --git a/stripe/src/test/java/com/stripe/android/EphemeralKeyTest.java b/stripe/src/test/java/com/stripe/android/EphemeralKeyTest.java
index 3898ca2620b..9c5b4111be5 100644
--- a/stripe/src/test/java/com/stripe/android/EphemeralKeyTest.java
+++ b/stripe/src/test/java/com/stripe/android/EphemeralKeyTest.java
@@ -1,7 +1,8 @@
 package com.stripe.android;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/stripe/src/test/java/com/stripe/android/FakeFireAndForgetRequestExecutor.java b/stripe/src/test/java/com/stripe/android/FakeFireAndForgetRequestExecutor.java
index 62ae81a6e9f..7191f4e620d 100644
--- a/stripe/src/test/java/com/stripe/android/FakeFireAndForgetRequestExecutor.java
+++ b/stripe/src/test/java/com/stripe/android/FakeFireAndForgetRequestExecutor.java
@@ -1,6 +1,6 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 final class FakeFireAndForgetRequestExecutor implements FireAndForgetRequestExecutor {
     @Override
diff --git a/stripe/src/test/java/com/stripe/android/FakeUidSupplier.java b/stripe/src/test/java/com/stripe/android/FakeUidSupplier.java
index 842940e9205..7aabdcf4ac5 100644
--- a/stripe/src/test/java/com/stripe/android/FakeUidSupplier.java
+++ b/stripe/src/test/java/com/stripe/android/FakeUidSupplier.java
@@ -1,6 +1,6 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.UUID;
 
diff --git a/stripe/src/test/java/com/stripe/android/PaymentControllerTest.java b/stripe/src/test/java/com/stripe/android/PaymentControllerTest.java
index 9438ae27d70..c466a2629ae 100644
--- a/stripe/src/test/java/com/stripe/android/PaymentControllerTest.java
+++ b/stripe/src/test/java/com/stripe/android/PaymentControllerTest.java
@@ -2,8 +2,8 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.stripe.android.model.ConfirmPaymentIntentParams;
diff --git a/stripe/src/test/java/com/stripe/android/PaymentSessionTest.java b/stripe/src/test/java/com/stripe/android/PaymentSessionTest.java
index ce0a8822f84..141deed64bb 100644
--- a/stripe/src/test/java/com/stripe/android/PaymentSessionTest.java
+++ b/stripe/src/test/java/com/stripe/android/PaymentSessionTest.java
@@ -3,8 +3,8 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.stripe.android.model.Customer;
diff --git a/stripe/src/test/java/com/stripe/android/Stripe3ds2Fixtures.java b/stripe/src/test/java/com/stripe/android/Stripe3ds2Fixtures.java
index d749b42fc2b..81cdbb37f4d 100644
--- a/stripe/src/test/java/com/stripe/android/Stripe3ds2Fixtures.java
+++ b/stripe/src/test/java/com/stripe/android/Stripe3ds2Fixtures.java
@@ -1,6 +1,6 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stripe.android.stripe3ds2.transaction.AuthenticationRequestParameters;
 
diff --git a/stripe/src/test/java/com/stripe/android/StripeApiRepositoryTest.java b/stripe/src/test/java/com/stripe/android/StripeApiRepositoryTest.java
index 8008f1aae1d..704962cf143 100644
--- a/stripe/src/test/java/com/stripe/android/StripeApiRepositoryTest.java
+++ b/stripe/src/test/java/com/stripe/android/StripeApiRepositoryTest.java
@@ -1,7 +1,6 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-
+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.stripe.android.exception.APIConnectionException;
diff --git a/stripe/src/test/java/com/stripe/android/StripeApiRequestExecutorTest.java b/stripe/src/test/java/com/stripe/android/StripeApiRequestExecutorTest.java
index adcef36c024..815f8da8e09 100644
--- a/stripe/src/test/java/com/stripe/android/StripeApiRequestExecutorTest.java
+++ b/stripe/src/test/java/com/stripe/android/StripeApiRequestExecutorTest.java
@@ -1,6 +1,6 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stripe.android.exception.InvalidRequestException;
 
diff --git a/stripe/src/test/java/com/stripe/android/StripeNetworkUtilsTest.java b/stripe/src/test/java/com/stripe/android/StripeNetworkUtilsTest.java
index 45d12c1a4c3..35249489453 100644
--- a/stripe/src/test/java/com/stripe/android/StripeNetworkUtilsTest.java
+++ b/stripe/src/test/java/com/stripe/android/StripeNetworkUtilsTest.java
@@ -1,7 +1,7 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.model.Card;
 import com.stripe.android.model.CardFixtures;
diff --git a/stripe/src/test/java/com/stripe/android/StripePaymentAuthTest.java b/stripe/src/test/java/com/stripe/android/StripePaymentAuthTest.java
index e0ecc3094ae..7a662dc06cd 100644
--- a/stripe/src/test/java/com/stripe/android/StripePaymentAuthTest.java
+++ b/stripe/src/test/java/com/stripe/android/StripePaymentAuthTest.java
@@ -3,8 +3,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.stripe.android.model.ConfirmPaymentIntentParams;
diff --git a/stripe/src/test/java/com/stripe/android/StripeRequestCompactParamsTest.java b/stripe/src/test/java/com/stripe/android/StripeRequestCompactParamsTest.java
index 2d4cd1690e8..8c16090dc7c 100644
--- a/stripe/src/test/java/com/stripe/android/StripeRequestCompactParamsTest.java
+++ b/stripe/src/test/java/com/stripe/android/StripeRequestCompactParamsTest.java
@@ -1,7 +1,7 @@
 package com.stripe.android;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.junit.Test;
 
diff --git a/stripe/src/test/java/com/stripe/android/StripeTest.java b/stripe/src/test/java/com/stripe/android/StripeTest.java
index 18e6b780b60..58d8865f04c 100644
--- a/stripe/src/test/java/com/stripe/android/StripeTest.java
+++ b/stripe/src/test/java/com/stripe/android/StripeTest.java
@@ -1,9 +1,9 @@
 package com.stripe.android;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.stripe.android.exception.AuthenticationException;
diff --git a/stripe/src/test/java/com/stripe/android/TelemetryClientUtilTest.java b/stripe/src/test/java/com/stripe/android/TelemetryClientUtilTest.java
index 3a5e0efea35..6fc35e16749 100644
--- a/stripe/src/test/java/com/stripe/android/TelemetryClientUtilTest.java
+++ b/stripe/src/test/java/com/stripe/android/TelemetryClientUtilTest.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 
 import org.junit.Before;
diff --git a/stripe/src/test/java/com/stripe/android/model/AddressTest.java b/stripe/src/test/java/com/stripe/android/model/AddressTest.java
index 7731bb51690..fc7f56f42b4 100644
--- a/stripe/src/test/java/com/stripe/android/model/AddressTest.java
+++ b/stripe/src/test/java/com/stripe/android/model/AddressTest.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.junit.Test;
 
diff --git a/stripe/src/test/java/com/stripe/android/model/BankAccountTest.java b/stripe/src/test/java/com/stripe/android/model/BankAccountTest.java
index 5100754bc3f..3eee2c6e5f3 100644
--- a/stripe/src/test/java/com/stripe/android/model/BankAccountTest.java
+++ b/stripe/src/test/java/com/stripe/android/model/BankAccountTest.java
@@ -1,7 +1,7 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.junit.Test;
 
diff --git a/stripe/src/test/java/com/stripe/android/model/CardTest.java b/stripe/src/test/java/com/stripe/android/model/CardTest.java
index a36d6eea7ae..4a78316b937 100644
--- a/stripe/src/test/java/com/stripe/android/model/CardTest.java
+++ b/stripe/src/test/java/com/stripe/android/model/CardTest.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/stripe/src/test/java/com/stripe/android/model/CustomerTest.java b/stripe/src/test/java/com/stripe/android/model/CustomerTest.java
index 0186fc2759e..e63926ca0e1 100644
--- a/stripe/src/test/java/com/stripe/android/model/CustomerTest.java
+++ b/stripe/src/test/java/com/stripe/android/model/CustomerTest.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/stripe/src/test/java/com/stripe/android/model/GooglePayFixtures.java b/stripe/src/test/java/com/stripe/android/model/GooglePayFixtures.java
index 015d6f43413..a566f8db209 100644
--- a/stripe/src/test/java/com/stripe/android/model/GooglePayFixtures.java
+++ b/stripe/src/test/java/com/stripe/android/model/GooglePayFixtures.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/stripe/src/test/java/com/stripe/android/model/PaymentIntentFixtures.java b/stripe/src/test/java/com/stripe/android/model/PaymentIntentFixtures.java
index 262f87fc4c2..7ee4a826c88 100644
--- a/stripe/src/test/java/com/stripe/android/model/PaymentIntentFixtures.java
+++ b/stripe/src/test/java/com/stripe/android/model/PaymentIntentFixtures.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.json.JSONObject;
 
diff --git a/stripe/src/test/java/com/stripe/android/model/PaymentMethodCreateParamsFixtures.java b/stripe/src/test/java/com/stripe/android/model/PaymentMethodCreateParamsFixtures.java
index 439074345dc..9c8c3198639 100644
--- a/stripe/src/test/java/com/stripe/android/model/PaymentMethodCreateParamsFixtures.java
+++ b/stripe/src/test/java/com/stripe/android/model/PaymentMethodCreateParamsFixtures.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Map;
 
diff --git a/stripe/src/test/java/com/stripe/android/model/PaymentMethodCreateParamsTest.java b/stripe/src/test/java/com/stripe/android/model/PaymentMethodCreateParamsTest.java
index fbae4c61130..edaa20eee9f 100644
--- a/stripe/src/test/java/com/stripe/android/model/PaymentMethodCreateParamsTest.java
+++ b/stripe/src/test/java/com/stripe/android/model/PaymentMethodCreateParamsTest.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.json.JSONException;
 import org.junit.Test;
diff --git a/stripe/src/test/java/com/stripe/android/model/SetupIntentFixtures.java b/stripe/src/test/java/com/stripe/android/model/SetupIntentFixtures.java
index 54cdfba02b3..80e0a666057 100644
--- a/stripe/src/test/java/com/stripe/android/model/SetupIntentFixtures.java
+++ b/stripe/src/test/java/com/stripe/android/model/SetupIntentFixtures.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Objects;
 
diff --git a/stripe/src/test/java/com/stripe/android/model/ShippingInformationTest.java b/stripe/src/test/java/com/stripe/android/model/ShippingInformationTest.java
index 8a0d7707408..f26979a9e06 100644
--- a/stripe/src/test/java/com/stripe/android/model/ShippingInformationTest.java
+++ b/stripe/src/test/java/com/stripe/android/model/ShippingInformationTest.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.junit.Test;
 
diff --git a/stripe/src/test/java/com/stripe/android/model/ShippingMethodTest.java b/stripe/src/test/java/com/stripe/android/model/ShippingMethodTest.java
index 6a78ecbe84d..6937830d0b4 100644
--- a/stripe/src/test/java/com/stripe/android/model/ShippingMethodTest.java
+++ b/stripe/src/test/java/com/stripe/android/model/ShippingMethodTest.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.junit.Test;
 
diff --git a/stripe/src/test/java/com/stripe/android/model/SourceParamsTest.java b/stripe/src/test/java/com/stripe/android/model/SourceParamsTest.java
index b977999184b..46dbbd78c6c 100644
--- a/stripe/src/test/java/com/stripe/android/model/SourceParamsTest.java
+++ b/stripe/src/test/java/com/stripe/android/model/SourceParamsTest.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stripe.android.testharness.JsonTestUtils;
 
diff --git a/stripe/src/test/java/com/stripe/android/model/Stripe3ds2FingerprintTest.java b/stripe/src/test/java/com/stripe/android/model/Stripe3ds2FingerprintTest.java
index ccf46b21c21..9cc9bf96108 100644
--- a/stripe/src/test/java/com/stripe/android/model/Stripe3ds2FingerprintTest.java
+++ b/stripe/src/test/java/com/stripe/android/model/Stripe3ds2FingerprintTest.java
@@ -1,6 +1,6 @@
 package com.stripe.android.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.junit.Test;
 import org.junit.function.ThrowingRunnable;
diff --git a/stripe/src/test/java/com/stripe/android/testharness/JsonTestUtils.java b/stripe/src/test/java/com/stripe/android/testharness/JsonTestUtils.java
index 566b209dfcd..e455f8808ba 100644
--- a/stripe/src/test/java/com/stripe/android/testharness/JsonTestUtils.java
+++ b/stripe/src/test/java/com/stripe/android/testharness/JsonTestUtils.java
@@ -1,6 +1,6 @@
 package com.stripe.android.testharness;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.List;
 import java.util.Map;
diff --git a/stripe/src/test/java/com/stripe/android/testharness/TestEphemeralKeyProvider.java b/stripe/src/test/java/com/stripe/android/testharness/TestEphemeralKeyProvider.java
index 3678c73fc43..6c3f38967d0 100644
--- a/stripe/src/test/java/com/stripe/android/testharness/TestEphemeralKeyProvider.java
+++ b/stripe/src/test/java/com/stripe/android/testharness/TestEphemeralKeyProvider.java
@@ -1,8 +1,8 @@
 package com.stripe.android.testharness;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Size;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
 
 import com.stripe.android.EphemeralKeyProvider;
 import com.stripe.android.EphemeralKeyUpdateListener;
diff --git a/stripe/src/test/java/com/stripe/android/testharness/TestFocusChangeListener.java b/stripe/src/test/java/com/stripe/android/testharness/TestFocusChangeListener.java
index d8a10b20d65..49895f08da6 100644
--- a/stripe/src/test/java/com/stripe/android/testharness/TestFocusChangeListener.java
+++ b/stripe/src/test/java/com/stripe/android/testharness/TestFocusChangeListener.java
@@ -1,9 +1,10 @@
 package com.stripe.android.testharness;
 
-import android.support.annotation.IdRes;
 import android.view.View;
 import android.view.ViewTreeObserver;
 
+import androidx.annotation.IdRes;
+
 /**
  * Test class that listens for global focus changes and stores the transition.
  */
diff --git a/stripe/src/test/java/com/stripe/android/testharness/ViewTestUtils.java b/stripe/src/test/java/com/stripe/android/testharness/ViewTestUtils.java
index ef96f0595a0..e76d955a50c 100644
--- a/stripe/src/test/java/com/stripe/android/testharness/ViewTestUtils.java
+++ b/stripe/src/test/java/com/stripe/android/testharness/ViewTestUtils.java
@@ -2,12 +2,13 @@
 
 
 import android.os.Build;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
 import android.text.InputFilter;
 import android.view.KeyEvent;
 import android.widget.EditText;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+
 /**
  * Utility class for common actions to perform on Views under test.
  */
diff --git a/stripe/src/test/java/com/stripe/android/utils/ParcelUtils.java b/stripe/src/test/java/com/stripe/android/utils/ParcelUtils.java
index 80cd8b5ef2f..24e59b70271 100644
--- a/stripe/src/test/java/com/stripe/android/utils/ParcelUtils.java
+++ b/stripe/src/test/java/com/stripe/android/utils/ParcelUtils.java
@@ -2,7 +2,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public final class ParcelUtils {
     /**
diff --git a/stripe/src/test/java/com/stripe/android/view/AddPaymentMethodActivityTest.java b/stripe/src/test/java/com/stripe/android/view/AddPaymentMethodActivityTest.java
index 03f749c804d..640a5f0fcc8 100644
--- a/stripe/src/test/java/com/stripe/android/view/AddPaymentMethodActivityTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/AddPaymentMethodActivityTest.java
@@ -3,11 +3,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.LocalBroadcastManager;
 import android.view.View;
 import android.widget.ProgressBar;
 
+import androidx.annotation.NonNull;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.stripe.android.ApiKeyFixtures;
@@ -24,6 +24,8 @@
 import com.stripe.android.model.PaymentMethodFixtures;
 import com.stripe.android.model.PaymentMethodTest;
 
+import java.util.Calendar;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,8 +39,6 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.ShadowActivity;
 
-import java.util.Calendar;
-
 import static android.app.Activity.RESULT_OK;
 import static com.stripe.android.CustomerSession.ACTION_API_EXCEPTION;
 import static com.stripe.android.CustomerSession.EXTRA_EXCEPTION;
diff --git a/stripe/src/test/java/com/stripe/android/view/BaseViewTest.java b/stripe/src/test/java/com/stripe/android/view/BaseViewTest.java
index c15d033daf4..a86d4fed6c8 100644
--- a/stripe/src/test/java/com/stripe/android/view/BaseViewTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/BaseViewTest.java
@@ -2,9 +2,10 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.junit.After;
 import org.junit.runner.RunWith;
diff --git a/stripe/src/test/java/com/stripe/android/view/CardInputTestActivity.java b/stripe/src/test/java/com/stripe/android/view/CardInputTestActivity.java
index 32945b57715..5b53d6b7d0c 100644
--- a/stripe/src/test/java/com/stripe/android/view/CardInputTestActivity.java
+++ b/stripe/src/test/java/com/stripe/android/view/CardInputTestActivity.java
@@ -1,9 +1,10 @@
 package com.stripe.android.view;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.LinearLayout;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.stripe.android.R;
 
 /**
diff --git a/stripe/src/test/java/com/stripe/android/view/CardInputWidgetTest.java b/stripe/src/test/java/com/stripe/android/view/CardInputWidgetTest.java
index 6fbc15954af..68862483274 100644
--- a/stripe/src/test/java/com/stripe/android/view/CardInputWidgetTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/CardInputWidgetTest.java
@@ -1,11 +1,12 @@
 package com.stripe.android.view;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ImageView;
 
+import androidx.annotation.NonNull;
+
 import com.stripe.android.R;
 import com.stripe.android.model.Card;
 import com.stripe.android.model.PaymentMethodCreateParams;
diff --git a/stripe/src/test/java/com/stripe/android/view/CardMultilineWidgetTest.java b/stripe/src/test/java/com/stripe/android/view/CardMultilineWidgetTest.java
index 8e0f1f632ed..06bdda825fb 100644
--- a/stripe/src/test/java/com/stripe/android/view/CardMultilineWidgetTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/CardMultilineWidgetTest.java
@@ -1,10 +1,11 @@
 package com.stripe.android.view;
 
-import android.support.annotation.NonNull;
-import android.support.design.widget.TextInputLayout;
 import android.view.View;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
+
+import com.google.android.material.textfield.TextInputLayout;
 import com.stripe.android.R;
 import com.stripe.android.model.Address;
 import com.stripe.android.model.Card;
diff --git a/stripe/src/test/java/com/stripe/android/view/CountryAdapterTest.java b/stripe/src/test/java/com/stripe/android/view/CountryAdapterTest.java
index 8f7c32a0da1..e3053656d42 100644
--- a/stripe/src/test/java/com/stripe/android/view/CountryAdapterTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/CountryAdapterTest.java
@@ -1,7 +1,6 @@
 package com.stripe.android.view;
 
-import android.support.annotation.NonNull;
-
+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 
 import org.junit.Before;
diff --git a/stripe/src/test/java/com/stripe/android/view/IconTextInputLayoutTest.java b/stripe/src/test/java/com/stripe/android/view/IconTextInputLayoutTest.java
index 7c202dc953f..8a81c5c666c 100644
--- a/stripe/src/test/java/com/stripe/android/view/IconTextInputLayoutTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/IconTextInputLayoutTest.java
@@ -1,7 +1,6 @@
 package com.stripe.android.view;
 
-import android.support.design.widget.TextInputLayout;
-
+import com.google.android.material.textfield.TextInputLayout;
 import com.stripe.android.R;
 
 import org.junit.After;
diff --git a/stripe/src/test/java/com/stripe/android/view/MaskedCardViewTest.java b/stripe/src/test/java/com/stripe/android/view/MaskedCardViewTest.java
index 0924927974c..de10cc376cf 100644
--- a/stripe/src/test/java/com/stripe/android/view/MaskedCardViewTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/MaskedCardViewTest.java
@@ -1,9 +1,9 @@
 package com.stripe.android.view;
 
-import android.support.v4.graphics.ColorUtils;
-import android.support.v7.widget.AppCompatImageView;
 import android.view.View;
 
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.graphics.ColorUtils;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.stripe.android.R;
diff --git a/stripe/src/test/java/com/stripe/android/view/PaymentFlowActivityTest.java b/stripe/src/test/java/com/stripe/android/view/PaymentFlowActivityTest.java
index 4b6dbff5475..675c9d29c25 100644
--- a/stripe/src/test/java/com/stripe/android/view/PaymentFlowActivityTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/PaymentFlowActivityTest.java
@@ -6,10 +6,10 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.LocalBroadcastManager;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.stripe.android.ApiKeyFixtures;
diff --git a/stripe/src/test/java/com/stripe/android/view/PaymentMethodsActivityTest.java b/stripe/src/test/java/com/stripe/android/view/PaymentMethodsActivityTest.java
index c42cb816945..61236c592a6 100644
--- a/stripe/src/test/java/com/stripe/android/view/PaymentMethodsActivityTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/PaymentMethodsActivityTest.java
@@ -2,11 +2,11 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.widget.RecyclerView;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ProgressBar;
 
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.stripe.android.ApiKeyFixtures;
@@ -17,6 +17,10 @@
 import com.stripe.android.model.PaymentMethod;
 import com.stripe.android.model.PaymentMethodTest;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,10 +33,6 @@
 import org.robolectric.Shadows;
 import org.robolectric.shadows.ShadowActivity;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
 import static android.app.Activity.RESULT_OK;
 import static com.stripe.android.PaymentSession.EXTRA_PAYMENT_SESSION_ACTIVE;
 import static org.junit.Assert.assertEquals;
diff --git a/stripe/src/test/java/com/stripe/android/view/PaymentMethodsAdapterTest.java b/stripe/src/test/java/com/stripe/android/view/PaymentMethodsAdapterTest.java
index 10ae3f56261..2e092fce45d 100644
--- a/stripe/src/test/java/com/stripe/android/view/PaymentMethodsAdapterTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/PaymentMethodsAdapterTest.java
@@ -1,6 +1,6 @@
 package com.stripe.android.view;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.stripe.android.model.PaymentMethod;
 import com.stripe.android.model.PaymentMethodTest;
diff --git a/stripe/src/test/java/com/stripe/android/view/SelectShippingMethodTestActivity.java b/stripe/src/test/java/com/stripe/android/view/SelectShippingMethodTestActivity.java
index 113bb96105b..cd1d5f9fb08 100644
--- a/stripe/src/test/java/com/stripe/android/view/SelectShippingMethodTestActivity.java
+++ b/stripe/src/test/java/com/stripe/android/view/SelectShippingMethodTestActivity.java
@@ -1,10 +1,11 @@
 package com.stripe.android.view;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.LinearLayout;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.stripe.android.R;
 
 /**
diff --git a/stripe/src/test/java/com/stripe/android/view/ShippingInfoTestActivity.java b/stripe/src/test/java/com/stripe/android/view/ShippingInfoTestActivity.java
index 16c02c9d51e..7ad97c34228 100644
--- a/stripe/src/test/java/com/stripe/android/view/ShippingInfoTestActivity.java
+++ b/stripe/src/test/java/com/stripe/android/view/ShippingInfoTestActivity.java
@@ -1,10 +1,11 @@
 package com.stripe.android.view;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.LinearLayout;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.stripe.android.R;
 
 /**
diff --git a/stripe/src/test/java/com/stripe/android/view/ShippingInfoWidgetTest.java b/stripe/src/test/java/com/stripe/android/view/ShippingInfoWidgetTest.java
index fb20a1ec01a..8b9b756ebf4 100644
--- a/stripe/src/test/java/com/stripe/android/view/ShippingInfoWidgetTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/ShippingInfoWidgetTest.java
@@ -1,8 +1,8 @@
 package com.stripe.android.view;
 
-import android.support.design.widget.TextInputLayout;
 import android.view.View;
 
+import com.google.android.material.textfield.TextInputLayout;
 import com.stripe.android.R;
 import com.stripe.android.model.Address;
 import com.stripe.android.model.ShippingInformation;
diff --git a/stripe/src/test/java/com/stripe/android/view/ShippingPostalCodeValidatorTest.java b/stripe/src/test/java/com/stripe/android/view/ShippingPostalCodeValidatorTest.java
index 898fe3b61c9..2626226be6b 100644
--- a/stripe/src/test/java/com/stripe/android/view/ShippingPostalCodeValidatorTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/ShippingPostalCodeValidatorTest.java
@@ -1,6 +1,6 @@
 package com.stripe.android.view;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.junit.Test;
 
diff --git a/stripe/src/test/java/com/stripe/android/view/StripeEditTextTest.java b/stripe/src/test/java/com/stripe/android/view/StripeEditTextTest.java
index a542a9f9d34..c6d7d47bf7c 100644
--- a/stripe/src/test/java/com/stripe/android/view/StripeEditTextTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/StripeEditTextTest.java
@@ -1,10 +1,10 @@
 package com.stripe.android.view;
 
 import android.content.Context;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.stripe.android.R;
diff --git a/stripe/src/test/java/com/stripe/android/view/ViewUtilsTest.java b/stripe/src/test/java/com/stripe/android/view/ViewUtilsTest.java
index 6bc66c71ce6..4d44972dccd 100644
--- a/stripe/src/test/java/com/stripe/android/view/ViewUtilsTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/ViewUtilsTest.java
@@ -1,7 +1,8 @@
 package com.stripe.android.view;
 
 import android.graphics.Color;
-import android.support.annotation.ColorInt;
+
+import androidx.annotation.ColorInt;
 
 import com.stripe.android.model.Card;
 
diff --git a/stripe/src/test/java/com/stripe/android/view/i18n/TranslatorManagerTest.java b/stripe/src/test/java/com/stripe/android/view/i18n/TranslatorManagerTest.java
index cfb908452e9..f0f2ac36b4f 100644
--- a/stripe/src/test/java/com/stripe/android/view/i18n/TranslatorManagerTest.java
+++ b/stripe/src/test/java/com/stripe/android/view/i18n/TranslatorManagerTest.java
@@ -1,7 +1,7 @@
 package com.stripe.android.view.i18n;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stripe.android.StripeError;
 import com.stripe.android.StripeErrorFixtures;