Skip to content

Commit c94864f

Browse files
authored
Prepare MapLibre Android 11.7.1 release (#3097)
1 parent a843410 commit c94864f

File tree

4 files changed

+24
-21
lines changed

4 files changed

+24
-21
lines changed

.github/workflows/android-release.yml

+7-19
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
build:
8-
runs-on: ubuntu-24.04
8+
runs-on: MapLibre_Native_Ubuntu_24_04_x84_16_core
99
defaults:
1010
run:
1111
working-directory: platform/android
@@ -19,8 +19,6 @@ jobs:
1919
submodules: recursive
2020
fetch-depth: 0
2121

22-
- run: echo "cmake.dir=$(dirname "$(dirname "$(command -v cmake)")")" >> local.properties
23-
2422
- uses: actions/setup-java@v4
2523
with:
2624
distribution: "temurin"
@@ -47,6 +45,7 @@ jobs:
4745
- name: Update version name
4846
run: |
4947
RELEASE_VERSION="$( git describe --tags --match=android-v*.*.* --abbrev=0 | sed 's/^android-v//' )"
48+
echo version="$RELEASE_VERSION" >> "$GITHUB_ENV"
5049
echo "Latest version from tag: $RELEASE_VERSION"
5150
if [ -n "$RELEASE_VERSION" ]; then
5251
sed -i -e "s/^VERSION_NAME=.*/VERSION_NAME=${RELEASE_VERSION}/" MapLibreAndroid/gradle.properties
@@ -60,17 +59,6 @@ jobs:
6059
RENDERER=vulkan make apackage
6160
RENDERER=drawable make apackage
6261
63-
- name: Build release Test App
64-
run: |
65-
MAPLIBRE_DEVELOPER_CONFIG_XML='${{ secrets.MAPLIBRE_DEVELOPER_CONFIG_XML }}'
66-
if [ -n "${MAPLIBRE_DEVELOPER_CONFIG_XML}" ]; then
67-
echo "${MAPLIBRE_DEVELOPER_CONFIG_XML}" > MapLibreAndroidTestApp/src/main/res/values/developer-config.xml
68-
make android
69-
else
70-
echo "No secrets.MAPLIBRE_DEVELOPER_CONFIG_XML variable set, skipping apk build..."
71-
fi
72-
shell: bash
73-
7462
# create github release
7563
- name: Prepare release
7664
id: prepare_release
@@ -81,15 +69,15 @@ jobs:
8169
echo version_tag="$( git describe --tags --match=android-v*.*.* --abbrev=0 )" >> "$GITHUB_OUTPUT"
8270
shell: bash
8371

84-
- name: Check if version is valid semver
72+
- name: Check if version is pre-release
8573
id: check_version
8674
run: |
87-
version_tag="${{ steps.prepare_release.outputs.version_tag }}"
88-
if [[ $version_tag =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
89-
echo "Valid semver: $version_tag"
75+
version="${{ env.version }}"
76+
if [[ $version =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
77+
echo "Valid semver: $version"
9078
echo "prerelease=false" >> "$GITHUB_ENV"
9179
else
92-
echo "Invalid semver: $version_tag"
80+
echo "Invalid semver: $version"
9381
echo "prerelease=true" >> "$GITHUB_ENV"
9482
fi
9583

platform/android/CHANGELOG.md

+15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog MapLibre Native for Android
22

3+
## 11.7.1
4+
5+
> [!NOTE]
6+
> 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.
7+
8+
### ✨ Features and improvements
9+
10+
- Batch up scheduling of deferred deletions ([#3030](https://github.com/maplibre/maplibre-native/pull/3030)).
11+
- Specify Vulkan version needed in AndroidManifest.xml ([#3095](https://github.com/maplibre/maplibre-native/pull/3095)).
12+
13+
### 🐞 Bug fixes
14+
15+
- Remove `Pass3D` ([#3077](https://github.com/maplibre/maplibre-native/pull/3077)).
16+
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)).
17+
318
## 11.7.0
419

520
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:

platform/android/MapLibreAndroid/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION_NAME=11.7.0
1+
VERSION_NAME=11.7.1
22

33
# Only build native dependencies for the current ABI
44
# See https://code.google.com/p/android/issues/detail?id=221098#c20

scripts/generate-changelog.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function getTagLastVersion() {
1818
const lastVersion = fs
1919
.readFileSync(`platform/${platform}/CHANGELOG.md`, "utf-8")
2020
.split("\n")
21-
.filter((line) => line.startsWith("## "))[1]
21+
.filter((line) => line.startsWith("## "))[0]
2222
.slice(3);
2323
return `${platform}-v${lastVersion}`;
2424
}

0 commit comments

Comments
 (0)