Browse Source

Upgrade FMT to 12.0

Also upgrades Android Grandle build plugin
pull/8201/head
Oleksandr Kalko 5 months ago committed by Anders Jenbo
parent
commit
c2915e2766
  1. 2
      .github/workflows/Windows_MSVC_x64.yml
  2. 4
      3rdParty/libfmt/CMakeLists.txt
  3. 2
      android-project/build.gradle
  4. 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: 'b91c3336aee7f32412508f7dd351ae2cabdb8819'
vcpkgGitCommitId: 'a62ce77d56ee07513b4b67de1ec2daeaebfae51a'
- name: Fetch test data
run: |

4
3rdParty/libfmt/CMakeLists.txt vendored

@ -16,8 +16,8 @@ else()
endif()
include(FetchContent)
FetchContent_Declare_ExcludeFromAll(libfmt
URL https://github.com/fmtlib/fmt/archive/02537548f3a9efb5f3b83755acf50c8a16ba58c8.tar.gz
URL_HASH MD5=6901c6945cd311117d96baaa6d067380
URL https://github.com/fmtlib/fmt/releases/download/12.0.0/fmt-12.0.0.zip
URL_HASH SHA256=1c32293203449792bf8e94c7f6699c643887e826f2d66a80869b4f279fb07d25
)
FetchContent_MakeAvailable_ExcludeFromAll(libfmt)

2
android-project/build.gradle

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

2
vcpkg.json

@ -7,7 +7,7 @@
"lua",
"magic-enum"
],
"builtin-baseline": "b91c3336aee7f32412508f7dd351ae2cabdb8819",
"builtin-baseline": "a62ce77d56ee07513b4b67de1ec2daeaebfae51a",
"features": {
"sdl1": {
"description": "Use SDL1.2 instead of SDL2",

Loading…
Cancel
Save