Merge branch 'main' into symbol-ubo-consolidation

.gitattributes

@@ -0,0 +1,3 @@
+# Avoid line conversions between Unix (LF) and Windows (CRLF)
+
+test/fixtures/storage/assets/* binary

.github/ISSUE_TEMPLATE/android-bug-report.yml

@@ -0,0 +1,67 @@
+name: MapLibre Android Bug Report
+description: Report a bug you encountered with MapLibre Android.
+labels: ["android"]
+type: "bug"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: input
+    id: version
+    attributes:
+      label: MapLibre Android Version
+      placeholder: e.g. 11.6.2
+    validations:
+      required: true
+  - type: input
+    id: android-version
+    attributes:
+      label: Android SDK Version
+      placeholder: e.g. Android 10
+    validations:
+      required: true
+  - type: input
+    id: device
+    attributes:
+      label: Device
+      description: "Enter the device that you encountered the issue on or enter 'Simulator' if you only see this issue in a simulator."
+      placeholder: Google Pixel 7 Pro
+    validations:
+      required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+    validations:
+      required: true
+  - type: textarea
+    id: repro
+    attributes:
+      label: Steps to reproduce
+      description: Explain how the issue can be reproduced.
+    validations:
+      required: true
+  - type: dropdown
+    id: renderer
+    attributes:
+      label: Renderer
+      multiple: true
+      options:
+        - OpenGL (choose this if you are unsure)
+        - Vulkan
+      description: Mostly relevant for rendering issues.
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Additional context such as screenshots or videos that are helpful.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,33 +1,40 @@
 ---
-name: Bug report
-about: Create a report to help us improve
+name: General Bug report
+about: Create a report to help us improve.
 title: ''
-labels: bug
+type: bug
 assignees: ''
 
 ---
 
+<!-- If your issue is about MapLibre iOS or MapLibre Android, please use the corresponding template. -->
+
 **Describe the bug**
+
 A clear and concise description of what the bug is.
 
 **To Reproduce**
+
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
 **Expected behavior**
+
 A clear and concise description of what you expected to happen.
 
 **Screenshots**
+
 If applicable, add screenshots to help explain your problem.
 
 **Platform information (please complete the following information):**
- - OS: [e.g. iOS]
- - Platform [e.g. Qt, Node.js, iOS]
- - Version [e.g. 22]
 
+ - Operating System:
+ - Platform (e.g. Node.js, Qt):
+ - Version:
 
 **Additional context**
+
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/ios-bug-report.yml

@@ -0,0 +1,58 @@
+name: MapLibre iOS Bug Report
+description: Report a bug you encountered with MapLibre iOS.
+labels: ["ios"]
+type: "bug"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: input
+    id: version
+    attributes:
+      label: MapLibre iOS Version
+      placeholder: e.g. 6.8.1
+    validations:
+      required: true
+  - type: input
+    id: ios-version
+    attributes:
+      label: iOS Version
+      placeholder: e.g. 6.8.1
+    validations:
+      required: true
+  - type: input
+    id: device
+    attributes:
+      label: Device
+      description: "Enter the device that you encountered the issue on or enter 'Simulator' if you only see this issue in a simulator."
+      placeholder: iPhone 15 Pro
+    validations:
+      required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+    validations:
+      required: true
+  - type: textarea
+    id: repro
+    attributes:
+      label: Steps to reproduce
+      description: Explain how the issue can be reproduced.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Additional context such as screenshots or videos that are helpful.
+    validations:
+      required: false

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

@@ -10,7 +10,7 @@ runs:
     - name: Build APK and Android Test APK for ${{ inputs.flavor }}
       shell: bash
       run: |
-        ./gradlew assemble${{ inputs.flavor }} assemble${{ inputs.flavor }}AndroidTest
+        ./gradlew assemble${{ inputs.flavor }}Release assemble${{ inputs.flavor }}AndroidTest
         cp app/build/outputs/apk/${{ inputs.flavor }}/release/app-${{ inputs.flavor }}-release.apk RenderTestsApp-${{ inputs.flavor }}.apk
         cp app/build/outputs/apk/androidTest/${{ inputs.flavor }}/release/app-${{ inputs.flavor }}-release-androidTest.apk RenderTests-${{ inputs.flavor }}.apk
       working-directory: ./render-test/android

.github/actions/qt5-build/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/maplibre/linux-builder:centos7-gcc11-cmake3.19
+FROM ghcr.io/maplibre/linux-builder:centos7-gcc11
 
 # Copy and set the entry point
 COPY entrypoint.sh /entrypoint.sh

.github/changed-files.yml

@@ -12,6 +12,23 @@ linux:
   - 'BUILD.bazel'
   - '.bazelrc'
   - '.bazelversion'
+windows:
+  - '.github/workflows/windows-ci.yml'
+  - 'src/**'
+  - 'include/**'
+  - 'platform/default/**'
+  - 'platform/windows/**'
+  - 'expression-test/**'
+  - 'render-test/**'
+  - 'test/**'
+  - 'metrics/**'
+  - 'vendor/**'
+  - '.gitmodules'
+  - '!**/*.md'
+  - 'WORKSPACE'
+  - 'BUILD.bazel'
+  - '.bazelrc'
+  - '.bazelversion'
 ios:
   - 'platform/ios/**'
   - 'platform/darwin/**'

