From 532922ef4b70c06c2dde1f431350562e16a26b73 Mon Sep 17 00:00:00 2001 From: Michael Bonani Date: Tue, 22 Jun 2021 23:30:12 +0200 Subject: [PATCH] update xcode version because it is mandatory for App store (#933) * update xcode version because it is mandatory for Aplestore * update submodule quazip --- azure-pipelines.yml | 8 ++++---- third_party/quazip | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e282d6cdf..92f45ecf7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -329,7 +329,7 @@ jobs: - job: BuildForIOs pool: - vmImage: 'macOS-10.14' + vmImage: 'macOS-10.15' steps: - task: NodeTool@0 inputs: @@ -370,14 +370,14 @@ jobs: displayName: 'Clone submodules' - script: | - sudo xcode-select -s /Applications/Xcode_11.3.1.app/Contents/Developer + sudo xcode-select -s /Applications/Xcode_12.1.1.app/Contents/Developer mkdir build && cd build; mkdir flatc && cd flatc; - cmake ../../third_party/flatbuffers -GXcode + cmake ../../third_party/flatbuffers -G Xcode -T buildsystem=1 cmake --build . --config Release --target flatc export FLATC=`pwd`/Release/flatc cd .. - cmake -DIOS_ARCH="arm64" -DENABLE_BITCODE=NO -DIOS_DEPLOYMENT_TARGET=11.0 -DCMAKE_TOOLCHAIN_FILE=../ios/ios-cmake/ios.toolchain.cmake -DCMAKE_PREFIX_PATH="`pwd`/../Qt/5.15.2/ios/" -G Xcode -DIOS_ARCHIVE_BUILD=1 .. + cmake -DIOS_ARCH="arm64" -DENABLE_BITCODE=NO -DIOS_DEPLOYMENT_TARGET=11.0 -DCMAKE_TOOLCHAIN_FILE=../ios/ios-cmake/ios.toolchain.cmake -DCMAKE_PREFIX_PATH="`pwd`/../Qt/5.15.2/ios/" -G Xcode -T buildsystem=1 -DIOS_ARCHIVE_BUILD=1 .. displayName: 'CONFIGURE with cmake' - script: | diff --git a/third_party/quazip b/third_party/quazip index b6d40d17b..41d24cfcf 160000 --- a/third_party/quazip +++ b/third_party/quazip @@ -1 +1 @@ -Subproject commit b6d40d17b024706f96d6babf9f9bb69d995a79b9 +Subproject commit 41d24cfcf274fe1ca95ff166519178d6e028e7f2