Merge branch 'maven_central_migration'

# Conflicts:
#	README.md
#	platform/android/MapLibreAndroid/gradle.properties
#	platform/android/README.md
#	platform/android/build.gradle.kts
#	platform/android/buildSrc/src/main/kotlin/maplibre.artifact-settings.gradle.kts
#	platform/android/buildSrc/src/main/kotlin/maplibre.publish-root.gradle.kts
#	platform/android/docs/getting-started.md
#	test/android/build/reports/problems/problems-report.html

Author: mranawaqas

.github/workflows/android-ci.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Get all Android files that have changed
         if: github.event_name != 'workflow_dispatch'
         id: changed-files
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v46
         with:
           files_yaml_from_source_file: .github/changed-files.yml
 

.github/workflows/android-device-test.yml

@@ -150,7 +150,14 @@ jobs:
           export testSpecArn="${{ matrix.test.testSpecArn }}"
           export wait_for_completion=true
 
-          echo run_arn="$(./scripts/aws-device-farm/aws-device-farm-run.sh)" > "$GITHUB_ENV"
+          run_arn="$(./scripts/aws-device-farm/aws-device-farm-run.sh)"
+          exit_status=$?
+          echo "run_arn=$run_arn" >> "$GITHUB_ENV"
+
+          # make sure workflow fails
+          if [ $exit_status -ne 0 ]; then
+            exit $exit_status
+          fi
 
       - name: Store Test Artifacts
         if: (matrix.test.name == 'Android Benchmark' || failure()) && env.run_device_test == 'true'

.github/workflows/gh-pages-mdbook.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: extractions/setup-just@v2
+      - uses: extractions/setup-just@v3
       - name: Setup mdBook
         uses: peaceiris/actions-mdbook@v2
       - name: Install Dependencies

.github/workflows/ios-ci.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Get all iOS files that have changed
         if: github.event_name != 'workflow_dispatch'
         id: changed-files-yaml
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v46
         with:
           files_yaml_from_source_file: .github/changed-files.yml
 
@@ -215,7 +215,7 @@ jobs:
 
       - name: VERSION file changed
         id: version-file-ios-changed
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v46
         with:
           files: platform/ios/VERSION
 

.github/workflows/linux-ci.yml

@@ -38,7 +38,7 @@ jobs:
         if: github.event_name != 'workflow_dispatch'
         id: changed-files
 
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v46
         with:
           files_yaml_from_source_file: .github/changed-files.yml
 

.github/workflows/node-release.yml

@@ -67,15 +67,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
+          submodules: true
           fetch-depth: 0
 
-      - name: Setup submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c core.longpaths=true -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive || true
-
       - name: Get OS Architecture
         if: runner.os == 'MacOS' || runner.os == 'Linux'
         run: uname -m
@@ -106,7 +100,6 @@ jobs:
             libcurl4-openssl-dev \
             libglfw3-dev \
             libuv1-dev \
-            g++-12 \
             libjpeg-dev \
             libpng-dev \
             libwebp-dev
@@ -137,7 +130,7 @@ jobs:
         if: ${{contains(runner.name, 'GitHub Actions')}}
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '3.29.2'
+          cmake-version: '3.31'
 
       - name: cmake version
         run: |
@@ -174,14 +167,7 @@ jobs:
       - name: Configure maplibre-native (MacOS)
         if: runner.os == 'MacOS'
         run: |
-          cmake . -B build \
-            -G Ninja \
-            -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-            -DMLN_WITH_NODE=ON \
-            -DMLN_WITH_OPENGL=OFF \
-            -DMLN_WITH_METAL=ON \
-            -DMLN_WITH_WERROR=OFF
+          cmake --preset macos-node -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }}
 
       - name: Configure maplibre-native (Linux)
         if: runner.os == 'Linux'
@@ -191,7 +177,6 @@ jobs:
             -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} \
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
             -DCMAKE_C_COMPILER=gcc-12 \
-            -DCMAKE_CXX_COMPILER=g++-12 \
             -DMLN_WITH_NODE=ON
 
       - name: "Create directory '${{ github.workspace }}/platform/windows/vendor/vcpkg/bincache' (Windows)"
@@ -214,11 +199,12 @@ jobs:
 
       - name: Configure maplibre-native (Windows)
         if: runner.os == 'Windows'
+        shell: pwsh
         run: |
-          cmake . -B build \
-            -G Ninja \
-            -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
+          cmake . -B build `
+            -G Ninja `
+            -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} `
+            -DCMAKE_CXX_COMPILER_LAUNCHER=sccache `
             -DMLN_WITH_NODE=ON
 
       - name: Build maplibre-native (MacOS/Linux)

.github/workflows/windows-ci.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Get all Windows files that have changed
         if: github.event_name != 'workflow_dispatch'
         id: changed-files
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v46
         with:
           files_yaml_from_source_file: .github/changed-files.yml
 

.gitmodules

@@ -57,7 +57,7 @@
 	url = https://github.com/protomaps/PMTiles.git
 [submodule "vendor/maplibre-native-base/extras/args"]
 	path = vendor/maplibre-native-base/extras/args
-	url = git@github.com:Taywee/args.git
+	url = https://github.com/Taywee/args
 [submodule "vendor/maplibre-native-base/extras/expected-lite"]
 	path = vendor/maplibre-native-base/extras/expected-lite
 	url = https://github.com/martinmoene/expected-lite.git

CMakePresets.json

@@ -28,21 +28,36 @@
         "CMAKE_SYSTEM_NAME": "Darwin",
         "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
         "MLN_WITH_METAL": "ON",
-        "MLN_WITH_OPENGL": "OFF"
+        "MLN_WITH_OPENGL": "OFF",
+        "CMAKE_BUILD_TYPE": "Debug"
       }
     },
+    {
+      "name": "macos-xcode",
+      "displayName": "macOS (Xcode)",
+      "generator": "Xcode",
+      "binaryDir": "${sourceDir}/build-macos-xcode",
+      "inherits": "macos"
+    },
     {
       "name": "macos-vulkan",
-      "displayName": "macOS",
+      "displayName": "macOS Vulkan",
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build-macos-vulkan",
+      "inherits": "macos",
       "cacheVariables": {
-        "CMAKE_SYSTEM_NAME": "Darwin",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
         "MLN_WITH_VULKAN": "ON",
+        "MLN_WITH_METAL": "OFF",
         "MLN_WITH_OPENGL": "OFF"
       }
     },
+    {
+      "name": "macos-vulkan-xcode",
+      "displayName": "macOS Vulkan (Xcode)",
+      "generator": "Xcode",
+      "binaryDir": "${sourceDir}/build-macos-vulkan-xcode",
+      "inherits": "macos-vulkan"
+    },
     {
       "name": "macos-node",
       "inherits": "macos",

docs/mdbook/src/SUMMARY.md

@@ -2,24 +2,23 @@
 
 [Introduction](./introduction.md)
 
-- [Platforms](./platforms.md)
+- [Platforms](./platforms/README.md)
+  - [Android](./platforms/android/README.md)
+    - [Tests](./platforms/android/android-tests.md)
+    - [Documentation](./platforms/android/android-documentation.md)
+    - [Benchmark](./platforms/android/benchmark.md)
+    - [Release](./platforms/android/release.md)
+  - [iOS](./platforms/ios/README.md)
+    - [Tests](./platforms/ios/ios-tests.md)
+    - [Documentation](./platforms/ios/ios-documentation.md)
+    - [Release](./platforms/ios/release.md)
+    - [Development Apps](./platforms/ios/dev-apps.md)
+  - [macOS](./platforms/macos/README.md)
 
 - [Release Policy](./release-policy.md)
 
 - [Render Tests](./render-tests.md)
 
-- [Android](./android/README.md)
-  - [Tests](./android/android-tests.md)
-  - [Documentation](./android/android-documentation.md)
-  - [Benchmark](./android/benchmark.md)
-  - [Release](android/release.md)
-
-- [iOS](./ios/README.md)
-  - [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)
   - [Coordinate System](design/coordinate-system.md)