From 9ed8df1dbe71bb0ec17893a8a345eff9fd06f7ee Mon Sep 17 00:00:00 2001
From: Tyler Carberry <tyler.carberry@shutterfly.com>
Date: Wed, 29 Jan 2020 13:40:59 -0500
Subject: [PATCH] Migrate to AndroidX

---
 build.gradle                                  | 15 +++++++-------
 demo/build.gradle                             | 10 +++++-----
 .../pay/sample/demo/CardDetailsActivity.java  | 10 +++++-----
 .../cards/pay/sample/demo/FinalActivity.java  |  6 +++---
 .../cards/pay/sample/demo/IntroActivity.java  |  6 +++---
 .../validation/FieldValidationResult.java     |  4 ++--
 .../demo/validation/ValidationResult.java     |  2 +-
 .../sample/demo/widget/CardDateEditText.java  |  2 +-
 .../demo/widget/CardNumberEditText.java       |  2 +-
 .../main/res/layout-h480dp/activity_final.xml |  2 +-
 .../main/res/layout-h480dp/activity_intro.xml |  6 +++---
 .../main/res/layout/activity_card_details.xml | 20 +++++++++----------
 demo/src/main/res/layout/activity_final.xml   |  2 +-
 demo/src/main/res/layout/activity_intro.xml   |  6 +++---
 gradle.properties                             |  2 ++
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 sdk/build.gradle                              |  6 +++---
 .../pay/paycardsrecognizer/sdk/Card.java      |  2 +-
 .../sdk/ScanCardIntent.java                   |  4 ++--
 .../sdk/camera/AutoFocusManager.java          |  4 ++--
 .../camera/BlockingOperationException.java    |  2 +-
 .../sdk/camera/CameraConfigurationUtils.java  |  2 +-
 .../sdk/camera/CameraManager.java             |  2 +-
 .../sdk/camera/CameraUtils.java               |  4 ++--
 .../sdk/camera/OrientationHelper.java         |  4 ++--
 .../RecognitionAvailabilityChecker.java       |  4 ++--
 .../sdk/camera/RecognitionCoreUtils.java      |  2 +-
 .../sdk/camera/RenderThread.java              |  2 +-
 .../sdk/camera/ScanManager.java               |  6 +++---
 .../sdk/camera/ScanManagerHandler.java        |  2 +-
 .../sdk/camera/TorchManager.java              |  2 +-
 .../sdk/camera/WindowRotationListener.java    |  2 +-
 .../sdk/camera/gles/Drawable2d.java           |  2 +-
 .../sdk/camera/gles/EglCore.java              |  2 +-
 .../sdk/camera/gles/Sprite2d.java             |  2 +-
 .../sdk/camera/gles/WindowSurface.java        |  2 +-
 .../camera/widget/CameraPreviewLayout.java    |  6 +++---
 .../sdk/ndk/DisplayConfiguration.java         |  2 +-
 .../sdk/ndk/DisplayConfigurationImpl.java     |  4 ++--
 .../sdk/ndk/RecognitionConstants.java         |  4 ++--
 .../sdk/ndk/RecognitionCore.java              |  9 ++++-----
 .../sdk/ndk/RecognitionCoreDummy.java         |  5 ++---
 .../sdk/ndk/RecognitionCoreImpl.java          |  7 +++----
 .../sdk/ndk/RecognitionCoreNdk.java           |  9 ++++-----
 .../sdk/ndk/RecognitionResult.java            |  4 ++--
 .../sdk/ndk/RecognitionStatusListener.java    |  2 +-
 .../sdk/ndk/TorchStatusListener.java          |  2 +-
 .../sdk/ui/InitLibraryFragment.java           |  8 ++++----
 .../sdk/ui/ScanCardActivity.java              | 10 +++++-----
 .../sdk/ui/ScanCardFragment.java              |  6 +++---
 .../sdk/ui/ScanCardRequest.java               |  2 +-
 .../sdk/ui/views/ButtonWithTopBorder.java     |  2 +-
 .../ui/views/ProgressBarIndeterminate.java    |  2 +-
 ...bletCardRecognitionHolderLinearLayout.java |  2 +-
 .../sdk/utils/CardUtils.java                  |  4 ++--
 .../sdk/utils/Constants.java                  |  2 +-
 .../wocr_fragment_scan_card.xml               |  2 +-
 .../wocr_fragment_scan_card.xml               |  2 +-
 .../res/layout/wocr_fragment_scan_card.xml    |  2 +-
 59 files changed, 126 insertions(+), 127 deletions(-)

diff --git a/build.gradle b/build.gradle
index d55937a..d17f808 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        //classpath 'com.android.tools.build:gradle:3.3.0-alpha04'
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.5.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -33,12 +32,14 @@ ext {
     compileSdkVersion = 28
 
     // App dependencies
-    supportLibVersion = '27.1.1'
-    yearclassVersion = "2.1.0"
+    appCompatVersion = '1.1.0'
+    yearclassVersion = '2.1.0'
+    gridLayoutVersion = '1.0.0'
+    materialVersion = '1.0.0'
 
     // App test dependencies
     junitVersion = '4.12'
-    espressoVersion = '3.0.2'
-    robolectricVersion = "3.8"
-    mockitoVersion = "2.21.0"
+    espressoVersion = '3.2.0'
+    robolectricVersion = '3.8'
+    mockitoVersion = '2.21.0'
 }
diff --git a/demo/build.gradle b/demo/build.gradle
index 6e8d3df..0788e5b 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -16,7 +16,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode Integer.parseInt(DEMO_APP_VERSION_CODE)
         versionName DEMO_APP_VERSION_NAME
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs "en"
     }
     signingConfigs {
@@ -49,10 +49,10 @@ dependencies {
     implementation project(path: ":sdk")
     //debugCompile project(path: ":sdk", configuration: 'release')
     //releaseCompile project(path: ":sdk", configuration: 'release')
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibVersion"
-    implementation "com.android.support:gridlayout-v7:$rootProject.ext.supportLibVersion"
-    implementation "com.android.support:design:$rootProject.ext.supportLibVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
+    implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion"
+    implementation "androidx.gridlayout:gridlayout:$rootProject.ext.gridLayoutVersion"
+    implementation "com.google.android.material:material:$rootProject.ext.materialVersion"
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
 }
 
diff --git a/demo/src/main/java/cards/pay/sample/demo/CardDetailsActivity.java b/demo/src/main/java/cards/pay/sample/demo/CardDetailsActivity.java
index 7570850..30dab3c 100644
--- a/demo/src/main/java/cards/pay/sample/demo/CardDetailsActivity.java
+++ b/demo/src/main/java/cards/pay/sample/demo/CardDetailsActivity.java
@@ -5,11 +5,11 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.ResultReceiver;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
diff --git a/demo/src/main/java/cards/pay/sample/demo/FinalActivity.java b/demo/src/main/java/cards/pay/sample/demo/FinalActivity.java
index afd7ad6..f3f75d0 100644
--- a/demo/src/main/java/cards/pay/sample/demo/FinalActivity.java
+++ b/demo/src/main/java/cards/pay/sample/demo/FinalActivity.java
@@ -3,9 +3,9 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 
diff --git a/demo/src/main/java/cards/pay/sample/demo/IntroActivity.java b/demo/src/main/java/cards/pay/sample/demo/IntroActivity.java
index a3e662a..4bc7727 100644
--- a/demo/src/main/java/cards/pay/sample/demo/IntroActivity.java
+++ b/demo/src/main/java/cards/pay/sample/demo/IntroActivity.java
@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 public class IntroActivity extends AppCompatActivity {
diff --git a/demo/src/main/java/cards/pay/sample/demo/validation/FieldValidationResult.java b/demo/src/main/java/cards/pay/sample/demo/validation/FieldValidationResult.java
index 88f0cf5..1cb85d5 100644
--- a/demo/src/main/java/cards/pay/sample/demo/validation/FieldValidationResult.java
+++ b/demo/src/main/java/cards/pay/sample/demo/validation/FieldValidationResult.java
@@ -1,8 +1,8 @@
 package cards.pay.sample.demo.validation;
 
 import android.content.res.Resources;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 
 public class FieldValidationResult {
 
diff --git a/demo/src/main/java/cards/pay/sample/demo/validation/ValidationResult.java b/demo/src/main/java/cards/pay/sample/demo/validation/ValidationResult.java
index 810f35e..c6c208e 100644
--- a/demo/src/main/java/cards/pay/sample/demo/validation/ValidationResult.java
+++ b/demo/src/main/java/cards/pay/sample/demo/validation/ValidationResult.java
@@ -1,7 +1,7 @@
 package cards.pay.sample.demo.validation;
 
 import android.content.res.Resources;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.SparseArray;
 
 public class ValidationResult extends SparseArray<FieldValidationResult> {
diff --git a/demo/src/main/java/cards/pay/sample/demo/widget/CardDateEditText.java b/demo/src/main/java/cards/pay/sample/demo/widget/CardDateEditText.java
index 113613c..6de1039 100644
--- a/demo/src/main/java/cards/pay/sample/demo/widget/CardDateEditText.java
+++ b/demo/src/main/java/cards/pay/sample/demo/widget/CardDateEditText.java
@@ -1,7 +1,7 @@
 package cards.pay.sample.demo.widget;
 
 import android.content.Context;
-import android.support.design.widget.TextInputEditText;
+import com.google.android.material.textfield.TextInputEditText;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.InputType;
diff --git a/demo/src/main/java/cards/pay/sample/demo/widget/CardNumberEditText.java b/demo/src/main/java/cards/pay/sample/demo/widget/CardNumberEditText.java
index b3d0d2f..212d1b9 100644
--- a/demo/src/main/java/cards/pay/sample/demo/widget/CardNumberEditText.java
+++ b/demo/src/main/java/cards/pay/sample/demo/widget/CardNumberEditText.java
@@ -1,7 +1,7 @@
 package cards.pay.sample.demo.widget;
 
 import android.content.Context;
-import android.support.design.widget.TextInputEditText;
+import com.google.android.material.textfield.TextInputEditText;
 import android.text.InputFilter;
 import android.text.InputType;
 import android.text.method.DigitsKeyListener;
diff --git a/demo/src/main/res/layout-h480dp/activity_final.xml b/demo/src/main/res/layout-h480dp/activity_final.xml
index e358675..af5727d 100644
--- a/demo/src/main/res/layout-h480dp/activity_final.xml
+++ b/demo/src/main/res/layout-h480dp/activity_final.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/demo/src/main/res/layout-h480dp/activity_intro.xml b/demo/src/main/res/layout-h480dp/activity_intro.xml
index 9a5af9a..c917bee 100644
--- a/demo/src/main/res/layout-h480dp/activity_intro.xml
+++ b/demo/src/main/res/layout-h480dp/activity_intro.xml
@@ -6,12 +6,12 @@
     android:fitsSystemWindows="true"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?actionBarSize">
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_next"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:background="?selectableItemBackground"
@@ -21,7 +21,7 @@
             android:layout_margin="0dp"
             android:text="@string/all_button_next" />
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/demo/src/main/res/layout/activity_card_details.xml b/demo/src/main/res/layout/activity_card_details.xml
index 16e399f..596d73c 100644
--- a/demo/src/main/res/layout/activity_card_details.xml
+++ b/demo/src/main/res/layout/activity_card_details.xml
@@ -6,12 +6,12 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?actionBarSize">
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_next"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:background="?selectableItemBackground"
@@ -21,7 +21,7 @@
             android:layout_margin="0dp"
             android:text="@string/all_button_next" />
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <ScrollView
         android:layout_width="match_parent"
@@ -55,7 +55,7 @@
                 android:layout_marginBottom="4dp"
                 android:text="@string/carddetails_subhead" />
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/card_number_field"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -68,15 +68,15 @@
                     android:hint="@string/carddetails_card_number_field_label"
                     tools:text="1234 5678 9012 3456" />
 
-            </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/cardholder_field"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp">
 
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/cardholder_field_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -85,9 +85,9 @@
                     android:inputType="textVisiblePassword|textCapCharacters"
                     tools:text="CARDHOLDER NAME" />
 
-            </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/expiry_date_field"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -101,7 +101,7 @@
                     android:imeOptions="actionDone|flagNoExtractUi"
                     tools:text="01/21" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <Button
                 android:id="@+id/scan_button"
diff --git a/demo/src/main/res/layout/activity_final.xml b/demo/src/main/res/layout/activity_final.xml
index 09ba233..de54899 100644
--- a/demo/src/main/res/layout/activity_final.xml
+++ b/demo/src/main/res/layout/activity_final.xml
@@ -7,7 +7,7 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/demo/src/main/res/layout/activity_intro.xml b/demo/src/main/res/layout/activity_intro.xml
index c4eac01..b809580 100644
--- a/demo/src/main/res/layout/activity_intro.xml
+++ b/demo/src/main/res/layout/activity_intro.xml
@@ -6,13 +6,13 @@
     android:fitsSystemWindows="true"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?actionBarSize"
         android:minHeight="?actionBarSize">
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_next"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:background="?selectableItemBackground"
@@ -22,7 +22,7 @@
             android:layout_margin="0dp"
             android:text="@string/all_button_next" />
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/gradle.properties b/gradle.properties
index 29507d2..5be98ce 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -33,3 +33,5 @@ POM_LICENCE_URL=https://opensource.org/licenses/MIT
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=faceterteam
 POM_DEVELOPER_NAME=Mobile Money Solutions Oy
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7dc503f..ee69dd6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sdk/build.gradle b/sdk/build.gradle
index 74e33de..759cf40 100644
--- a/sdk/build.gradle
+++ b/sdk/build.gradle
@@ -12,7 +12,7 @@ android {
         versionCode Integer.parseInt(VERSION_CODE)
         versionName VERSION_NAME
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         externalNativeBuild {
             cmake {
@@ -56,8 +56,8 @@ android {
 }
 
 dependencies {
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
+    implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion"
     implementation "com.facebook.device.yearclass:yearclass:$rootProject.ext.yearclassVersion"
 
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/Card.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/Card.java
index 31f2ccc..c946c1b 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/Card.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/Card.java
@@ -3,7 +3,7 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.Serializable;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ScanCardIntent.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ScanCardIntent.java
index 665f38c..bc9177b 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ScanCardIntent.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ScanCardIntent.java
@@ -3,8 +3,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.IntDef;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.IntDef;
+import androidx.annotation.RestrictTo;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/AutoFocusManager.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/AutoFocusManager.java
index f68bf8f..7f8969b 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/AutoFocusManager.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/AutoFocusManager.java
@@ -5,8 +5,8 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 import android.util.Log;
 
 import cards.pay.paycardsrecognizer.sdk.utils.Constants;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/BlockingOperationException.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/BlockingOperationException.java
index 272fb35..7d1e586 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/BlockingOperationException.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/BlockingOperationException.java
@@ -1,6 +1,6 @@
 package cards.pay.paycardsrecognizer.sdk.camera;
 
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 import java.io.IOException;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraConfigurationUtils.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraConfigurationUtils.java
index f333d7e..bed6dbe 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraConfigurationUtils.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraConfigurationUtils.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Rect;
 import android.hardware.Camera;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 import android.util.Log;
 
 import java.util.ArrayList;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraManager.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraManager.java
index 72d11ea..b5e683b 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraManager.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraManager.java
@@ -4,7 +4,7 @@
 import android.graphics.ImageFormat;
 import android.graphics.SurfaceTexture;
 import android.hardware.Camera;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.Display;
 import android.view.WindowManager;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraUtils.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraUtils.java
index bc0c500..9e76430 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraUtils.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraUtils.java
@@ -1,8 +1,8 @@
 package cards.pay.paycardsrecognizer.sdk.camera;
 
 import android.hardware.Camera;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 import android.text.TextUtils;
 import android.view.Display;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/OrientationHelper.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/OrientationHelper.java
index 3870c79..1e2bfcc 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/OrientationHelper.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/OrientationHelper.java
@@ -1,8 +1,8 @@
 package cards.pay.paycardsrecognizer.sdk.camera;
 
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 import android.util.Log;
 import android.view.Display;
 import android.view.Surface;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionAvailabilityChecker.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionAvailabilityChecker.java
index f6d328c..76952ff 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionAvailabilityChecker.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionAvailabilityChecker.java
@@ -3,8 +3,8 @@
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.support.annotation.RestrictTo;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.RestrictTo;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 
 import com.facebook.device.yearclass.YearClass;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionCoreUtils.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionCoreUtils.java
index 0833849..3da7923 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionCoreUtils.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionCoreUtils.java
@@ -1,7 +1,7 @@
 package cards.pay.paycardsrecognizer.sdk.camera;
 
 import android.content.Context;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RenderThread.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RenderThread.java
index a142727..d3d0950 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RenderThread.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RenderThread.java
@@ -8,7 +8,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 import android.util.Log;
 import android.view.SurfaceHolder;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManager.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManager.java
index 87aba44..f49fdf0 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManager.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManager.java
@@ -8,9 +8,9 @@
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
-import android.support.annotation.MainThread;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.MainThread;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 import android.util.Log;
 import android.view.Display;
 import android.view.SurfaceHolder;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManagerHandler.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManagerHandler.java
index 93f8395..61198f4 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManagerHandler.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManagerHandler.java
@@ -3,7 +3,7 @@
 import android.hardware.Camera;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 import android.util.Log;
 
 import java.lang.ref.WeakReference;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/TorchManager.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/TorchManager.java
index 726f56d..6485a7d 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/TorchManager.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/TorchManager.java
@@ -1,7 +1,7 @@
 package cards.pay.paycardsrecognizer.sdk.camera;
 
 import android.hardware.Camera;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 import android.util.Log;
 
 import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionCore;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/WindowRotationListener.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/WindowRotationListener.java
index 673c482..d6e6776 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/WindowRotationListener.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/WindowRotationListener.java
@@ -5,7 +5,7 @@
 import android.hardware.display.DisplayManager;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 import android.util.Log;
 import android.view.Display;
 import android.view.OrientationEventListener;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Drawable2d.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Drawable2d.java
index adc710c..7f30dc4 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Drawable2d.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Drawable2d.java
@@ -15,7 +15,7 @@
  */
 package cards.pay.paycardsrecognizer.sdk.camera.gles;
 
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 import java.nio.FloatBuffer;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/EglCore.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/EglCore.java
index 2275ecc..30ebd6c 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/EglCore.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/EglCore.java
@@ -17,7 +17,7 @@
 
 import android.graphics.SurfaceTexture;
 import android.opengl.EGL14;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 import android.util.Log;
 import android.view.SurfaceHolder;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Sprite2d.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Sprite2d.java
index e05288f..0b85c74 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Sprite2d.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Sprite2d.java
@@ -16,7 +16,7 @@
 package cards.pay.paycardsrecognizer.sdk.camera.gles;
 
 import android.opengl.Matrix;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 /**
  * Base class for a 2d object.  Includes position, scale, rotation, and flat-shaded color.
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/WindowSurface.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/WindowSurface.java
index 573d2af..a18dade 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/WindowSurface.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/WindowSurface.java
@@ -17,7 +17,7 @@
 
 import android.graphics.Bitmap;
 import android.opengl.GLES20;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CameraPreviewLayout.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CameraPreviewLayout.java
index 7ef2b60..7e4d703 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CameraPreviewLayout.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CameraPreviewLayout.java
@@ -4,9 +4,9 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
-import android.support.annotation.RestrictTo;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.RestrictTo;
+import androidx.core.view.GravityCompat;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.Gravity;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfiguration.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfiguration.java
index 27dd25b..7dced78 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfiguration.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfiguration.java
@@ -1,6 +1,6 @@
 package cards.pay.paycardsrecognizer.sdk.ndk;
 
-import android.support.annotation.IntRange;
+import androidx.annotation.IntRange;
 
 import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.WorkAreaOrientation;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfigurationImpl.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfigurationImpl.java
index 38809f2..d17d778 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfigurationImpl.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfigurationImpl.java
@@ -1,8 +1,8 @@
 package cards.pay.paycardsrecognizer.sdk.ndk;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.RestrictTo;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.VisibleForTesting;
 import android.util.Log;
 import android.view.Display;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionConstants.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionConstants.java
index 35f7a0f..c61da15 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionConstants.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionConstants.java
@@ -1,7 +1,7 @@
 package cards.pay.paycardsrecognizer.sdk.ndk;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.IntDef;
+import androidx.annotation.RestrictTo;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCore.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCore.java
index 5f7e343..76a228b 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCore.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCore.java
@@ -2,12 +2,11 @@
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.VisibleForTesting;
 import android.util.Log;
-import android.view.Display;
 
 import java.io.IOException;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreDummy.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreDummy.java
index a9b40f8..19a4f67 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreDummy.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreDummy.java
@@ -1,9 +1,8 @@
 package cards.pay.paycardsrecognizer.sdk.ndk;
 
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.Display;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 class RecognitionCoreDummy implements RecognitionCoreImpl {
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreImpl.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreImpl.java
index b4c8d90..7f5f248 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreImpl.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreImpl.java
@@ -1,10 +1,9 @@
 package cards.pay.paycardsrecognizer.sdk.ndk;
 
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.view.Display;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public interface RecognitionCoreImpl {
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreNdk.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreNdk.java
index 7fcfbf4..f5c7b4d 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreNdk.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreNdk.java
@@ -7,12 +7,11 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import android.util.Log;
-import android.view.Display;
 
 import java.io.IOException;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionResult.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionResult.java
index a199f80..dd06adb 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionResult.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionResult.java
@@ -4,8 +4,8 @@
 import android.graphics.Rect;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public final class RecognitionResult implements Parcelable {
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionStatusListener.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionStatusListener.java
index db5d377..7770925 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionStatusListener.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionStatusListener.java
@@ -2,7 +2,7 @@
 
 
 import android.graphics.Bitmap;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public interface RecognitionStatusListener {
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/TorchStatusListener.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/TorchStatusListener.java
index 707dfd4..0ba3d3e 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/TorchStatusListener.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/TorchStatusListener.java
@@ -1,6 +1,6 @@
 package cards.pay.paycardsrecognizer.sdk.ndk;
 
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public interface TorchStatusListener {
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/InitLibraryFragment.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/InitLibraryFragment.java
index c9a4ad6..2b4dbe3 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/InitLibraryFragment.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/InitLibraryFragment.java
@@ -7,10 +7,10 @@
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardActivity.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardActivity.java
index 38a0a33..3ed3ddc 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardActivity.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardActivity.java
@@ -3,11 +3,11 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.fragment.app.Fragment;
+import androidx.core.view.ViewCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.WindowManager;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardFragment.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardFragment.java
index d228546..b39fb69 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardFragment.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardFragment.java
@@ -8,9 +8,9 @@
 import android.media.AudioManager;
 import android.media.SoundPool;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.fragment.app.Fragment;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardRequest.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardRequest.java
index 849c981..382be33 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardRequest.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardRequest.java
@@ -2,7 +2,7 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public final class ScanCardRequest implements Parcelable {
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ButtonWithTopBorder.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ButtonWithTopBorder.java
index 5f43b54..eb2d475 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ButtonWithTopBorder.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ButtonWithTopBorder.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.v7.widget.AppCompatButton;
+import androidx.appcompat.widget.AppCompatButton;
 import android.util.AttributeSet;
 
 public class ButtonWithTopBorder extends AppCompatButton {
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ProgressBarIndeterminate.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ProgressBarIndeterminate.java
index 139d85b..a6462c7 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ProgressBarIndeterminate.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ProgressBarIndeterminate.java
@@ -2,7 +2,7 @@
 
 import android.animation.Animator;
 import android.content.Context;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ProgressBar;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/TabletCardRecognitionHolderLinearLayout.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/TabletCardRecognitionHolderLinearLayout.java
index 6f5593e..9eab999 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/TabletCardRecognitionHolderLinearLayout.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/TabletCardRecognitionHolderLinearLayout.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/CardUtils.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/CardUtils.java
index 4b04b41..bbba461 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/CardUtils.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/CardUtils.java
@@ -1,7 +1,7 @@
 package cards.pay.paycardsrecognizer.sdk.utils;
 
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 import android.text.TextUtils;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/Constants.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/Constants.java
index 775eb47..16298db 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/Constants.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/Constants.java
@@ -1,6 +1,6 @@
 package cards.pay.paycardsrecognizer.sdk.utils;
 
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 import cards.pay.paycardsrecognizer.sdk.BuildConfig;
 
diff --git a/sdk/src/main/res/layout-sw600dp-land/wocr_fragment_scan_card.xml b/sdk/src/main/res/layout-sw600dp-land/wocr_fragment_scan_card.xml
index 349a389..bd4da60 100644
--- a/sdk/src/main/res/layout-sw600dp-land/wocr_fragment_scan_card.xml
+++ b/sdk/src/main/res/layout-sw600dp-land/wocr_fragment_scan_card.xml
@@ -36,7 +36,7 @@
             android:layout_height="wrap_content"
             android:text="@string/wocr_button_enter_card_number" />
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/wocr_iv_flash_id"
             style="@style/wocr_FlashButton"
             android:layout_height="wrap_content"
diff --git a/sdk/src/main/res/layout-sw600dp/wocr_fragment_scan_card.xml b/sdk/src/main/res/layout-sw600dp/wocr_fragment_scan_card.xml
index 996becb..eb18fda 100644
--- a/sdk/src/main/res/layout-sw600dp/wocr_fragment_scan_card.xml
+++ b/sdk/src/main/res/layout-sw600dp/wocr_fragment_scan_card.xml
@@ -31,7 +31,7 @@
 
         </cards.pay.paycardsrecognizer.sdk.ui.views.TabletCardRecognitionHolderLinearLayout>
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/wocr_iv_flash_id"
             style="@style/wocr_FlashButton"
             android:layout_height="wrap_content"
diff --git a/sdk/src/main/res/layout/wocr_fragment_scan_card.xml b/sdk/src/main/res/layout/wocr_fragment_scan_card.xml
index a3403a1..23e3aae 100644
--- a/sdk/src/main/res/layout/wocr_fragment_scan_card.xml
+++ b/sdk/src/main/res/layout/wocr_fragment_scan_card.xml
@@ -18,7 +18,7 @@
 
         <include layout="@layout/wocr_include_card_detection_layout" />
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/wocr_iv_flash_id"
             style="@style/wocr_FlashButton"
             android:layout_height="wrap_content"