Merge branch 'main' into ios-observer-hooks

Author: louwers

.bazelignore

@@ -1,4 +1,9 @@
-bazel-bin
+.git
+node_modules
 bazel-out
+bazel-bin
 bazel-testlogs
-node_modules
+.cache
+.idea
+.vscode
+.cxx

.github/changed-files.yml

@@ -9,10 +9,11 @@ linux:
   - 'vendor/**'
   - 'CMakeLists.txt'
   - 'metrics/linux-gcc8-release-style.json'
-  - 'WORKSPACE'
+  - 'MODULE.bazel'
   - 'BUILD.bazel'
   - '.bazelrc'
   - '.bazelversion'
+  - '.bazelignore'
   - '!**/*.md'
 windows:
   - '.github/workflows/windows-ci.yml'
@@ -26,10 +27,6 @@ windows:
   - 'metrics/**'
   - 'vendor/**'
   - '.gitmodules'
-  - 'WORKSPACE'
-  - 'BUILD.bazel'
-  - '.bazelrc'
-  - '.bazelversion'
   - '!**/*.md'
 ios:
   - 'platform/ios/**'
@@ -46,10 +43,11 @@ ios:
   - 'test/**'
   - 'vendor/**'
   - '.gitmodules'
-  - 'WORKSPACE'
+  - 'MODULE.bazel'
   - 'BUILD.bazel'
   - '.bazelrc'
   - '.bazelversion'
+  - '.bazelignore'
   - 'pnpm-lock.yaml'
   - '!**/*.md'
 android:

.gitignore

@@ -1,22 +1,17 @@
-/mapbox-gl-native-android/MapLibreAndroid/mapbox-gl-native
-/mapbox-gl-native-android/MapLibreAndroidTestApp/mapbox-gl-native
 /platform/android/MapLibreAndroidTestApp/src/main/res/values/developer-config.xml
 
 /platform/android/gradle/configuration.gradle
 /platform/android/arm64-v8a
 /platform/android/armeabi-v7a
-/platform/android/MapLibreAndroid/.cxx
 /platform/android/MapLibreAndroid/build
 /platform/android/MapLibrePlugin/build
-/platform/android/MapLibreAndroidTestApp/.cxx
 /platform/android/MapLibreAndroidTestApp/build
 /platform/android/buildSrc/build
 /platform/android/x86
 /platform/android/x86_64
 /cmake-build-debug
 /platform/android/build
 /platform/android/MapLibreAndroid/src/main/assets/sdk_versions/com.mapbox.mapboxsdk
-/platform/ios/platform/ios/Mapbox.playground/build/
 /platform/windows/vendor/mesa3d/
 *.code-workspace
 
@@ -35,14 +30,11 @@ compile_commands.json
 /platform/android/signing-key.text
 /platform/android/.java-version
 *.hprof
-/platform/ios/platform/ios/benchmark/assets/tiles/tiles
-/platform/ios/platform/ios/benchmark/assets/glyphs/Roboto Regular,Noto Sans Regular
-/platform/ios/platform/ios/benchmark/assets/glyphs/Roboto Medium,Noto Sans Regular
-/platform/ios/platform/ios/benchmark/assets/glyphs/Roboto Condensed Italic,Noto Sans Italic
-/platform/ios/platform/ios/benchmark/assets/glyphs/Noto Sans Regular
 /platform/android/key.json
 /platform/android/site
 node_modules
+.cxx
+
 # Node binaries.
 /lib
 
@@ -59,5 +51,4 @@ __generated__
 cache.sqlite
 cache.sqlite-journal
 out.png
-/test/android/app/.cxx
 /test/android/app/build

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
   hooks:
   - id: clang-format
     files: '.*\.(hpp|cpp|h)'
-    exclude: '(vendor/.*|darwin/include/mbgl/storage/reachability.h)'
+    exclude: 'vendor/.*'
 - repo: https://github.com/keith/pre-commit-buildifier
   rev: 7.3.1
   hooks:

MODULE.bazel

