Skip to content
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.

Sign up for GitHub

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

Android major upgrades #7524

Merged
merged 3 commits into from
Nov 11, 2024
Merged

Android major upgrades #7524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4087f7c
Android major upgrades
tsunamistate Nov 10, 2024
927de74
Update Android.yml
AJenbo Nov 10, 2024
9cca3ab
Update Android.yml
AJenbo Nov 10, 2024
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
11 changes: 9 additions & 2 deletions .github/workflows/Android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,19 @@ jobs:
distribution: 'adopt'
cache: gradle

- name: Accept SDK licenses
run: yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses

- name: Install CMake
run: |
$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "cmake;3.31.0"

- name: Cache CMake build folder
uses: actions/cache@v4
with:
path: android-project/app/.cxx
key: ${{ github.workflow }}-v4-${{ github.sha }}
restore-keys: ${{ github.workflow }}-v4-
key: ${{ github.workflow }}-v5-${{ github.sha }}
restore-keys: ${{ github.workflow }}-v5-

- name: Build
working-directory: ${{github.workspace}}
Expand Down
4 changes: 2 additions & 2 deletions 3rdParty/SDL2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
include(functions/FetchContent_MakeAvailableExcludeFromAll)
include(FetchContent)
FetchContent_Declare(SDL2
URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.7/SDL2-2.30.7.tar.gz
URL_HASH SHA256=2508c80438cd5ff3bbeb8fe36b8f3ce7805018ff30303010b61b03bb83ab9694
URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.9/SDL2-2.30.9.tar.gz
URL_HASH SHA256=24b574f71c87a763f50704bbb630cbe38298d544a1f890f099a4696b1d6beba4
)
FetchContent_MakeAvailableExcludeFromAll(SDL2)
4 changes: 2 additions & 2 deletions android-project/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if (buildAsApplication) {
}

android {
ndkVersion '26.1.10909125'
ndkVersion '28.0.12433566'
compileSdk 35
defaultConfig {
if (buildAsApplication) {
Expand Down Expand Up @@ -45,7 +45,7 @@ android {
externalNativeBuild {
cmake {
path '../../CMakeLists.txt'
version "3.22.1+"
version "3.31.0+"
buildStagingDirectory System.env.DevilutionX_Android_StagingDirectory
}
}
Expand Down
6 changes: 3 additions & 3 deletions android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
private static final String TAG = "SDL";
private static final int SDL_MAJOR_VERSION = 2;
private static final int SDL_MINOR_VERSION = 30;
private static final int SDL_MICRO_VERSION = 7;
private static final int SDL_MICRO_VERSION = 9;
/*
// Display InputType.SOURCE/CLASS of events and devices
//
Expand Down Expand Up @@ -89,7 +89,7 @@ public static void debugSource(int sources, String prefix) {
| InputDevice.SOURCE_CLASS_POSITION
| InputDevice.SOURCE_CLASS_TRACKBALL);

if (s2 != 0) cls += "Some_Unkown";
if (s2 != 0) cls += "Some_Unknown";

s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;

Expand Down Expand Up @@ -163,7 +163,7 @@ public static void debugSource(int sources, String prefix) {
if (s == FLAG_TAINTED) src += " FLAG_TAINTED";
s2 &= ~FLAG_TAINTED;

if (s2 != 0) src += " Some_Unkown";
if (s2 != 0) src += " Some_Unknown";

Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src);
}
Expand Down
2 changes: 1 addition & 1 deletion android-project/build.gradle
View file
Open in desktop
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.7.1'
classpath 'com.android.tools.build:gradle:8.7.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
Loading