From 7a4875e92161c034fdd513bae7b513181e47f85a Mon Sep 17 00:00:00 2001 From: Natalie Chouinard Date: Sat, 9 Mar 2019 14:53:20 -0800 Subject: [PATCH] Migrate to AndroidX --- app/build.gradle | 2 +- .../java/com/natalieperna/cupful/activities/MainActivity.java | 2 +- gradle.properties | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1bd60e3..326f6e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'com.toptoche.searchablespinner:searchablespinnerlibrary:1.3.1' implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1' } diff --git a/app/src/main/java/com/natalieperna/cupful/activities/MainActivity.java b/app/src/main/java/com/natalieperna/cupful/activities/MainActivity.java index fe1d267..f50c6cb 100644 --- a/app/src/main/java/com/natalieperna/cupful/activities/MainActivity.java +++ b/app/src/main/java/com/natalieperna/cupful/activities/MainActivity.java @@ -1,7 +1,7 @@ package com.natalieperna.cupful.activities; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.text.Editable; import android.view.View; import android.widget.AdapterView; diff --git a/gradle.properties b/gradle.properties index 1d3591c..915f0e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file