From 4587fa46b0899764bc5f0966fecaf3f9571e1811 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Sat, 5 Oct 2024 16:33:24 -0400 Subject: [PATCH] update android sdl2 to 2.30.8 --- .github/workflows/android.yml | 4 ++-- desktop_version/VVVVVV-android/README.md | 10 +++++----- desktop_version/VVVVVV-android/app/build.gradle | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 37e9a960..3108e743 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -65,7 +65,7 @@ jobs: - uses: actions/checkout@v4 with: repository: libsdl-org/SDL - ref: release-2.28.5 + ref: release-2.30.8 path: 'SDL' - name: Build SDL @@ -73,7 +73,7 @@ jobs: sudo apt-get -y install ninja-build cd SDL ./build-scripts/android-prefab.sh - mvn install:install-file -Dfile=build-android-prefab/prefab-2.28.5/SDL2-2.28.5.aar -DpomFile=build-android-prefab/prefab-2.28.5/SDL2-2.28.5.pom + mvn install:install-file -Dfile=build-android-prefab/prefab-2.30.8/SDL2-2.30.8.aar -DpomFile=build-android-prefab/prefab-2.30.8/SDL2-2.30.8.pom - name: Build run: | diff --git a/desktop_version/VVVVVV-android/README.md b/desktop_version/VVVVVV-android/README.md index 46b6d401..b7305828 100644 --- a/desktop_version/VVVVVV-android/README.md +++ b/desktop_version/VVVVVV-android/README.md @@ -10,18 +10,18 @@ How to Build ------------ The recommended way is to install Android Studio and Maven. These instructions are for -SDL 2.28.5; adapt your SDL version accordingly. +SDL 2.30.8; adapt your SDL version accordingly. 1. Place a copy of `data.zip` in `desktop_version/VVVVVV-android/app/src/main/assets/`. (If the `assets/` folder doesn't exist, then create it.) -2. Obtain the SDL 2.28.5 Maven package. As of writing, SDL currently does not publish +2. Obtain the SDL 2.30.8 Maven package. As of writing, SDL currently does not publish Maven packages, so here is one way to obtain them (other methods are possible): - 1. Download the SDL 2.28.5 source code. + 1. Download the SDL 2.30.8 source code. 2. Run the `build-scripts/android-prefab.sh` script in the SDL repository. 3. After building, run `mvn install:install-file - -Dfile=build-android-prefab/prefab-2.28.5/SDL2-2.28.5.aar - -DpomFile=build-android-prefab/prefab-2.28.5/SDL2-2.28.5.pom` to install it to + -Dfile=build-android-prefab/prefab-2.30.8/SDL2-2.30.8.aar + -DpomFile=build-android-prefab/prefab-2.30.8/SDL2-2.30.8.pom` to install it to Maven Local. 3. Open the `desktop_version/VVVVVV-android/` folder in Android Studio. diff --git a/desktop_version/VVVVVV-android/app/build.gradle b/desktop_version/VVVVVV-android/app/build.gradle index 7eaecbdd..f1b358ce 100644 --- a/desktop_version/VVVVVV-android/app/build.gradle +++ b/desktop_version/VVVVVV-android/app/build.gradle @@ -110,5 +110,5 @@ dependencies { implementation 'org.jetbrains:annotations:15.0' implementation 'androidx.core:core:1.10.1' implementation 'androidx.exifinterface:exifinterface:1.3.6' - implementation 'org.libsdl.android:SDL2:2.28.5' + implementation 'org.libsdl.android:SDL2:2.30.8' }