From 3c8e8c54af47f4f8f8923f49c8ea959753a2827d Mon Sep 17 00:00:00 2001
From: victoraldir <vhaldir@gmail.com>
Date: Wed, 30 Jan 2019 21:29:39 -0200
Subject: [PATCH] Increase gradle version and migrate to androidx

---
 android/build.gradle                                 | 12 +++++++-----
 android/gradle.properties                            |  2 ++
 android/gradle/wrapper/gradle-wrapper.properties     |  4 ++--
 .../barcodescan/BarcodeScannerActivity.kt            |  4 ++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 51c81bd..49a8294 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -7,11 +7,12 @@ buildscript {
         maven {
             url "https://maven.google.com"
         }
+        google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.51'
+        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20"
     }
 }
 
@@ -21,6 +22,7 @@ rootProject.allprojects {
         maven {
             url "https://maven.google.com"
         }
+        google()
     }
 }
 
@@ -29,7 +31,6 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '27.0.3'
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -39,7 +40,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
@@ -47,7 +48,8 @@ android {
 }
 
 dependencies {
+    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.51'
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
-    api 'com.android.support:design:27.1.1'
+    api 'com.google.android.material:material:1.0.0-beta01'
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 8bd86f6..53ae0ae 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1 +1,3 @@
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index aa901e1..cee18ad 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Wed Jan 30 20:42:57 BRST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScannerActivity.kt b/android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScannerActivity.kt
index f8c211b..48848cd 100644
--- a/android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScannerActivity.kt
+++ b/android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScannerActivity.kt
@@ -5,8 +5,8 @@ import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
-import android.support.v4.app.ActivityCompat
-import android.support.v4.content.ContextCompat
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import android.view.Menu
 import android.view.MenuItem
 import com.google.zxing.Result