From f7b2fddbe3e59a5b38f8b67152d90d5c3c34d0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Mon, 30 Oct 2023 23:13:30 +0100 Subject: [PATCH 1/2] Use v12 docker build images --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2d2c82352..946b83d55f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -123,7 +123,7 @@ jobs: name: Windows (${{ matrix.platform_name }}) using mingw runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:11-mingw + container: openrct2/openrct2-build:12-mingw strategy: fail-fast: false matrix: @@ -276,19 +276,19 @@ jobs: build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off -DDISABLE_FLAC=ON -DDISABLE_VORBIS=ON - platform: x86_64 distro: focal - image: openrct2/openrct2-build:11-focal + image: openrct2/openrct2-build:12-focal build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g1 -gz" -DWITH_TESTS=off - platform: x86_64 distro: jammy - image: openrct2/openrct2-build:11-jammy + image: openrct2/openrct2-build:12-jammy build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" - platform: x86_64 distro: bullseye - image: openrct2/openrct2-build:11-bullseye + image: openrct2/openrct2-build:12-bullseye build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off - platform: i686 distro: focal - image: openrct2/openrct2-build:11-focal32 + image: openrct2/openrct2-build:12-focal32 build_flags: -DFORCE32=ON -DENABLE_SCRIPTING=OFF -DCMAKE_CXX_FLAGS="-m32 -g1 -gz" -DWITH_TESTS=off steps: - name: Checkout @@ -327,7 +327,7 @@ jobs: name: Linux (x86_64, AppImage) runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:11-focal + container: openrct2/openrct2-build:12-focal steps: - name: Checkout uses: actions/checkout@v3 @@ -385,7 +385,7 @@ jobs: name: Linux (Debug, [http, network, flac, vorbis OpenGL] disabled) using clang runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:11-jammy + container: openrct2/openrct2-build:12-jammy steps: - name: Checkout uses: actions/checkout@v3 @@ -401,7 +401,7 @@ jobs: name: Linux (Debug) using clang, coverage enabled runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:11-jammy + container: openrct2/openrct2-build:12-jammy steps: - name: Checkout uses: actions/checkout@v3 @@ -442,7 +442,7 @@ jobs: name: Android runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:11-android + container: openrct2/openrct2-build:12-android steps: - name: Checkout uses: actions/checkout@v3 From 78f4860bfe38f7a9643403ab31b727b49b4d4de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Mon, 30 Oct 2023 23:12:40 +0100 Subject: [PATCH 2/2] Update Android project to use more recent tools Tested manually on my Android 13 device --- src/openrct2-android/app/build.gradle | 5 +++-- src/openrct2-android/app/src/main/AndroidManifest.xml | 3 +-- src/openrct2-android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2-android/app/build.gradle b/src/openrct2-android/app/build.gradle index c70a3bde00..7364b29f41 100644 --- a/src/openrct2-android/app/build.gradle +++ b/src/openrct2-android/app/build.gradle @@ -2,7 +2,9 @@ apply plugin: 'com.android.application' android { compileSdkVersion 31 - ndkVersion "23.1.7779620" // Latest r23b (LTS), to be synced with CI container image + buildToolsVersion "34.0.0" + ndkVersion "26.1.10909125" // Latest r26b (LTS), to be synced with CI container image + namespace "io.openrct2" defaultConfig { applicationId 'io.openrct2' minSdkVersion 19 @@ -31,7 +33,6 @@ android { externalNativeBuild { cmake { path 'src/main/CMakeLists.txt' - version "3.18.1" } } diff --git a/src/openrct2-android/app/src/main/AndroidManifest.xml b/src/openrct2-android/app/src/main/AndroidManifest.xml index 7ffba6b7de..f2b3034d05 100644 --- a/src/openrct2-android/app/src/main/AndroidManifest.xml +++ b/src/openrct2-android/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/src/openrct2-android/build.gradle b/src/openrct2-android/build.gradle index 6f629c8aa7..d748ef16df 100644 --- a/src/openrct2-android/build.gradle +++ b/src/openrct2-android/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:8.3.0-alpha10' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/src/openrct2-android/gradle/wrapper/gradle-wrapper.properties b/src/openrct2-android/gradle/wrapper/gradle-wrapper.properties index c0c37144a2..2a08360afc 100644 --- a/src/openrct2-android/gradle/wrapper/gradle-wrapper.properties +++ b/src/openrct2-android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip