mirror of
https://github.com/diasurgical/DevilutionX.git
synced 2026-05-21 05:40:35 +00:00
Upgrade FMT to 12.0
Also upgrades Android Grandle build plugin
This commit is contained in:
committed by
Anders Jenbo
parent
22dae6896c
commit
c2915e2766
@@ -42,7 +42,7 @@ jobs:
|
|||||||
- name: Restore or setup vcpkg
|
- name: Restore or setup vcpkg
|
||||||
uses: lukka/run-vcpkg@v11.5
|
uses: lukka/run-vcpkg@v11.5
|
||||||
with:
|
with:
|
||||||
vcpkgGitCommitId: 'b91c3336aee7f32412508f7dd351ae2cabdb8819'
|
vcpkgGitCommitId: 'a62ce77d56ee07513b4b67de1ec2daeaebfae51a'
|
||||||
|
|
||||||
- name: Fetch test data
|
- name: Fetch test data
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
Vendored
+2
-2
@@ -16,8 +16,8 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
include(FetchContent)
|
include(FetchContent)
|
||||||
FetchContent_Declare_ExcludeFromAll(libfmt
|
FetchContent_Declare_ExcludeFromAll(libfmt
|
||||||
URL https://github.com/fmtlib/fmt/archive/02537548f3a9efb5f3b83755acf50c8a16ba58c8.tar.gz
|
URL https://github.com/fmtlib/fmt/releases/download/12.0.0/fmt-12.0.0.zip
|
||||||
URL_HASH MD5=6901c6945cd311117d96baaa6d067380
|
URL_HASH SHA256=1c32293203449792bf8e94c7f6699c643887e826f2d66a80869b4f279fb07d25
|
||||||
)
|
)
|
||||||
FetchContent_MakeAvailable_ExcludeFromAll(libfmt)
|
FetchContent_MakeAvailable_ExcludeFromAll(libfmt)
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ buildscript {
|
|||||||
google()
|
google()
|
||||||
}
|
}
|
||||||
dependencies {
|
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
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|||||||
+1
-1
@@ -7,7 +7,7 @@
|
|||||||
"lua",
|
"lua",
|
||||||
"magic-enum"
|
"magic-enum"
|
||||||
],
|
],
|
||||||
"builtin-baseline": "b91c3336aee7f32412508f7dd351ae2cabdb8819",
|
"builtin-baseline": "a62ce77d56ee07513b4b67de1ec2daeaebfae51a",
|
||||||
"features": {
|
"features": {
|
||||||
"sdl1": {
|
"sdl1": {
|
||||||
"description": "Use SDL1.2 instead of SDL2",
|
"description": "Use SDL1.2 instead of SDL2",
|
||||||
|
|||||||
Reference in New Issue
Block a user