diff --git a/CI/install_conan_dependencies.sh b/CI/install_conan_dependencies.sh index a3dfd5d1d..691c05a3e 100755 --- a/CI/install_conan_dependencies.sh +++ b/CI/install_conan_dependencies.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -RELEASE_TAG="2025-12-10" -FILENAME="$1.tgz" +RELEASE_TAG="2026-03-03" +FILENAME="$1.txz" DOWNLOAD_URL="https://github.com/vcmi/vcmi-dependencies/releases/download/$RELEASE_TAG/$FILENAME" downloadedFile="$RUNNER_TEMP/$FILENAME" diff --git a/dependencies b/dependencies index 185772414..727454e5d 160000 --- a/dependencies +++ b/dependencies @@ -1 +1 @@ -Subproject commit 1857724145d25bcf9910f9a953c9d8452235c9a6 +Subproject commit 727454e5da12689c830fda89ab98d9d8eb2267c1 diff --git a/docker/BuildAndroid-aarch64.dockerfile b/docker/BuildAndroid-aarch64.dockerfile index 6efe14d2a..cbe883d83 100644 --- a/docker/BuildAndroid-aarch64.dockerfile +++ b/docker/BuildAndroid-aarch64.dockerfile @@ -11,7 +11,7 @@ RUN pipx install 'sdkmanager' RUN conan profile detect -ENV DEPS="dependencies-android-arm64-v8a.tgz" +ENV DEPS="dependencies-android-arm64-v8a.txz" COPY CI/install_conan_dependencies.sh CI/install_conan_dependencies.sh RUN DEPS_VERSION=$(grep '^RELEASE_TAG=' CI/install_conan_dependencies.sh | cut -d'"' -f2) && \ echo "Using DEPS_VERSION=$DEPS_VERSION" && \ diff --git a/docs/developers/Building_iOS.md b/docs/developers/Building_iOS.md index 506a93dee..7161d635d 100644 --- a/docs/developers/Building_iOS.md +++ b/docs/developers/Building_iOS.md @@ -13,9 +13,9 @@ cd vcmi conan profile detect # 3) Restore prebuilt iOS dependencies cache -# Download dependencies-ios.tgz from https://github.com/vcmi/vcmi-dependencies/releases +# Download dependencies-ios.txz from https://github.com/vcmi/vcmi-dependencies/releases # If you do not have the tarball, skip this step and use --build=missing in the install command. -conan cache restore dependencies-ios.tgz +conan cache restore dependencies-ios.txz # 4) Install dependencies (prebuilt binaries) # Pick Debug or Release and keep it consistent with the build configuration you use later. @@ -72,10 +72,10 @@ The primary and officially supported way is [Conan package manager](./Conan.md). There are also [legacy manually built libraries](https://github.com/vcmi/vcmi-ios-deps) which can be used if you have Xcode 11/12 or to build for simulator / armv7 device, but this way is no longer supported. Using Conan will also let you build with any Xcode version and for any architecture / SDK. -If you are using the prebuilt dependency cache, download `dependencies-ios.tgz` from and restore it: +If you are using the prebuilt dependency cache, download `dependencies-ios.txz` from and restore it: ```sh -conan cache restore dependencies-ios.tgz +conan cache restore dependencies-ios.txz ``` ## Configuring project