mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-28 01:18:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

android: Bump compileSdk to 35

Browse source 
It is used to latest AndroidX libraries.

ci: Update tag and android_compile_sdk to keep sync

Signed-off-by: utzcoz <utzcoz@outlook.com>
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2382>
This commit is contained in:
utzcoz 2024-12-28 13:40:50 +08:00 committed by korejan
parent e4e86b0d16
commit ed3b353755
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -132,13 +132,13 @@ win:container_prep:
.monado.variables.debian:bullseye: .monado.variables.debian:bullseye:
variables: variables:
FDO_DISTRIBUTION_VERSION: "bullseye" FDO_DISTRIBUTION_VERSION: "bullseye"
FDO_DISTRIBUTION_TAG: "2025-01-11" FDO_DISTRIBUTION_TAG: "2025-01-08"
# Variables for build and usage of Debian bookworm-ndk image # Variables for build and usage of Debian bookworm-ndk image
.monado.variables.debian:bookworm-ndk: .monado.variables.debian:bookworm-ndk:
variables: variables:
FDO_DISTRIBUTION_VERSION: "bookworm" FDO_DISTRIBUTION_VERSION: "bookworm"
FDO_DISTRIBUTION_TAG: "2025-01-11" FDO_DISTRIBUTION_TAG: "2025-01-17"
FDO_REPO_SUFFIX: ndk FDO_REPO_SUFFIX: ndk
# Variables for build and usage of Ubuntu jammy image # Variables for build and usage of Ubuntu jammy image

6
.gitlab-ci/config.yml
View file

@ -118,7 +118,7 @@ distributions:
XRT_HAVE_OPENCV: "OFF" XRT_HAVE_OPENCV: "OFF"
- codename: bullseye - codename: bullseye
tag: "2025-01-11" tag: "2025-01-08"
script: bullseye_backports.sh script: bullseye_backports.sh
deb_version_suffix: bpo11 deb_version_suffix: bpo11
packages: packages:
@ -133,9 +133,9 @@ distributions:
distro_version: bookworm distro_version: bookworm
repo_suffix: ndk repo_suffix: ndk
script: android_container_prep.sh script: android_container_prep.sh
tag: "2025-01-11" tag: "2025-01-17"
# This must match ext.sharedCompileSdk in build.gradle # This must match ext.sharedCompileSdk in build.gradle
android_compile_sdk: 34 android_compile_sdk: 35
# This must match buildscript.ext.buildToolsVersion in build.gradle # This must match buildscript.ext.buildToolsVersion in build.gradle
android_build_tools: 34.0.0 android_build_tools: 34.0.0
# This must match ext.ndk_version in build.gradle # This must match ext.ndk_version in build.gradle

2
.gitlab-ci/install-android-sdk.sh
View file

@ -14,7 +14,7 @@
set -eo pipefail set -eo pipefail
VERSION=11076708 VERSION=11076708
ROOT=${ROOT:-/opt/android-sdk} ROOT=${ROOT:-/opt/android-sdk}
ANDROID_COMPILE_SDK=${ANDROID_COMPILE_SDK:-34} ANDROID_COMPILE_SDK=${ANDROID_COMPILE_SDK:-35}
ANDROID_BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-34.0.0} ANDROID_BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-34.0.0}
mkdir -p "$ROOT" mkdir -p "$ROOT"

2
build.gradle
View file

@ -73,7 +73,7 @@ ext {
cmake_version = '3.22.1' cmake_version = '3.22.1'
ndk_version = '26.3.11579264' ndk_version = '26.3.11579264'
// If you update this, must also update .gitlab-ci/config.yml // If you update this, must also update .gitlab-ci/config.yml
sharedCompileSdk = 34 sharedCompileSdk = 35
sharedTargetSdk = 31 sharedTargetSdk = 31
sharedMinSdk = 26 sharedMinSdk = 26