global ubo bind custom layer

.bazelignore

@@ -1,4 +1,4 @@
 bazel-bin
 bazel-out
 bazel-testlogs
-node_modules
+node_modules

.bazelrc

@@ -7,4 +7,4 @@ common --incompatible_disallow_empty_glob
 
 coverage --experimental_ui_max_stdouterr_bytes=10485760
 
-common:macos --linkopt=-L/opt/homebrew/lib
+common:macos --linkopt=-L/opt/homebrew/lib

.bazelversion

@@ -1 +1 @@
-7.3.1
+8.0.0

.github/ISSUE_TEMPLATE/config.yml

@@ -6,4 +6,3 @@ contact_links:
   - name: "💬 Chat with us on Slack"
     url: https://slack.openstreetmap.us/
     about: "Join #maplibre-native on the Open Street Map Slack"
-

.github/actions/android-build-and-upload-render-test/action.yml

@@ -22,4 +22,4 @@ runs:
         if-no-files-found: error
         path: |
           ./render-test/android/RenderTestsApp-${{ inputs.flavor }}.apk
-          ./render-test/android/RenderTests-${{ inputs.flavor }}.apk
+          ./render-test/android/RenderTests-${{ inputs.flavor }}.apk

.github/actions/get-pr-number/action.yml

@@ -16,4 +16,4 @@ runs:
 
     - id: cat
       run: echo pr-number="$(cat ./pr_number)" >> $GITHUB_OUTPUT
-      shell: bash
+      shell: bash

.github/actions/save-pr-number/action.yml

@@ -13,4 +13,4 @@ runs:
         uses: actions/upload-artifact@v3
         with:
           name: pr-number
-          path: ./pr_number
+          path: ./pr_number

.github/changed-files.yml

@@ -65,4 +65,4 @@ android:
   - 'test/**'
   - 'vendor/**'
   - '.gitmodules'
-  - '!**/*.md'
+  - '!**/*.md'

.github/renovate.json

@@ -1,3 +1,3 @@
 {
   "enabledManagers": ["gradle-wrapper", "bazel"]
-}
+}

.github/workflows/android-ci.yml

@@ -212,6 +212,18 @@ jobs:
         working-directory: test/android
 
     steps:
+      - name: Free Disk Space (Ubuntu)
+        if: startsWith(runner.name, 'GitHub Actions')
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          android: false
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: false
+
       - uses: actions/checkout@v4
         with:
           submodules: recursive

.github/workflows/android-release.yml

@@ -2,19 +2,10 @@ name: android-release
 
 on:
   workflow_dispatch:
-    inputs:
-      renderer:
-        description: "Select renderering backend"
-        required: true
-        default: "OpenGL"
-        type: choice
-        options:
-          - OpenGL
-          - Vulkan
 
 jobs:
   build:
-    runs-on: ubuntu-24.04
+    runs-on: MapLibre_Native_Ubuntu_24_04_x84_16_core
     defaults:
       run:
         working-directory: platform/android
@@ -28,17 +19,6 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
-      - name: Map renderer input
-        id: backend_lowercase
-        run: |
-          if [ "${{ github.event.inputs.renderer }}" = "OpenGL" ]; then
-            echo "backend_lowercase=drawable" >> "$GITHUB_ENV"
-          elif [ "${{ github.event.inputs.renderer }}" = "Vulkan" ]; then
-            echo "backend_lowercase=vulkan" >> "$GITHUB_ENV"
-          fi
-
-      - run: echo "cmake.dir=$(dirname "$(dirname "$(command -v cmake)")")" >> local.properties
-
       - uses: actions/setup-java@v4
         with:
           distribution: "temurin"
@@ -65,6 +45,7 @@ jobs:
       - name: Update version name
         run: |
           RELEASE_VERSION="$( git describe --tags --match=android-v*.*.* --abbrev=0 | sed 's/^android-v//' )"
+          echo version="$RELEASE_VERSION" >> "$GITHUB_ENV"
           echo "Latest version from tag: $RELEASE_VERSION"
           if [ -n "$RELEASE_VERSION" ]; then
             sed -i -e "s/^VERSION_NAME=.*/VERSION_NAME=${RELEASE_VERSION}/" MapLibreAndroid/gradle.properties
@@ -74,20 +55,9 @@ jobs:
         shell: bash
 
       - name: Build package
-        run: make apackage
-        env:
-          RENDERER: ${{ env.backend_lowercase }}
-
-      - name: Build release Test App
         run: |
-          MAPLIBRE_DEVELOPER_CONFIG_XML='${{ secrets.MAPLIBRE_DEVELOPER_CONFIG_XML }}'
-          if [ -n "${MAPLIBRE_DEVELOPER_CONFIG_XML}" ]; then
-            echo "${MAPLIBRE_DEVELOPER_CONFIG_XML}" > MapLibreAndroidTestApp/src/main/res/values/developer-config.xml
-            make android
-          else
-            echo "No secrets.MAPLIBRE_DEVELOPER_CONFIG_XML variable set, skipping apk build..."
-          fi
-        shell: bash
+          RENDERER=vulkan make apackage
+          RENDERER=drawable make apackage
 
       # create github release
       - name: Prepare release
@@ -99,15 +69,15 @@ jobs:
           echo version_tag="$( git describe --tags --match=android-v*.*.* --abbrev=0 )" >> "$GITHUB_OUTPUT"
         shell: bash
 
-      - name: Check if version is valid semver
+      - name: Check if version is pre-release
         id: check_version
         run: |
-          version_tag="${{ steps.prepare_release.outputs.version_tag }}"
-          if [[ $version_tag =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            echo "Valid semver: $version_tag"
+          version="${{ env.version }}"
+          if [[ $version =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "Valid semver: $version"
             echo "prerelease=false" >> "$GITHUB_ENV"
           else
-            echo "Invalid semver: $version_tag"
+            echo "Invalid semver: $version"
             echo "prerelease=true" >> "$GITHUB_ENV"
           fi
 
@@ -123,25 +93,44 @@ jobs:
           draft: false
           prerelease: ${{ env.prerelease }}
 
-      - name: Upload aar
-        id: upload-release-asset
+      - name: Upload aar (OpenGL)
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: platform/android/MapLibreAndroid/build/outputs/aar/MapLibreAndroid-${{ env.backend_lowercase }}-release.aar
+          asset_path: platform/android/MapLibreAndroid/build/outputs/aar/MapLibreAndroid-drawable-release.aar
           asset_name: MapLibreAndroid-release.aar
           asset_content_type: application/zip
 
-      - name: Upload debug symbols
+      - name: Upload aar (Vulkan)
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: platform/android/MapLibreAndroid/build/outputs/aar/MapLibreAndroid-vulkan-release.aar
+          asset_name: MapLibreAndroid-release-vulkan.aar
+          asset_content_type: application/zip
+
+      - name: Upload debug symbols (OpenGL)
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: platform/android/build/debug-symbols-opengl.tar.gz
+          asset_name: debug-symbols-maplibre-android-opengl-${{ steps.prepare_release.outputs.version_tag }}.tar.gz
+          asset_content_type: application/gzip
+
+      - name: Upload debug symbols (Vulkan)
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: platform/android/build/debug-symbols.tar.gz
-          asset_name: debug-symbols.tar.gz
+          asset_path: platform/android/build/debug-symbols-vulkan.tar.gz
+          asset_name: debug-symbols-maplibre-android-vulkan-${{ steps.prepare_release.outputs.version_tag }}.tar.gz
           asset_content_type: application/gzip
 
       - name: Clean release
@@ -164,4 +153,3 @@ jobs:
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
           SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
           SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
-          RENDERER: ${{ env.backend_lowercase }}

.github/workflows/gh-pages-android-api.yml

@@ -26,7 +26,7 @@ jobs:
         run: ./gradlew dokkaGenerate
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.6.9
+        uses: JamesIves/github-pages-deploy-action@v4.7.2
         with:
           branch: gh-pages
           folder: platform/android/MapLibreAndroid/build/dokka/html

.github/workflows/gh-pages-android-examples.yml

@@ -23,7 +23,7 @@ jobs:
         run: make mkdocs-build
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.6.9
+        uses: JamesIves/github-pages-deploy-action@v4.7.2
         with:
           branch: gh-pages
           folder: platform/android/site

.github/workflows/gh-pages-cpp-api.yml

@@ -20,7 +20,7 @@ jobs:
         run: doxygen
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.6.9
+        uses: JamesIves/github-pages-deploy-action@v4.7.2
         with:
           branch: gh-pages
           folder: docs/doxygen/html

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

@@ -0,0 +1,74 @@
+name: gh-pages-docc
+
+permissions:
+  id-token: write
+  pages: write
+  contents: write
+
+on:
+  workflow_dispatch:
+  workflow_run:
+    workflows:
+      - ios-ci
+    types:
+      - completed
+
+jobs:
+  gh-pages-docc-build:
+    if: ${{ github.ref_name == 'main' }}
+    name: Build DocC Docs
+    runs-on: macos-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v4
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: us-west-2
+          role-to-assume: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}
+          role-session-name: ${{ github.run_id }}
+
+      - name: Build DocC documentation
+        working-directory: .
+        run: |
+          HOSTING_BASE_PATH="maplibre-native/ios/latest" platform/ios/scripts/docc.sh
+
+      # workaround since colons in filenames are not allowed in artifacts
+      # https://github.com/actions/upload-artifact/issues/333
+      - name: Create ZIP archive
+        run: |
+          cd build
+          zip -r docs.zip docs/
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: docc-docs
+          path: build/docs.zip
+
+  gh-pages-docc-deploy:
+    needs: gh-pages-docc-build
+    name: Deploy DocC Docs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v4
+
+      - name: Download DocC docs artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: docc-docs
+          path: build
+
+      - name: Unzip documentation
+        run: |
+          cd build
+          unzip docs.zip
+          rm docs.zip
+
+      - name: Deploy DocC documentation (main) 🚀
+        uses: JamesIves/[email protected]
+        with:
+          branch: gh-pages
+          folder: build/docs
+          target-folder: ios/latest/

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

@@ -41,7 +41,7 @@ jobs:
           name: book
           path: artifacts/book
       - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@v4.6.9
+        uses: JamesIves/github-pages-deploy-action@v4.7.2
         with:
           branch: gh-pages
           folder: artifacts/book

.github/workflows/ios-ci.yml

@@ -134,7 +134,7 @@ jobs:
       - name: Build CppUnitTests .ipa and .xctest for AWS Device Farm
         run: |
           set -e
-          bazel run --//:renderer=metal //platform/ios:xcodeproj
+          bazel run //platform/ios:xcodeproj --@rules_xcodeproj//xcodeproj:extra_common_flags="--//:renderer=metal"
           build_dir="$(mktemp -d)"
           xcodebuild build-for-testing  -scheme CppUnitTests -project MapLibre.xcodeproj -derivedDataPath "$build_dir"
           ios_cpp_test_app_dir="$(dirname "$(find "$build_dir" -name CppUnitTestsApp.app)")"
@@ -199,15 +199,6 @@ jobs:
         run: |
           HOSTING_BASE_PATH="maplibre-native/ios/latest" platform/ios/scripts/docc.sh
 
-      - name: Deploy DocC documentation (main) 🚀
-        if: github.ref == 'refs/heads/main'
-        uses: JamesIves/[email protected]
-        continue-on-error: true
-        with:
-          branch: gh-pages
-          folder: build/docs
-          target-folder: ios/latest/
-
   ios-release:
     runs-on: macos-14
     needs: ios-build