Merge pull request #233 from OpenBrickProtocolFoundation/maintenance_and_update_dependencies

Totto16 · web-flow · commit 472915ddb992 · 2025-08-18T20:34:28.000+02:00
Maintenance and update dependencies
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Setup NDK
         run: |
-          sdkmanager --install "ndk;29.0.13599879"
+          sdkmanager --install "ndk;29.0.13846066"
 
       - name: Build native libraries
         run: |
diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle
@@ -294,7 +294,7 @@ File getDiscordLib() {
     String target = getMesonBuildType() == 'release' ? 'release' : 'debug'
     String path = "../../../../subprojects/discord_social_sdk/lib/" + target + "/discord_partner_sdk.aar";
     File file = project.file(project.getLayout().getBuildDirectory().file(path));
-    if(!file.exists()){
+    if (!file.exists()) {
         throw new Exception("ERROR: discord aar is not present at the location we expected it to be!")
     }
 
@@ -322,7 +322,7 @@ android {
     }
 
     compileSdkVersion 35
-    ndkVersion "29.0.13599879"
+    ndkVersion = "29.0.13846066"
     defaultConfig {
         if (buildAsApplication) {
             applicationId "com.github.oopetris"
@@ -339,9 +339,9 @@ android {
         }
     }
     lint {
-        abortOnError false
+        abortOnError = false
     }
-    namespace 'com.github.oopetris'
+    namespace = 'com.github.oopetris'
     applicationVariants.all { variant ->
         tasks["merge${variant.name.capitalize()}Assets"]
                 .dependsOn("externalNativeBuild${variant.name.capitalize()}")
@@ -373,15 +373,15 @@ android {
         // Configures multiple APKs based on ABI.
         abi {
             // Enables building multiple APKs per ABI.
-            enable true
+            enable = true
             // By default all ABIs are included, so use reset() and include to specify that you only
             // want APKs for the ones with a ndk variant (4, android did in the past support more: https://developer.android.com/ndk/guides/abis.html#sa)
             // Resets the list of ABIs for Gradle to create APKs for to none.
             reset()
             // Specifies a list of ABIs for Gradle to create APKs for.
             include(*abisToUse)
             // Specifies that you don't want to also generate a universal APK that includes all ABIs.
-            universalApk(buildUniversalApk)
+            universalApk = buildUniversalApk
         }
     }
 
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.10.1'
+        classpath 'com.android.tools.build:gradle:8.12.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -20,6 +20,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register("clean", Delete) {
+    delete rootProject.layout.buildDirectory
 }
diff --git a/platforms/android/gradle/wrapper/gradle-wrapper.properties b/platforms/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 10 18:14:41 CEST 2025
+#Mon Aug 18 19:56:11 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/platforms/build-android.sh b/platforms/build-android.sh
@@ -11,8 +11,8 @@ if [ ! -d "toolchains" ]; then
     mkdir -p toolchains
 fi
 
-export NDK_VER_DOWNLOAD="r29-beta2"
-export NDK_VER_DESC="r29-beta2"
+export NDK_VER_DOWNLOAD="r29-beta3"
+export NDK_VER_DESC="r29-beta3"
 
 export BASE_PATH="$PWD/toolchains/android-ndk-$NDK_VER_DESC"
 export ANDROID_NDK_HOME="$BASE_PATH"
diff --git a/src/executables/game/application.hpp b/src/executables/game/application.hpp
@@ -150,9 +150,9 @@ struct Application final : public EventListener, public ServiceProvider {
 
     void handle_event(const SDL_Event& event) override;
 
-    virtual void update();
+    void update();
 
-    virtual void render() const;
+    void render() const;
 
 #if defined(__EMSCRIPTEN__)
     void loop_entry_emscripten();
diff --git a/subprojects/cpp-httplib.wrap b/subprojects/cpp-httplib.wrap
@@ -1,11 +1,11 @@
 [wrap-file]
-directory = cpp-httplib-0.23.1
-source_url = https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.23.1.tar.gz
-source_filename = cpp-httplib-0.23.1.tar.gz
-source_hash = 410a1347ed6bcbcc4a19af8ed8ad3873fe9fa97731d52db845c4c78f3f9c31e6
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cpp-httplib_0.23.1-1/cpp-httplib-0.23.1.tar.gz
-wrapdb_version = 0.23.1-1
-diff_files = cpp-httplib-0.23.1_mingw.diff
+directory = cpp-httplib-0.25.0
+source_url = https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.25.0.tar.gz
+source_filename = cpp-httplib-0.25.0.tar.gz
+source_hash = ac7c59fa72325d4cb9f73af266312d82632ac35a5c4c8a1be620c1f946ec9cea
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cpp-httplib_0.25.0-1/cpp-httplib-0.25.0.tar.gz
+wrapdb_version = 0.25.0-1
+diff_files = cpp-httplib-0.25.0_mingw.diff
 
 [provide]
 cpp-httplib = cpp_httplib_dep
diff --git a/subprojects/libpng.wrap b/subprojects/libpng.wrap
@@ -3,11 +3,11 @@ directory = libpng-1.6.50
 source_url = https://github.com/pnggroup/libpng/archive/v1.6.50.tar.gz
 source_filename = libpng-1.6.50.tar.gz
 source_hash = 71158e53cfdf2877bc99bcab33641d78df3f48e6e0daad030afe9cb8c031aa46
-patch_filename = libpng_1.6.50-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.50-1/get_patch
-patch_hash = d8f364bb5b5aa342ee0cfa17ef65746ebc37ad0aa9fabfe383f185dfdaa7d4ab
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.50-1/libpng-1.6.50.tar.gz
-wrapdb_version = 1.6.50-1
+patch_filename = libpng_1.6.50-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.50-2/get_patch
+patch_hash = a9c9362bb8cbb422c864807a174977dec3868cdff8ca380e27bab6ee1caa22ea
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.50-2/libpng-1.6.50.tar.gz
+wrapdb_version = 1.6.50-2
 
 [provide]
 libpng = libpng_dep
diff --git a/subprojects/packagefiles/cpp-httplib-0.25.0_mingw.diff b/subprojects/packagefiles/cpp-httplib-0.25.0_mingw.diff
diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
@@ -1,13 +1,13 @@
 [wrap-file]
 directory = zlib-1.3.1
 source_url = http://zlib.net/fossils/zlib-1.3.1.tar.gz
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3.1-1/zlib-1.3.1.tar.gz
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3.1-2/zlib-1.3.1.tar.gz
 source_filename = zlib-1.3.1.tar.gz
 source_hash = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
-patch_filename = zlib_1.3.1-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch
-patch_hash = e79b98eb24a75392009cec6f99ca5cdca9881ff20bfa174e8b8926d5c7a47095
-wrapdb_version = 1.3.1-1
+patch_filename = zlib_1.3.1-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-2/get_patch
+patch_hash = 9cacea02e1119964bc51e92dd2359b14df723a36cfe0df1c78d55d9c9f2763ae
+wrapdb_version = 1.3.1-2
 
 [provide]
 zlib = zlib_dep
diff --git a/tools/options/meson.build b/tools/options/meson.build
@@ -46,6 +46,11 @@ if get_option('run_in_ci')
         'checks': ['>=20', '<21'],
     }
 
+    clang_21_compiler = {
+        'id': 'clang',
+        'checks': ['>=21', '<22'],
+    }
+
     gcc_14_compiler = {
         'id': 'gcc',
         'checks': ['>=14', '<15'],
@@ -68,7 +73,7 @@ if get_option('run_in_ci')
 
     ci_config = {
         'cross_android': {
-            'compilers': [clang_20_compiler],
+            'compilers': [clang_21_compiler],
         },
         'cross_3ds': {
             'compilers': [gcc_14_compiler],

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`google()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:8.10.1'`
	`9`	`+ classpath 'com.android.tools.build:gradle:8.12.1'`
`10`	`10`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`
`@@ -20,6 +20,6 @@ allprojects {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`-task clean(type: Delete) {`
`24`		`- delete rootProject.buildDir`
	`23`	`+tasks.register("clean", Delete) {`
	`24`	`+ delete rootProject.layout.buildDirectory`
`25`	`25`	`}`