@@ -64,7 +64,7 @@ bazel_dep(name = "rules_rust", version = "0.57.1")
 bazel_dep(name = "cxx.rs", version = "1.0.136")
 git_override(
     module_name = "cxx.rs",
-    commit = "fb8fdc0b20ddca8df80f6638bc773dc4824a8092",
+    commit = "94e8e46066b560fb9dc8964f047f68d066786916",
     remote = "https://github.com/dtolnay/cxx.git",
 )
 

benchmark/android/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

benchmark/android/gradle/wrapper/gradle-wrapper.properties

@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

benchmark/android/gradlew

@@ -16,6 +16,7 @@
   - [Tests](ios/ios-tests.md)
   - [Documentation](ios/ios-documentation.md)
   - [Release](ios/release.md)
+  - [Development Apps](ios/dev-apps.md)
 
 - [Design](./design/README.md)
   - [Ten Thousand Foot View](design/ten-thousand-foot-view.md)

docs/mdbook/src/SUMMARY.md

@@ -0,0 +1,37 @@
+# Development Apps
+
+There are two iOS apps available in the repo that you can use for MapLibre Native development. One Objective-C based app and a Swift based app.
+
+## Objective-C App
+
+This app is available as "App" in the [generated Xcode project](./README.md).
+
+The source code lives in `platform/ios/app`.
+
+You can also build and run it from the command line with:
+
+```
+bazel run --//:renderer=metal //platform/ios:App
+```
+
+<p align="center">
+  <img width="300" alt="Objective-C app screenshot" src="https://github.com/user-attachments/assets/aeb0cb5e-1f6c-439e-8668-22ee0a0b11f2" />
+</p>
+
+## Swift App
+
+The Swift App is mainly used to demo usage patterns in the [example documentation](./ios-documentation.md#examples).
+
+This app is available as "MapLibreApp" in the [generated Xcode project](./README.md).
+
+The source code lives in `platform/ios/swift-app`.
+
+<p align="center">
+  <img width="300" alt="Swift app screenshot" src="https://github.com/user-attachments/assets/87f4cea4-40dd-4744-a935-c7cebd6887f1" />
+</p>
+
+You can also build and run it from the command line with:
+
+```
+bazel run --//:renderer=metal //platform/ios/app-swift:MapLibreApp
+```

docs/mdbook/src/ios/dev-apps.md

@@ -15,6 +15,16 @@ public VulkanTextureViewRenderThread(@NonNull TextureView textureView, @NonNull
     super(textureView, mapRenderer);
   }
 
+  void cleanup() {
+    if (surface == null) {
+      return;
+    }
+
+    mapRenderer.onSurfaceDestroyed();
+    surface.release();
+    surface = null;
+  }
+
   // Thread implementation
 
   @Override
@@ -121,6 +131,7 @@ public void run() {
 
       // Signal we're done
       synchronized (lock) {
+        cleanup();
         this.exited = true;
         lock.notifyAll();
       }

platform/android/MapLibreAndroid/src/vulkan/java/org/maplibre/android/maps/renderer/textureview/VulkanTextureViewRenderThread.java

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

platform/android/MapLibrePlugin/gradle/wrapper/gradle-wrapper.jar

@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

platform/android/MapLibrePlugin/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

platform/android/MapLibrePlugin/gradlew

@@ -204,7 +204,6 @@ objc_library(
     ],
     hdrs = [
         "include/mbgl/interface/native_apple_interface.h",
-        "include/mbgl/storage/reachability.h",
         "include/mbgl/util/image+MLNAdditions.hpp",
     ],
     copts = WARNING_FLAGS["ios"] + MAPLIBRE_FLAGS + [
@@ -243,7 +242,6 @@ objc_library(
     }),
     hdrs = [
         "include/mbgl/interface/native_apple_interface.h",
-        "include/mbgl/storage/reachability.h",
         "include/mbgl/util/image+MLNAdditions.hpp",
     ],
     copts = CPP_FLAGS + MAPLIBRE_FLAGS + [