From c94864f1a9a742d09d4619ec6aa786bb46824cb0 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Wed, 18 Dec 2024 15:18:35 +0100 Subject: [PATCH 1/2] Prepare MapLibre Android 11.7.1 release (#3097) --- .github/workflows/android-release.yml | 26 +++++-------------- platform/android/CHANGELOG.md | 15 +++++++++++ .../android/MapLibreAndroid/gradle.properties | 2 +- scripts/generate-changelog.mjs | 2 +- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 02fb0f71c7b..35594f091c8 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -5,7 +5,7 @@ on: jobs: build: - runs-on: ubuntu-24.04 + runs-on: MapLibre_Native_Ubuntu_24_04_x84_16_core defaults: run: working-directory: platform/android @@ -19,8 +19,6 @@ jobs: submodules: recursive fetch-depth: 0 - - run: echo "cmake.dir=$(dirname "$(dirname "$(command -v cmake)")")" >> local.properties - - uses: actions/setup-java@v4 with: distribution: "temurin" @@ -47,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 @@ -60,17 +59,6 @@ jobs: RENDERER=vulkan make apackage RENDERER=drawable make apackage - - 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 - # create github release - name: Prepare release id: prepare_release @@ -81,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 diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index 2884391bf55..2bedb5be327 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog MapLibre Native for Android +## 11.7.1 + +> [!NOTE] +> We are now releasing OpenGL ES and Vulkan variants of MapLibre Android. See the [11.7.0 release notes](https://github.com/maplibre/maplibre-native/releases/tag/android-v11.7.0) for details. + +### ✨ Features and improvements + +- Batch up scheduling of deferred deletions ([#3030](https://github.com/maplibre/maplibre-native/pull/3030)). +- Specify Vulkan version needed in AndroidManifest.xml ([#3095](https://github.com/maplibre/maplibre-native/pull/3095)). + +### 🐞 Bug fixes + +- Remove `Pass3D` ([#3077](https://github.com/maplibre/maplibre-native/pull/3077)). + Fixes issue where filters applied to fill extrusion layers are not rendered unless a manual zoom is applied to the map ([#3039](https://github.com/maplibre/maplibre-native/issues/3039)). + ## 11.7.0 This release marks the official release of MapLibre Android with Vulkan support. [Vulkan](https://www.vulkan.org) is a modern graphics API which brings advantages such as improved performance, improved observability and better stability. Specifically, starting with this version we are releasing multiple versions of MapLibre Android: diff --git a/platform/android/MapLibreAndroid/gradle.properties b/platform/android/MapLibreAndroid/gradle.properties index 081f5a9742c..93fed717d85 100644 --- a/platform/android/MapLibreAndroid/gradle.properties +++ b/platform/android/MapLibreAndroid/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=11.7.0 +VERSION_NAME=11.7.1 # Only build native dependencies for the current ABI # See https://code.google.com/p/android/issues/detail?id=221098#c20 diff --git a/scripts/generate-changelog.mjs b/scripts/generate-changelog.mjs index a704b8dcd3f..c18ed107318 100755 --- a/scripts/generate-changelog.mjs +++ b/scripts/generate-changelog.mjs @@ -18,7 +18,7 @@ function getTagLastVersion() { const lastVersion = fs .readFileSync(`platform/${platform}/CHANGELOG.md`, "utf-8") .split("\n") - .filter((line) => line.startsWith("## "))[1] + .filter((line) => line.startsWith("## "))[0] .slice(3); return `${platform}-v${lastVersion}`; } From b7bf48683cee22a35363e9a310893eb6b47c1a57 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 21:55:39 +0100 Subject: [PATCH 2/2] chore(deps): update dependency gradle to v8.12 (#3102) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- benchmark/android/gradle/wrapper/gradle-wrapper.properties | 2 +- benchmark/android/gradlew | 3 +-- .../MapLibrePlugin/gradle/wrapper/gradle-wrapper.properties | 2 +- platform/android/MapLibrePlugin/gradlew | 3 +-- platform/android/gradle/wrapper/gradle-wrapper.properties | 2 +- render-test/android/gradle/wrapper/gradle-wrapper.properties | 2 +- render-test/android/gradlew | 3 +-- test/android/gradle/wrapper/gradle-wrapper.properties | 2 +- test/android/gradlew | 3 +-- 9 files changed, 9 insertions(+), 13 deletions(-) diff --git a/benchmark/android/gradle/wrapper/gradle-wrapper.properties b/benchmark/android/gradle/wrapper/gradle-wrapper.properties index c1d5e018598..e0fd02028bc 100644 --- a/benchmark/android/gradle/wrapper/gradle-wrapper.properties +++ b/benchmark/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/benchmark/android/gradlew b/benchmark/android/gradlew index f5feea6d6b1..f3b75f3b0d4 100755 --- a/benchmark/android/gradlew +++ b/benchmark/android/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/platform/android/MapLibrePlugin/gradle/wrapper/gradle-wrapper.properties b/platform/android/MapLibrePlugin/gradle/wrapper/gradle-wrapper.properties index e2847c82004..cea7a793a84 100644 --- a/platform/android/MapLibrePlugin/gradle/wrapper/gradle-wrapper.properties +++ b/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.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/platform/android/MapLibrePlugin/gradlew b/platform/android/MapLibrePlugin/gradlew index f5feea6d6b1..f3b75f3b0d4 100755 --- a/platform/android/MapLibrePlugin/gradlew +++ b/platform/android/MapLibrePlugin/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties index e2847c82004..cea7a793a84 100644 --- a/platform/android/gradle/wrapper/gradle-wrapper.properties +++ b/platform/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/render-test/android/gradle/wrapper/gradle-wrapper.properties b/render-test/android/gradle/wrapper/gradle-wrapper.properties index c1d5e018598..e0fd02028bc 100644 --- a/render-test/android/gradle/wrapper/gradle-wrapper.properties +++ b/render-test/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/render-test/android/gradlew b/render-test/android/gradlew index f5feea6d6b1..f3b75f3b0d4 100755 --- a/render-test/android/gradlew +++ b/render-test/android/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/test/android/gradle/wrapper/gradle-wrapper.properties b/test/android/gradle/wrapper/gradle-wrapper.properties index c1d5e018598..e0fd02028bc 100644 --- a/test/android/gradle/wrapper/gradle-wrapper.properties +++ b/test/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/test/android/gradlew b/test/android/gradlew index f5feea6d6b1..f3b75f3b0d4 100755 --- a/test/android/gradlew +++ b/test/android/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum