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

Android: update dependencies

Browse Source
This commit is contained in:
Maksym H 2023-02-23 23:58:24 +02:00
parent 28aa79f211
commit d4880b5ecb
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Android/app/build.gradle
View File

@ -3,8 +3,8 @@ apply plugin: 'kotlin-android'
android { android {
compileSdkVersion 33 compileSdkVersion 33
buildToolsVersion '33.0.0' buildToolsVersion '33.0.2'
ndkVersion '25.1.8937393' ndkVersion '25.2.9519653'
defaultConfig { defaultConfig {
applicationId 'com.multicraft.game' applicationId 'com.multicraft.game'
minSdkVersion 21 minSdkVersion 21
@ -118,9 +118,9 @@ dependencies {
implementation project(':native') implementation project(':native')
/* Third-party libraries */ /* Third-party libraries */
implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.appcompat:appcompat-resources:1.5.1' implementation 'androidx.appcompat:appcompat-resources:1.6.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
implementation 'androidx.work:work-runtime-ktx:2.7.1' implementation 'androidx.work:work-runtime-ktx:2.8.0'
implementation 'com.google.android.material:material:1.7.0' implementation 'com.google.android.material:material:1.8.0'
} }

4
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 = 26; private static final int SDL_MINOR_VERSION = 26;
private static final int SDL_MICRO_VERSION = 1; private static final int SDL_MICRO_VERSION = 3;
/* /*
// Display InputType.SOURCE/CLASS of events and devices // Display InputType.SOURCE/CLASS of events and devices
// //
@ -546,7 +546,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
} else { } else {
//nativeFocusChanged(false); // CHANGED! //nativeFocusChanged(false); // CHANGED!
if (!mHasMultiWindow) { if (!mHasMultiWindow) {
mNextNativeState = NativeState.PAUSED; //mNextNativeState = NativeState.PAUSED; // CHANGED!
SDLActivity.handleNativeState(); SDLActivity.handleNativeState();
} }
} }

4
Android/build.gradle
View File

@ -16,10 +16,10 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.3.1' classpath 'com.android.tools.build:gradle:7.4.1'
//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.7.21' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.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
} }

6
Android/native/build.gradle
View File

@ -3,8 +3,8 @@ apply plugin: 'de.undercouch.download'
android { android {
compileSdkVersion 33 compileSdkVersion 33
buildToolsVersion '33.0.0' buildToolsVersion '33.0.2'
ndkVersion '25.1.8937393' ndkVersion '25.2.9519653'
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 33 targetSdkVersion 33
@ -50,7 +50,7 @@ android {
// get precompiled deps // get precompiled deps
task downloadDeps(type: Download) { task downloadDeps(type: Download) {
def VERSION = "17012023" def VERSION = "22022023"
src "https://github.com/MultiCraft/deps_android/releases/download/$VERSION/deps_android.zip" src "https://github.com/MultiCraft/deps_android/releases/download/$VERSION/deps_android.zip"
dest new File(buildDir, 'deps.zip') dest new File(buildDir, 'deps.zip')
overwrite false overwrite false