minenux/minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Android: update deps

Browse Source
This commit is contained in:
Maksym H 2023-10-05 20:32:47 +03:00 committed by mckaygerhard
parent d78e41a0f0
commit 80d583e219
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android/app/build.gradle
View File

@ -125,7 +125,7 @@ dependencies {
/* Third-party libraries */ /* Third-party libraries */
implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.appcompat:appcompat-resources:1.6.1' implementation 'androidx.appcompat:appcompat-resources:1.6.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.work:work-runtime-ktx:2.8.1' implementation 'androidx.work:work-runtime-ktx:2.8.1'
implementation 'com.google.android.material:material:1.9.0' implementation 'com.google.android.material:material:1.9.0'
} }

2
Android/app/src/main/java/org/libsdl/app/SDLActivity.java
View File

@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
private static final String TAG = "SDL"; private static final String TAG = "SDL";
private static final int SDL_MAJOR_VERSION = 2; private static final int SDL_MAJOR_VERSION = 2;
private static final int SDL_MINOR_VERSION = 28; private static final int SDL_MINOR_VERSION = 28;
private static final int SDL_MICRO_VERSION = 2; private static final int SDL_MICRO_VERSION = 4;
/* /*
// Display InputType.SOURCE/CLASS of events and devices // Display InputType.SOURCE/CLASS of events and devices
// //

4
Android/build.gradle
View File

@ -16,10 +16,10 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.1.0' classpath 'com.android.tools.build:gradle:8.1.2'
//noinspection GradleDependency //noinspection GradleDependency
classpath 'de.undercouch:gradle-download-task:4.1.2' classpath 'de.undercouch:gradle-download-task:4.1.2'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }

4
Android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Mon Aug 21 21:17:06 EEST 2023 #Thu Oct 05 18:46:10 EEST 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

10
Android/native/build.gradle
View File

@ -50,17 +50,19 @@ android {
} }
// get precompiled deps // get precompiled deps
def buildDirectory = layout.buildDirectory.get().asFile
tasks.register('downloadDeps', Download) { tasks.register('downloadDeps', Download) {
def VERSION = "11082023" def VERSION = "05102023"
src "https://gitlab.com/minetest-stuffs/multicraft-deps_androit/-/archive/11082023/multicraft-deps_androit-11082023.zip" src "https://github.com/MultiCraft/deps_android/releases/download/$VERSION/deps_android.zip"
dest new File(buildDir, 'deps.zip') dest new File(buildDirectory, 'deps.zip')
overwrite false overwrite false
} }
tasks.register('getDeps', Copy) { tasks.register('getDeps', Copy) {
dependsOn downloadDeps dependsOn downloadDeps
def deps = file('deps') def deps = file('deps')
def f = file("$buildDir/deps_android") def f = file("$buildDirectory/deps_android")
if (!f.exists()) { if (!f.exists()) {
from zipTree(downloadDeps.dest) from zipTree(downloadDeps.dest)

2
Android/native/jni/Application.mk
View File

@ -10,7 +10,7 @@ else
APP_CFLAGS := -g -D_DEBUG -O1 -fno-omit-frame-pointer APP_CFLAGS := -g -D_DEBUG -O1 -fno-omit-frame-pointer
endif endif
APP_CFLAGS += -fexceptions APP_CFLAGS += -fexceptions -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
APP_CXXFLAGS := $(APP_CFLAGS) -frtti -std=gnu++17 #-Werror=shorten-64-to-32 APP_CXXFLAGS := $(APP_CFLAGS) -frtti -std=gnu++17 #-Werror=shorten-64-to-32