Update Quickstart App to use AndroidX

- Updated all files that used old support libraries - Updated gradle version - Bumped to minSdkVersion 26 to use adaptive-icons
square · Aug 1, 2019 · 5e91f1f · 5e91f1f
1 parent 91a04bd
commit 5e91f1f
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 38 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,10 +2,10 @@ apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion 28
-  buildToolsVersion "27.0.3"
+  buildToolsVersion "28.0.3"
   defaultConfig {
     applicationId "com.example.readersdk"
-    minSdkVersion 21
+    minSdkVersion 26
     targetSdkVersion 28
     multiDexEnabled true
     versionCode 1020
@@ -23,19 +23,6 @@ android {
   }
 }
 
-configurations.all {
-  resolutionStrategy {
-    eachDependency { details ->
-      // Force all of the primary support libraries to use the same version.
-      if (details.requested.group == 'com.android.support'
-          && details.requested.name != 'multidex'
-          && details.requested.name != 'multidex-instrumentation') {
-        details.useVersion '28.0.0'
-      }
-    }
-  }
-}
-
 repositories {
   google()
   maven {
@@ -55,8 +42,8 @@ dependencies {
   // SQUARE_READER_SDK_APPLICATION_ID is defined in ./gradle.properties
   implementation "com.squareup.sdk.reader:reader-sdk-$SQUARE_READER_SDK_APPLICATION_ID:$readerSdkVersion"
   runtimeOnly "com.squareup.sdk.reader:reader-sdk-internals:$readerSdkVersion"
-  implementation 'com.android.support:appcompat-v7:28.0.0'
-  implementation 'com.android.support:multidex:1.0.3'
+  implementation 'androidx.appcompat:appcompat:1.0.2'
+  implementation 'androidx.multidex:multidex:2.0.1'
 
   // QR Code scanning
   implementation 'com.dlazaro66.qrcodereaderview:qrcodereaderview:2.0.3'

diff --git a/app/src/main/java/com/example/readersdk/AuthorizingActivity.java b/app/src/main/java/com/example/readersdk/AuthorizingActivity.java
@@ -4,8 +4,8 @@
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
+import androidx.appcompat.app.AppCompatActivity;
 import com.squareup.sdk.reader.ReaderSdk;
 import com.squareup.sdk.reader.authorization.AuthorizationManager;
 import com.squareup.sdk.reader.authorization.AuthorizationState;

diff --git a/app/src/main/java/com/example/readersdk/CheckoutActivity.java b/app/src/main/java/com/example/readersdk/CheckoutActivity.java
@@ -3,14 +3,14 @@
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.squareup.sdk.reader.ReaderSdk;
 import com.squareup.sdk.reader.authorization.AuthorizationManager;
 import com.squareup.sdk.reader.authorization.AuthorizationState;

diff --git a/app/src/main/java/com/example/readersdk/ExampleApplication.java b/app/src/main/java/com/example/readersdk/ExampleApplication.java
@@ -2,7 +2,6 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.multidex.MultiDex;
 import com.squareup.sdk.reader.ReaderSdk;
 
 public class ExampleApplication extends Application {
@@ -14,6 +13,5 @@ public class ExampleApplication extends Application {
 
   @Override protected void attachBaseContext(Context base) {
     super.attachBaseContext(base);
-    MultiDex.install(this);
   }
 }
diff --git a/app/src/main/java/com/example/readersdk/JewelImageView.java b/app/src/main/java/com/example/readersdk/JewelImageView.java
@@ -4,13 +4,13 @@
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.Window;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
 import com.example.readersdk.util.AnimationListenerAdapter;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/java/com/example/readersdk/ManualCodeEntryActivity.java b/app/src/main/java/com/example/readersdk/ManualCodeEntryActivity.java
@@ -2,11 +2,11 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import com.example.readersdk.util.TextWatcherAdapter;
 
 public class ManualCodeEntryActivity extends AppCompatActivity {

diff --git a/app/src/main/java/com/example/readersdk/ScanQRCodeActivity.java b/app/src/main/java/com/example/readersdk/ScanQRCodeActivity.java
@@ -3,13 +3,13 @@
 import android.content.Intent;
 import android.graphics.PointF;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.view.ViewStub;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
 import com.dlazaro66.qrcodereaderview.QRCodeReaderView;
 import com.dlazaro66.qrcodereaderview.QRCodeReaderView.OnQRCodeReadListener;
+import com.google.android.material.snackbar.Snackbar;
 
 import static android.Manifest.permission.CAMERA;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;

diff --git a/app/src/main/java/com/example/readersdk/StartAuthorizeActivity.java b/app/src/main/java/com/example/readersdk/StartAuthorizeActivity.java
@@ -3,9 +3,9 @@
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import com.google.android.material.snackbar.Snackbar;
 
 public class StartAuthorizeActivity extends AppCompatActivity {
 

diff --git a/app/src/main/res/layout/manual_code_entry_activity.xml b/app/src/main/res/layout/manual_code_entry_activity.xml
@@ -17,7 +17,7 @@
       style="@style/TitleText"
       />
 
-  <android.support.design.widget.TextInputLayout
+  <com.google.android.material.textfield.TextInputLayout
       xmlns:android="http://schemas.android.com/apk/res/android"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -27,14 +27,14 @@
       android:hint="@string/authorization_code_hint"
       >
 
-    <android.support.design.widget.TextInputEditText
+    <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/authorization_code_edit_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:imeOptions="actionDone"
         android:inputType="text|textNoSuggestions"
         />
-  </android.support.design.widget.TextInputLayout>
+  </com.google.android.material.textfield.TextInputLayout>
 
   <Button
       android:id="@+id/authorize_button"

diff --git a/build.gradle b/build.gradle
@@ -4,12 +4,13 @@ buildscript {
     google()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.1.2'
+    classpath 'com.android.tools.build:gradle:3.4.1'
   }
 }
 
 allprojects {
   repositories {
+    google()
   }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -7,3 +7,7 @@ org.gradle.jvmargs=-Xmx4g
 
 ## The Application Secret from the OAuth tab in the Square Application Control Panel.
 ## SQUARE_READER_SDK_REPOSITORY_PASSWORD=
+
+android.useAndroidX=true
+
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip