Merge pull request #184 from OpenBrickProtocolFoundation/udpate_andro…

…id_ndk Update Android NDK
OpenBrickProtocolFoundation · Oct 2, 2024 · e8a16dc · e8a16dc
2 parents 8fa991a + fa96f7f
commit e8a16dc
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Setup NDK
         run: |
-          sdkmanager --install "ndk;27.1.12297006"
+          sdkmanager --install "ndk;28.0.12433566"
 
       - name: Build native libraries
         run: |

diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle
@@ -247,14 +247,14 @@ android {
         targetCompatibility JavaVersion.VERSION_21
     }
 
-    compileSdkVersion 34
-    ndkVersion "27.1.12297006"
+    compileSdkVersion 35
+    ndkVersion "28.0.12433566"
     defaultConfig {
         if (buildAsApplication) {
             applicationId "com.github.oopetris"
         }
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 7
         versionName(versionString)
     }

diff --git a/platforms/android/app/jni/Application.mk b/platforms/android/app/jni/Application.mk
@@ -6,7 +6,7 @@ APP_STL := c++_shared
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
 
 # used SDK number
-APP_PLATFORM := android-34
+APP_PLATFORM := android-35
 
 # support 16KB page sizes:
 # see: https://developer.android.com/guide/practices/page-sizes 

diff --git a/platforms/android/build.gradle b/platforms/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.0'
+        classpath 'com.android.tools.build:gradle:8.6.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/platforms/android/gradle/wrapper/gradle-wrapper.properties b/platforms/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jan 02 02:01:38 CET 2024
+#Wed Oct 02 13:43:32 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/platforms/build-android.sh b/platforms/build-android.sh
@@ -4,8 +4,8 @@ set -e
 
 mkdir -p toolchains
 
-export NDK_VER_DOWNLOAD="r27b"
-export NDK_VER_DESC="r27b"
+export NDK_VER_DOWNLOAD="r28-beta1"
+export NDK_VER_DESC="r28-beta1"
 
 export BASE_PATH="$PWD/toolchains/android-ndk-$NDK_VER_DESC"
 export ANDROID_NDK_HOME="$BASE_PATH"