diff --git a/android/build.gradle.kts b/android/build.gradle.kts index ea6a3ef054..256bac8b02 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -56,6 +56,10 @@ android { } } + aaptOptions { + // Don't add local save files and fonts to release, obviously + ignoreAssetsPattern = "!SaveFiles:!fonts:!maps:!music:!mods" + } lintOptions { disable("MissingTranslation") } @@ -63,9 +67,6 @@ android { sourceCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_1_7 } - androidResources { - ignoreAssetsPattern = "!SaveFiles:!fonts:!maps:!music:!mods" - } } diff --git a/build.gradle.kts b/build.gradle.kts index 7a4510317d..11449ba140 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ buildscript { dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${com.unciv.build.BuildConfig.kotlinVersion}") classpath("de.richsource.gradle.plugins:gwt-gradle-plugin:0.6") - classpath("com.android.tools.build:gradle:7.0.0") + classpath("com.android.tools.build:gradle:4.2.0") classpath("com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1") // This is for wrapping the .jar file into a standalone executable diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6d7a5dd264..f7493acd03 100644 --- 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-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip