diff --git a/android/build.gradle b/android/build.gradle index 5597689f7..2076bd0a1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -17,9 +17,8 @@ android { //noinspection MinSdkTooLow minSdkVersion appAndroidMinSDK targetSdkVersion appAndroidTargetSDK + resourceConfigurations += ['en_US', 'cs', 'de', 'el', 'es', 'fr', 'hu', 'in', 'it', 'ja', 'ko', 'nl', 'pl', 'pt', 'ru', 'tr', 'uk', 'vi', 'zh_CN'] - resConfigs "en_US", "cs", "de", "el", "es", "fr", "hu", "in", "it", "ja", - "ko", "nl", "pl", "pt", "ru", "tr", "uk", "vi", "zh_CN" } buildTypes { diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro index 8d2ba327d..135584425 100644 --- a/android/proguard-rules.pro +++ b/android/proguard-rules.pro @@ -6,11 +6,6 @@ -keepclassmembers class * extends com.watabou.glscripts.Script -keepclassmembers class * implements com.watabou.utils.Bundlable -# retained to support meaningful stack traces -# note that the mapping file must be referenced in order to make sense of line numbers -# mapping file can be found in core/build/outputs/mapping after running a release build --keepattributes SourceFile,LineNumberTable - # libGDX stuff -dontwarn android.support.** -dontwarn com.badlogic.gdx.backends.android.AndroidFragmentApplication diff --git a/build.gradle b/build.gradle index 9c95d5362..2f1b3fe62 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.1' } } @@ -24,8 +24,8 @@ allprojects { appAndroidTargetSDK = 33 gdxVersion = '1.11.0' - gdxControllersVersion = '2.2.3-SNAPSHOT' - robovmVersion = '2.3.18' + gdxControllersVersion = '2.2.3' + robovmVersion = '2.3.19' } version = appVersionName diff --git a/gradle.properties b/gradle.properties index d6172b8d5..29b68ab81 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemor # 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 + +# Necessary to turn off certain R8 optimizations that would otherwise cause Shattered to crash +android.enableR8.fullMode=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1bef7e87..fae08049a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists