diff --git a/Android/app/app.iml b/Android/app/app.iml
index 0acc28ba..7966d8e3 100644
--- a/Android/app/app.iml
+++ b/Android/app/app.iml
@@ -4,6 +4,8 @@
+
+
@@ -24,23 +26,23 @@
-
-
+
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -83,74 +85,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
index e520ca8e..824071ee 100644
--- a/Android/app/build.gradle
+++ b/Android/app/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 27
+ compileSdkVersion 29
signingConfigs {
release {
storeFile file("release2.keystore")
@@ -28,9 +28,9 @@ android {
defaultConfig {
applicationId "org.deadc0de.apple2ix.basic"
minSdkVersion 14
- targetSdkVersion 27
+ targetSdkVersion 29
versionCode 24
- versionName "2.0.1"
+ versionName "2.1.0-RC1"
ndk {
moduleName "apple2ix"
}
@@ -39,5 +39,5 @@ android {
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
- api 'com.android.support:appcompat-v7:27.1.1'
+ api 'androidx.appcompat:appcompat:1.0.0'
}
diff --git a/Android/build.gradle b/Android/build.gradle
index 44c10be6..c93c15b1 100644
--- a/Android/build.gradle
+++ b/Android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.4.1'
+ classpath 'com.android.tools.build:gradle:3.5.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/Android/gradle.properties b/Android/gradle.properties
index c04c048e..223c6a00 100644
--- a/Android/gradle.properties
+++ b/Android/gradle.properties
@@ -17,3 +17,5 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties
index de7d3398..f89f99dd 100644
--- a/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 24 08:44:26 PDT 2019
+#Sun Oct 27 16:51:42 PDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip