diff --git a/app_solcraftlauncher/build.gradle b/app_solcraftlauncher/build.gradle index 4dcd0f183c..3c9003fc94 100644 --- a/app_solcraftlauncher/build.gradle +++ b/app_solcraftlauncher/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.android.application' version '7.4.2' + id 'com.android.application' version '8.2.2' } static def getDate() { return new Date().format('yyyyMMdd') } @@ -92,9 +92,6 @@ android { compileSdk = 33 - lintOptions { - abortOnError false - } signingConfigs { customDebug { @@ -176,8 +173,8 @@ android { packagingOptions { jniLibs { useLegacyPackaging = true + pickFirsts += ['**/libbytehook.so'] } - pickFirst '**/libbytehook.so' } buildFeatures { @@ -185,6 +182,9 @@ android { } buildToolsVersion = '33.0.2' + lint { + abortOnError false + } } dependencies { diff --git a/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/arc_dns_injector.jar b/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/arc_dns_injector.jar index 447ec038b0..9eced532fe 100644 Binary files a/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/arc_dns_injector.jar and b/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/arc_dns_injector.jar differ diff --git a/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/version b/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/version index b0b003b9e5..51a0f92d8b 100644 --- a/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/version +++ b/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/version @@ -1 +1 @@ -1713062657165 \ No newline at end of file +1713398722142 \ No newline at end of file diff --git a/app_solcraftlauncher/src/main/assets/components/forge_installer/forge_installer.jar b/app_solcraftlauncher/src/main/assets/components/forge_installer/forge_installer.jar index c540bee9c3..b406e803fb 100644 Binary files a/app_solcraftlauncher/src/main/assets/components/forge_installer/forge_installer.jar and b/app_solcraftlauncher/src/main/assets/components/forge_installer/forge_installer.jar differ diff --git a/app_solcraftlauncher/src/main/assets/components/forge_installer/version b/app_solcraftlauncher/src/main/assets/components/forge_installer/version index 3fdc618526..32ccb8814f 100644 --- a/app_solcraftlauncher/src/main/assets/components/forge_installer/version +++ b/app_solcraftlauncher/src/main/assets/components/forge_installer/version @@ -1 +1 @@ -1713062657471 \ No newline at end of file +1713398722416 \ No newline at end of file diff --git a/app_solcraftlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar b/app_solcraftlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar index dad1d35638..7de4495a8b 100644 Binary files a/app_solcraftlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar and b/app_solcraftlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar differ diff --git a/app_solcraftlauncher/src/main/assets/components/lwjgl3/version b/app_solcraftlauncher/src/main/assets/components/lwjgl3/version index 557b387782..cc068ea917 100644 --- a/app_solcraftlauncher/src/main/assets/components/lwjgl3/version +++ b/app_solcraftlauncher/src/main/assets/components/lwjgl3/version @@ -1 +1 @@ -1713062657984 \ No newline at end of file +1713398722692 \ No newline at end of file diff --git a/app_solcraftlauncher/src/main/res/drawable/mine_button_unfocused.9.png b/app_solcraftlauncher/src/main/res/drawable/mine_button_unfocused.9.png index cb0a650413..abf0eb6c86 100644 Binary files a/app_solcraftlauncher/src/main/res/drawable/mine_button_unfocused.9.png and b/app_solcraftlauncher/src/main/res/drawable/mine_button_unfocused.9.png differ diff --git a/app_solcraftlauncher/src/main/res/values/colors.xml b/app_solcraftlauncher/src/main/res/values/colors.xml index ed07e6cbd9..ce0ad65398 100644 --- a/app_solcraftlauncher/src/main/res/values/colors.xml +++ b/app_solcraftlauncher/src/main/res/values/colors.xml @@ -3,7 +3,7 @@ #4CC4C4C4 #4D000000 - #57CC33 + #FF0000 #181818 #464646 #242424 diff --git a/gradle.properties b/gradle.properties index 3b75d50b70..3ab49fdc01 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,4 +3,7 @@ org.gradle.configureondemand=true android.useAndroidX=true android.bundle.language.enableSplit=false -org.gradle.jvmargs=-Xmx8G \ No newline at end of file +org.gradle.jvmargs=-Xmx8G +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 508322917b..a363877439 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists