Merge branch 'master' into string_view

.github/workflows/android.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: [ubuntu-latest]
     container:
-      image: registry.gitlab.com/jhasse/android-ndk-docker:r26b
+      image: registry.gitlab.com/jhasse/android-ndk-docker:r27
     steps:
     - uses: actions/checkout@v4
     - name: Cache CPM.cmake packages

.github/workflows/linux.yml

@@ -2,7 +2,7 @@ name: Linux
 on: [push]
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Install dependencies

.github/workflows/macos.yml

@@ -12,6 +12,10 @@ jobs:
       run: |
         cmake -H. -Bbuild-cmake -GNinja
         ninja -Cbuild-cmake
+    # - uses: actions/setup-java@v4
+    #   with:
+    #     java-version: '17'
+    #     distribution: 'zulu'
     # - name: Android
     #   run: |
     #     make -Candroid

.gitlab-ci.yml

@@ -36,7 +36,7 @@ mingw:
     - ninja -C build-release
 
 android:
-  image: registry.gitlab.com/jhasse/android-ndk-docker:r26b
+  image: registry.gitlab.com/jhasse/android-ndk-docker:r27
   stage: build
   script:
     - make -C android

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.13)
 project(jngl LANGUAGES C CXX)
 
 if(MSVC)
-	string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
+	string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus /wd4244 /wd4305")
 else()
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fdiagnostics-color")

README.md

@@ -25,9 +25,8 @@ cmake --build build
 ### Ubuntu
 
 ```
-sudo apt-get install libgl1-mesa-dev libfreetype6-dev libfontconfig1-dev libxxf86vm-dev \
-libpng-dev libvorbis-dev cmake g++ \
-libwebp-dev git libsdl2-dev
+sudo apt-get install libgl1-mesa-dev libfreetype6-dev libfontconfig1-dev libpng-dev \
+libxxf86vm-dev libvorbis-dev cmake g++ libwebp-dev git libsdl2-dev
 ```
 
 ### Fedora

android/test/app/build.gradle

@@ -9,7 +9,8 @@ android {
     defaultConfig {
         applicationId = 'com.bixense.jngl_test'
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
+        compileSdk 34
         externalNativeBuild {
             cmake {
                 arguments "-DANDROID_STL=c++_shared"
@@ -32,12 +33,11 @@ android {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
-    compileSdkVersion 33
-    ndkVersion '26.1.10909125'
+    ndkVersion '27.0.11718014'
     namespace 'com.bixense.jngl_test'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.google.oboe:oboe:1.7.0'
+    implementation 'com.google.oboe:oboe:1.8.1'
 }

android/test/build.gradle

@@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.android.tools.build:gradle:8.4.1'
     }
 }
 
@@ -16,6 +16,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
 }

android/test/gradle.properties

@@ -1,22 +1,17 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
 # When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
-
+#Sat Apr 20 17:10:58 CEST 2024
 android.native.buildOutput=verbose
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=true
 android.nonFinalResIds=true
+android.nonTransitiveRClass=true
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"

android/test/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Thu Oct 15 14:42:09 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip