Merge pull request #214 from OpenBrickProtocolFoundation/update_ndk_to_29_beta_1

build: update the ndk to v29 beta1

Author: Totto16

.github/workflows/android.yml

@@ -46,7 +46,7 @@ jobs:
 
       - name: Setup NDK
         run: |
-          sdkmanager --install "ndk;28.0.13004108"
+          sdkmanager --install "ndk;29.0.13113456"
 
       - name: Build native libraries
         run: |

.github/workflows/build.yml

@@ -89,7 +89,7 @@ jobs:
         uses: TheMrMilchmann/setup-msvc-dev@v3
         with:
           arch: x64
-          toolset: '14.42'
+          toolset: '14.43'
 
       - name: Setup MYSYS2 (Windows)
         if: matrix.config.os == 'windows' && ( matrix.config.environment == 'mingw' || matrix.config.environment == 'ucrt' )

.github/workflows/web_build.yml

@@ -29,8 +29,7 @@ jobs:
 
       - name: Build
         run: |
-          bash ./platforms/build-web.sh
-          meson test -C build-web
+          ENABLE_TESTING=1 bash ./platforms/build-web.sh
 
       # TODO upload page to gh-pages!
       - name: Upload artifacts

.github/workflows/windows_installer.yml

@@ -24,7 +24,7 @@ jobs:
         uses: TheMrMilchmann/setup-msvc-dev@v3
         with:
           arch: x64
-          toolset: '14.42'
+          toolset: '14.43'
 
       - name: Setup meson
         run: |

platforms/android/app/build.gradle

@@ -248,7 +248,7 @@ android {
     }
 
     compileSdkVersion 35
-    ndkVersion "28.0.13004108"
+    ndkVersion "29.0.13113456"
     defaultConfig {
         if (buildAsApplication) {
             applicationId "com.github.oopetris"

platforms/android/build.gradle

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

platforms/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Oct 02 13:43:32 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

platforms/build-android.sh

@@ -6,8 +6,8 @@ if [ ! -d "toolchains" ]; then
     mkdir -p toolchains
 fi
 
-export NDK_VER_DOWNLOAD="r28"
-export NDK_VER_DESC="r28"
+export NDK_VER_DOWNLOAD="r29-beta1"
+export NDK_VER_DESC="r29-beta1"
 
 export BASE_PATH="$PWD/toolchains/android-ndk-$NDK_VER_DESC"
 export ANDROID_NDK_HOME="$BASE_PATH"

platforms/build-web.sh

@@ -159,3 +159,9 @@ if [ "$COMPILE_TYPE" == "complete_rebuild" ] || [ ! -e "$BUILD_DIR" ]; then
 fi
 
 meson compile -C "$BUILD_DIR"
+
+if [ -n "$ENABLE_TESTING" ]; then
+
+    meson test -C "$BUILD_DIR"
+
+fi