Skip to content

build: update the ndk to v29 beta1 #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Setup NDK
run: |
sdkmanager --install "ndk;28.0.13004108"
sdkmanager --install "ndk;29.0.13113456"

- name: Build native libraries
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
uses: TheMrMilchmann/setup-msvc-dev@v3
with:
arch: x64
toolset: '14.42'
toolset: '14.43'

- name: Setup MYSYS2 (Windows)
if: matrix.config.os == 'windows' && ( matrix.config.environment == 'mingw' || matrix.config.environment == 'ucrt' )
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/web_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ jobs:

- name: Build
run: |
bash ./platforms/build-web.sh
meson test -C build-web
ENABLE_TESTING=1 bash ./platforms/build-web.sh

# TODO upload page to gh-pages!
- name: Upload artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: TheMrMilchmann/setup-msvc-dev@v3
with:
arch: x64
toolset: '14.42'
toolset: '14.43'

- name: Setup meson
run: |
Expand Down
2 changes: 1 addition & 1 deletion platforms/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ android {
}

compileSdkVersion 35
ndkVersion "28.0.13004108"
ndkVersion "29.0.13113456"
defaultConfig {
if (buildAsApplication) {
applicationId "com.github.oopetris"
Expand Down
2 changes: 1 addition & 1 deletion platforms/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.8.0'
classpath 'com.android.tools.build:gradle:8.9.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion platforms/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Oct 02 13:43:32 CEST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions platforms/build-android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ if [ ! -d "toolchains" ]; then
mkdir -p toolchains
fi

export NDK_VER_DOWNLOAD="r28"
export NDK_VER_DESC="r28"
export NDK_VER_DOWNLOAD="r29-beta1"
export NDK_VER_DESC="r29-beta1"

export BASE_PATH="$PWD/toolchains/android-ndk-$NDK_VER_DESC"
export ANDROID_NDK_HOME="$BASE_PATH"
Expand Down
6 changes: 6 additions & 0 deletions platforms/build-web.sh
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,9 @@ if [ "$COMPILE_TYPE" == "complete_rebuild" ] || [ ! -e "$BUILD_DIR" ]; then
fi

meson compile -C "$BUILD_DIR"

if [ -n "$ENABLE_TESTING" ]; then

meson test -C "$BUILD_DIR"

fi
Loading