build: target Android 16 / API 36
All checks were successful
Android build / build (push) Successful in 17m7s
All checks were successful
Android build / build (push) Successful in 17m7s
This commit is contained in:
@@ -50,8 +50,8 @@ jobs:
|
|||||||
set -o pipefail
|
set -o pipefail
|
||||||
sdkmanager \
|
sdkmanager \
|
||||||
"platform-tools" \
|
"platform-tools" \
|
||||||
"platforms;android-35" \
|
"platforms;android-36" \
|
||||||
"build-tools;35.0.0" \
|
"build-tools;36.0.0" \
|
||||||
"ndk;27.2.12479018" \
|
"ndk;27.2.12479018" \
|
||||||
"cmake;3.22.1"
|
"cmake;3.22.1"
|
||||||
|
|
||||||
|
|||||||
@@ -30,8 +30,8 @@ GRADLE_DIST_URL="https://services.gradle.org/distributions/gradle-8.7-bin.zip"
|
|||||||
JDK_DIST_URL="https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/eclipse"
|
JDK_DIST_URL="https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/eclipse"
|
||||||
ANDROID_NDK_PACKAGE="ndk;27.2.12479018"
|
ANDROID_NDK_PACKAGE="ndk;27.2.12479018"
|
||||||
ANDROID_CMAKE_PACKAGE="cmake;3.22.1"
|
ANDROID_CMAKE_PACKAGE="cmake;3.22.1"
|
||||||
ANDROID_EMULATOR_SYSTEM_IMAGE="system-images;android-35;google_apis;x86_64"
|
ANDROID_EMULATOR_SYSTEM_IMAGE="system-images;android-36;google_apis;x86_64"
|
||||||
ANDROID_TEST_AVD_NAME="githug_android_api35"
|
ANDROID_TEST_AVD_NAME="githug_android_api36"
|
||||||
ANDROID_NDK_DIR="$SDK_DIR/ndk/27.2.12479018"
|
ANDROID_NDK_DIR="$SDK_DIR/ndk/27.2.12479018"
|
||||||
ANDROID_CMAKE_DIR="$SDK_DIR/cmake/3.22.1"
|
ANDROID_CMAKE_DIR="$SDK_DIR/cmake/3.22.1"
|
||||||
ANDROID_TOOLBIN="$ANDROID_NDK_DIR/toolchains/llvm/prebuilt/linux-x86_64/bin"
|
ANDROID_TOOLBIN="$ANDROID_NDK_DIR/toolchains/llvm/prebuilt/linux-x86_64/bin"
|
||||||
@@ -139,8 +139,8 @@ mark_successful_check() {
|
|||||||
|
|
||||||
required_sdk_packages_present() {
|
required_sdk_packages_present() {
|
||||||
[ -d "$SDK_DIR/platform-tools" ] \
|
[ -d "$SDK_DIR/platform-tools" ] \
|
||||||
&& [ -d "$SDK_DIR/platforms/android-35" ] \
|
&& [ -d "$SDK_DIR/platforms/android-36" ] \
|
||||||
&& [ -d "$SDK_DIR/build-tools/35.0.0" ] \
|
&& [ -d "$SDK_DIR/build-tools/36.0.0" ] \
|
||||||
&& [ -d "$ANDROID_NDK_DIR" ] \
|
&& [ -d "$ANDROID_NDK_DIR" ] \
|
||||||
&& [ -d "$ANDROID_CMAKE_DIR" ]
|
&& [ -d "$ANDROID_CMAKE_DIR" ]
|
||||||
}
|
}
|
||||||
@@ -148,7 +148,7 @@ required_sdk_packages_present() {
|
|||||||
required_emulator_packages_present() {
|
required_emulator_packages_present() {
|
||||||
required_sdk_packages_present \
|
required_sdk_packages_present \
|
||||||
&& [ -x "$SDK_DIR/emulator/emulator" ] \
|
&& [ -x "$SDK_DIR/emulator/emulator" ] \
|
||||||
&& [ -d "$SDK_DIR/system-images/android-35/google_apis/x86_64" ]
|
&& [ -d "$SDK_DIR/system-images/android-36/google_apis/x86_64" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
auto_commit_if_needed() {
|
auto_commit_if_needed() {
|
||||||
@@ -598,8 +598,8 @@ ensure_sdk_packages() {
|
|||||||
log "Installing required Android SDK packages"
|
log "Installing required Android SDK packages"
|
||||||
"$CMDLINE_TOOLS_LATEST_DIR/bin/sdkmanager" --sdk_root="$SDK_DIR" \
|
"$CMDLINE_TOOLS_LATEST_DIR/bin/sdkmanager" --sdk_root="$SDK_DIR" \
|
||||||
"platform-tools" \
|
"platform-tools" \
|
||||||
"platforms;android-35" \
|
"platforms;android-36" \
|
||||||
"build-tools;35.0.0" \
|
"build-tools;36.0.0" \
|
||||||
"$ANDROID_NDK_PACKAGE" \
|
"$ANDROID_NDK_PACKAGE" \
|
||||||
"$ANDROID_CMAKE_PACKAGE"
|
"$ANDROID_CMAKE_PACKAGE"
|
||||||
|
|
||||||
@@ -629,8 +629,8 @@ ensure_emulator_sdk_packages() {
|
|||||||
log "Installing Android emulator SDK packages"
|
log "Installing Android emulator SDK packages"
|
||||||
"$CMDLINE_TOOLS_LATEST_DIR/bin/sdkmanager" --sdk_root="$SDK_DIR" \
|
"$CMDLINE_TOOLS_LATEST_DIR/bin/sdkmanager" --sdk_root="$SDK_DIR" \
|
||||||
"platform-tools" \
|
"platform-tools" \
|
||||||
"platforms;android-35" \
|
"platforms;android-36" \
|
||||||
"build-tools;35.0.0" \
|
"build-tools;36.0.0" \
|
||||||
"$ANDROID_NDK_PACKAGE" \
|
"$ANDROID_NDK_PACKAGE" \
|
||||||
"$ANDROID_CMAKE_PACKAGE" \
|
"$ANDROID_CMAKE_PACKAGE" \
|
||||||
"emulator" \
|
"emulator" \
|
||||||
|
|||||||
@@ -19,13 +19,13 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "solutions.tretter.githugandroid"
|
namespace = "solutions.tretter.githugandroid"
|
||||||
compileSdk = 35
|
compileSdk = 36
|
||||||
ndkVersion = "27.2.12479018"
|
ndkVersion = "27.2.12479018"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId = "solutions.tretter.githugandroid"
|
applicationId = "solutions.tretter.githugandroid"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 35
|
targetSdk = 36
|
||||||
versionCode = 184
|
versionCode = 184
|
||||||
versionName = "0.1.183"
|
versionName = "0.1.183"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user