From d4880b5ecb6a1bbf1267297e2aa2311990dd6ae9 Mon Sep 17 00:00:00 2001 From: Maksym H Date: Thu, 23 Feb 2023 23:58:24 +0200 Subject: [PATCH] Android: update dependencies --- Android/app/build.gradle | 12 ++++++------ .../src/main/java/org/libsdl/app/SDLActivity.java | 4 ++-- Android/build.gradle | 4 ++-- Android/native/build.gradle | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Android/app/build.gradle b/Android/app/build.gradle index 977dde90e..0743a32cd 100644 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 33 - buildToolsVersion '33.0.0' - ndkVersion '25.1.8937393' + buildToolsVersion '33.0.2' + ndkVersion '25.2.9519653' defaultConfig { applicationId 'com.multicraft.game' minSdkVersion 21 @@ -118,9 +118,9 @@ dependencies { implementation project(':native') /* Third-party libraries */ - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'androidx.appcompat:appcompat-resources:1.5.1' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.appcompat:appcompat-resources:1.6.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' - implementation 'androidx.work:work-runtime-ktx:2.7.1' - implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.work:work-runtime-ktx:2.8.0' + implementation 'com.google.android.material:material:1.8.0' } diff --git a/Android/app/src/main/java/org/libsdl/app/SDLActivity.java b/Android/app/src/main/java/org/libsdl/app/SDLActivity.java index 4e5501084..f2371fc45 100644 --- a/Android/app/src/main/java/org/libsdl/app/SDLActivity.java +++ b/Android/app/src/main/java/org/libsdl/app/SDLActivity.java @@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh private static final String TAG = "SDL"; private static final int SDL_MAJOR_VERSION = 2; 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 // @@ -546,7 +546,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh } else { //nativeFocusChanged(false); // CHANGED! if (!mHasMultiWindow) { - mNextNativeState = NativeState.PAUSED; + //mNextNativeState = NativeState.PAUSED; // CHANGED! SDLActivity.handleNativeState(); } } diff --git a/Android/build.gradle b/Android/build.gradle index d74656c62..ebb4e3ba0 100644 --- a/Android/build.gradle +++ b/Android/build.gradle @@ -16,10 +16,10 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.4.1' //noinspection GradleDependency 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 // in the individual module build.gradle files } diff --git a/Android/native/build.gradle b/Android/native/build.gradle index 9d937379d..27108992f 100644 --- a/Android/native/build.gradle +++ b/Android/native/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'de.undercouch.download' android { compileSdkVersion 33 - buildToolsVersion '33.0.0' - ndkVersion '25.1.8937393' + buildToolsVersion '33.0.2' + ndkVersion '25.2.9519653' defaultConfig { minSdkVersion 21 targetSdkVersion 33 @@ -50,7 +50,7 @@ android { // get precompiled deps task downloadDeps(type: Download) { - def VERSION = "17012023" + def VERSION = "22022023" src "https://github.com/MultiCraft/deps_android/releases/download/$VERSION/deps_android.zip" dest new File(buildDir, 'deps.zip') overwrite false