mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-23 01:24:26 +07:00
Code Issues Packages Projects Releases Wiki Activity

Gradle wrapper upgrade

Browse Source
This commit is contained in:
yairm210 2021-08-13 00:54:46 +03:00
parent c100d5fb09
commit 2161790f13
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/build.gradle.kts
View File

@ -56,10 +56,6 @@ android {
} }
} }
aaptOptions {
// Don't add local save files and fonts to release, obviously
ignoreAssetsPattern = "!SaveFiles:!fonts:!maps:!music:!mods"
}
lintOptions { lintOptions {
disable("MissingTranslation") disable("MissingTranslation")
} }
@ -67,6 +63,9 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_7 sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_1_7
} }
androidResources {
ignoreAssetsPattern = "!SaveFiles:!fonts:!maps:!music:!mods"
}
} }

2
build.gradle.kts
View File

@ -20,7 +20,7 @@ buildscript {
dependencies { dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${com.unciv.build.BuildConfig.kotlinVersion}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${com.unciv.build.BuildConfig.kotlinVersion}")
classpath("de.richsource.gradle.plugins:gwt-gradle-plugin:0.6") classpath("de.richsource.gradle.plugins:gwt-gradle-plugin:0.6")
classpath("com.android.tools.build:gradle:4.2.0") classpath("com.android.tools.build:gradle:7.0.0")
classpath("com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1") classpath("com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1")
// This is for wrapping the .jar file into a standalone executable // This is for wrapping the .jar file into a standalone executable

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip