Browse Source

General upgrades

* Upgrade SDL2 to 2.32.8
* Upgrade VCPKG commit which upgrades some dependencies
* Upgrade Gradle and Gradle plugin
pull/8077/head
Oleksandr Kalko 8 months ago committed by Gleb Mazovetskiy
parent
commit
b821b5ebe5
  1. 2
      .github/workflows/Windows_MSVC_x64.yml
  2. 4
      3rdParty/SDL2/CMakeLists.txt
  3. 2
      android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
  4. 2
      android-project/build.gradle
  5. 2
      android-project/gradle/wrapper/gradle-wrapper.properties
  6. 2
      vcpkg.json

2
.github/workflows/Windows_MSVC_x64.yml

@ -42,7 +42,7 @@ jobs:
- name: Restore or setup vcpkg
uses: lukka/run-vcpkg@v11.5
with:
vcpkgGitCommitId: '533a5fda5c0646d1771345fb572e759283444d5f'
vcpkgGitCommitId: 'b91c3336aee7f32412508f7dd351ae2cabdb8819'
- name: Fetch test data
run: |

4
3rdParty/SDL2/CMakeLists.txt vendored

@ -15,7 +15,7 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
include(functions/FetchContent_ExcludeFromAll_backport)
include(FetchContent)
FetchContent_Declare(SDL2
URL https://github.com/libsdl-org/SDL/releases/download/release-2.32.4/SDL2-2.32.4.tar.gz
URL_HASH SHA256=f15b478253e1ff6dac62257ded225ff4e7d0c5230204ac3450f1144ee806f934
URL https://github.com/libsdl-org/SDL/releases/download/release-2.32.8/SDL2-2.32.8.tar.gz
URL_HASH SHA256=0ca83e9c9b31e18288c7ec811108e58bac1f1bb5ec6577ad386830eac51c787e
)
FetchContent_MakeAvailable_ExcludeFromAll(SDL2)

2
android-project/app/src/main/java/org/libsdl/app/SDLActivity.java

@ -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 = 32;
private static final int SDL_MICRO_VERSION = 4;
private static final int SDL_MICRO_VERSION = 8;
/*
// Display InputType.SOURCE/CLASS of events and devices
//

2
android-project/build.gradle

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.10.0'
classpath 'com.android.tools.build:gradle:8.11.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

2
android-project/gradle/wrapper/gradle-wrapper.properties vendored

@ -1,6 +1,6 @@
#Mon Apr 29 13:42:12 EEST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
vcpkg.json

@ -6,7 +6,7 @@
"bzip2",
"lua"
],
"builtin-baseline": "533a5fda5c0646d1771345fb572e759283444d5f",
"builtin-baseline": "b91c3336aee7f32412508f7dd351ae2cabdb8819",
"features": {
"sdl1": {
"description": "Use SDL1.2 instead of SDL2",

Loading…
Cancel
Save