.github/scripts/windows-ci_configure_wrapper.ps1

@@ -0,0 +1,23 @@
+$compile_flags = @(
+	'-DCMAKE_POLICY_DEFAULT_CMP0141=NEW',
+	'-DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=Embedded',
+	'-DCMAKE_BUILD_TYPE=RelWithDebInfo'
+)
+
+switch ($env:RENDERER)
+{
+	'opengl' { $compile_flags += '-DMLN_WITH_OPENGL=ON'; break; }
+	'egl'    { $compile_flags += '-DMLN_WITH_EGL=ON'   ; break; }
+	'vulkan' { $compile_flags += @('-DMLN_WITH_VULKAN=ON', '-DMLN_WITH_OPENGL=OFF'); break; }
+	'osmesa' { $compile_flags += '-DMLN_WITH_OSMESA=ON'; break; }
+}
+
+switch ($env:RENDERING_MODE)
+{
+	'legacy'   { $compile_flags += '-DMLN_LEGACY_RENDERER=ON'  ; break; }
+	'drawable' { $compile_flags += '-DMLN_DRAWABLE_RENDERER=ON'; break; }
+}
+
+Write-Host 'Compile flags: ' $compile_flags
+
+& cmake -B build -G Ninja $($compile_flags)

.github/workflows/android-ci.yml

@@ -123,6 +123,8 @@ jobs:
       - uses: hendrikmuhs/[email protected]
         with:
           key: ${{ github.job }}
+          append-timestamp: false
+          max-size: 5G
 
       - name: restore-gradle-cache
         uses: actions/cache@v4
@@ -144,8 +146,8 @@ jobs:
         run: make android-lib-arm-v8
 
       - name: Build API documentation
-        run: ./gradlew dokkaHtml
-      
+        run: ./gradlew dokkaGenerate
+
       - name: Build Examples documentation
         run: make mkdocs-build
 
@@ -210,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
@@ -229,6 +243,8 @@ jobs:
       - uses: hendrikmuhs/[email protected]
         with:
           key: ${{ github.job }}
+          append-timestamp: false
+          max-size: 5G
 
       - name: Create data.zip in assets directory
         run: zip -r test/android/app/src/main/assets/data.zip -@ < test/android/app/src/main/assets/to_zip.txt
@@ -283,6 +299,8 @@ jobs:
       - uses: hendrikmuhs/[email protected]
         with:
           key: ${{ github.job }}
+          append-timestamp: false
+          max-size: 5G
 
       - name: Get CMake and Ninja
         uses: lukka/get-cmake@latest

.github/workflows/android-release.yml

@@ -55,56 +55,10 @@ jobs:
         working-directory: platform/android
         shell: bash
 
-      - name: Cache node modules
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
       - name: npm install
         run: npm install --ignore-scripts
         working-directory: platform/android
 
-      - name: Install ccache
-        run: sudo apt-get install -y ccache
-
-      - name: Prepare ccache
-        run: ccache --clear
-
-      - name: Cache ccache
-        uses: actions/cache@v4
-        env:
-          cache-name: ccache-v1
-        with:
-          path: ~/.ccache'
-          key: ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-${{ github.sha }}-${{ github.head_ref }}
-          restore-keys: |
-            ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-${{ github.sha }}
-            ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}
-            ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}
-
-      - name: Clear ccache statistics
-        run: |
-          ccache --zero-stats
-          ccache --max-size=2G
-          ccache --show-stats
-
-      - name: restore-gradle-cache
-        uses: actions/cache@v4
-        env:
-          cache-name: gradle-v1
-        with:
-          path: ~/.gradle'
-          key: ${{ env.cache-name }}-${{ hashFiles('platform/android/gradle/dependencies.gradle') }}-${{ hashFiles('platform/android/build.gradle') }}-${{ hashFiles('platform/android/local.properties') }}-${{ hashFiles('platform/android/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: |
-            - ${{ env.cache-name }}
-
       - name: Android nitpick
         run: make run-android-nitpick
 

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

@@ -23,12 +23,11 @@ jobs:
           java-version: "17"
 
       - name: Generate documentation
-        run: ./gradlew dokkaHtml
+        run: ./gradlew dokkaGenerate
 
       - name: Deploy 🚀
         uses: JamesIves/[email protected]
         with:
           branch: gh-pages
           folder: platform/android/MapLibreAndroid/build/dokka/html
           target-folder: android/api/
-

.github/workflows/upload-coverage.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: Upload coverage report
         if: '!cancelled()'
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
           override_commit: ${{ github.event.workflow_run.head_sha }}
           override_pr: ${{ github.event.workflow_run.pull_requests[0].number }}