From 60fb38dfc30b29fe1dd285c632caff17429c19ff Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 8 May 2021 23:24:57 +0300 Subject: [PATCH] New SDK versions, gradle properties, and androidx - this seems to solve the previous problems! --- android/build.gradle.kts | 8 ++++---- gradle.properties | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 gradle.properties diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 12288e260d..ca767799e7 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } android { - compileSdkVersion(29) + compileSdkVersion(30) sourceSets { getByName("main").apply { manifest.srcFile("AndroidManifest.xml") @@ -25,7 +25,7 @@ android { defaultConfig { applicationId = "com.unciv.app" minSdkVersion(14) - targetSdkVersion(29) + targetSdkVersion(30) versionCode = BuildConfig.appCodeNumber versionName = BuildConfig.appVersion @@ -129,8 +129,8 @@ tasks.register("run") { } dependencies { - implementation("androidx.core:core:1.2.0") - implementation("androidx.work:work-runtime-ktx:2.3.2") + implementation("androidx.core:core-ktx:1.3.2") + implementation("androidx.work:work-runtime-ktx:2.6.0-alpha02") } // sets up the Android Eclipse project, using the old Ant based build. diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000..d015431a85 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file