Merge pull request #1 from phileo/refactor/androidx

[Refactor] Migrate to AndroidX

Author: phileo

.gitignore

@@ -11,3 +11,4 @@
 /.idea
 /private.properties
 
+sdk/.cxx

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.6.4'
 
         // 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'
 }

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"
 }
 

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;

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;
 

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 {

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 {
 

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> {

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;

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;