From 724f8539252be1cd4c52a14bffd87f39d395de73 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 14 Feb 2024 16:52:41 -0800 Subject: [PATCH 01/10] Use MacOS 13 runner for Xcode 15.1. --- .github/workflows/cpp-packaging.yml | 20 ++++++------- .github/workflows/desktop.yml | 4 +-- .github/workflows/integration_tests.yml | 34 +++++++++++------------ .github/workflows/ios.yml | 2 +- .github/workflows/update-dependencies.yml | 2 +- scripts/gha/print_matrix_configuration.py | 12 ++++---- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index 94224b94f1..bb0b52a1f5 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -79,13 +79,13 @@ jobs: if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }} strategy: matrix: - os: [ubuntu-20.04, macos-12] + os: [ubuntu-20.04, macos-13] include: - os: ubuntu-20.04 tools_platform: linux # Binutils 2.35.1 released Sep 19, 2020 binutils_version: "2.35.1" - - os: macos-12 + - os: macos-13 tools_platform: darwin # Binutils 2.35.1 released Sep 19, 2020 binutils_version: "2.35.1" @@ -185,7 +185,7 @@ jobs: build_and_package_ios_tvos: name: build-and-package-ios-tvos - runs-on: macos-12 + runs-on: macos-13 if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }} steps: - name: Store git credentials for all git commands @@ -305,7 +305,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest, ubuntu-20.04, macos-12] + os: [windows-latest, ubuntu-20.04, macos-13] build_type: ["Release", "Debug"] architecture: ["x64", "x86", "arm64"] msvc_runtime: ["static", "dynamic"] @@ -325,7 +325,7 @@ jobs: vcpkg_triplet_suffix: "linux" additional_build_flags: "" sdk_platform: "linux" - - os: macos-12 + - os: macos-13 vcpkg_triplet_suffix: "osx" additional_build_flags: "--target_format libraries" sdk_platform: "darwin" @@ -333,13 +333,13 @@ jobs: exclude: - os: windows-latest linux_abi: "c++11" - - os: macos-12 + - os: macos-13 architecture: "x86" - - os: macos-12 + - os: macos-13 msvc_runtime: "dynamic" - - os: macos-12 + - os: macos-13 linux_abi: "c++11" - - os: macos-12 + - os: macos-13 build_type: "Debug" - os: ubuntu-20.04 msvc_runtime: "dynamic" @@ -492,7 +492,7 @@ jobs: suffix: '-x64-Debug-dynamic' runs_on_platform: ubuntu-20.04 - sdk_platform: darwin - runs_on_platform: macos-12 + runs_on_platform: macos-13 exclude: - sdk_platform: windows suffix: '' diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 9b057088fa..04562eb635 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -72,10 +72,10 @@ jobs: # msvc_runtime excludes - os: ubuntu-20.04 msvc_runtime: "dynamic" - - os: macos-12 + - os: macos-13 msvc_runtime: "dynamic" # architecture excluees - - os: macos-12 + - os: macos-13 architecture: "x86" # Xcode excludes -- allow only one on osx and linux - os: ubuntu-20.04 diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index e1ab1d8cda..def5bd66e0 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -21,7 +21,7 @@ on: required: true operating_systems: description: 'CSV of VMs to run on' - default: 'ubuntu-20.04,windows-latest,macos-12' + default: 'ubuntu-20.04,windows-latest,macos-13' required: true desktop_ssl_variants: description: 'CSV of desktop SSL variants to use' @@ -204,7 +204,7 @@ jobs: # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo echo "::warning ::Running against Firestore tip-of-tree" matrix_platform="Desktop" - matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-20.04,macos-12") + matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-20.04,macos-13") else matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "${{github.event.inputs.platforms}}" --apis ${apis} ) matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "${{github.event.inputs.operating_systems}}") @@ -271,7 +271,7 @@ jobs: - os: ubuntu-20.04 arch: arm64 # Do not attempt to use x86 on Mac. - - os: macos-12 + - os: macos-13 arch: x86 # Until we support building openssl from source, we can't use the # system's openssl when cross-compiling, except on Linux. Builds all @@ -280,7 +280,7 @@ jobs: - os: windows-latest ssl_variant: openssl arch: x86 - - os: macos-12 + - os: macos-13 ssl_variant: openssl arch: arm64 steps: @@ -522,7 +522,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12] + os: [macos-13] steps: - uses: actions/checkout@v3 with: @@ -621,7 +621,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12] + os: [macos-13] steps: - uses: actions/checkout@v3 with: @@ -732,7 +732,7 @@ jobs: - os: ubuntu-20.04 arch: arm64 # Do not attempt to use x86 on Mac. - - os: macos-12 + - os: macos-13 arch: x86 # Until we support building openssl from source, we can't use the # system's openssl when cross-compiling, except on Linux. Builds all @@ -744,7 +744,7 @@ jobs: # Custom for this matrix: MacOS GitHub-hosted runner cannot test arm64 # code. Exclude that scenario from running here; it will run in # test_desktop_custom_runners. - - os: macos-12 + - os: macos-13 arch: arm64 steps: - uses: actions/checkout@v3 @@ -843,7 +843,7 @@ jobs: name: test-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}-custom-runner needs: [check_and_prepare, build_desktop] runs-on: [self-hosted, firebase-cpp, '${{ matrix.runner_label }}'] - if: contains(needs.check_and_prepare.outputs.matrix_platform, 'Desktop') && contains(needs.check_and_prepare.outputs.matrix_arch_combined, 'arm64') && contains(needs.check_and_prepare.outputs.matrix_os, 'macos-12') && needs.check_and_prepare.outputs.apis != '' && !cancelled() + if: contains(needs.check_and_prepare.outputs.matrix_platform, 'Desktop') && contains(needs.check_and_prepare.outputs.matrix_arch_combined, 'arm64') && contains(needs.check_and_prepare.outputs.matrix_os, 'macos-13') && needs.check_and_prepare.outputs.apis != '' && !cancelled() strategy: fail-fast: false matrix: @@ -858,15 +858,15 @@ jobs: - os: windows-latest runner_label: ${{ needs.check_and_prepare.outputs.runner_label_macos_arm64 }} # Don't run x86 tests on any Mac runner. - - os: macos-12 + - os: macos-13 arch: x86 # Don't run x64 tests on the Mac arm64 runner. - - os: macos-12 + - os: macos-13 arch: x64 runner_label: ${{ needs.check_and_prepare.outputs.runner_label_macos_arm64 }} # Until we support building openssl from source, we can't link to system # openssl when cross-compiling, so exclude openssl from mac arm64 testing. - - os: macos-12 + - os: macos-13 arch: arm64 ssl_variant: openssl steps: @@ -911,7 +911,7 @@ jobs: ${{ secrets.TEST_SECRET }} EOF - name: Run Desktop integration tests on M1 Mac - if: ${{ matrix.os == 'macos-12' && matrix.arch == 'arm64' && matrix.runner_label == needs.check_and_prepare.outputs.runner_label_macos_arm64 }} + if: ${{ matrix.os == 'macos-13' && matrix.arch == 'arm64' && matrix.runner_label == needs.check_and_prepare.outputs.runner_label_macos_arm64 }} shell: bash run: | # This is an M1 Mac GitHub self-hosted runner. @@ -1120,7 +1120,7 @@ jobs: test_ios: name: test-ios-${{ matrix.build_os }}-${{ matrix.ios_device }}-${{ matrix.test_type }} needs: [check_and_prepare, build_ios] - runs-on: macos-12 + runs-on: macos-13 if: contains(needs.check_and_prepare.outputs.matrix_platform, 'iOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled() strategy: fail-fast: false @@ -1134,7 +1134,7 @@ jobs: test_type: "uitest" - ios_device: "ios_latest" test_type: "uitest" - build_os: [macos-12] + build_os: [macos-13] steps: - uses: actions/checkout@v3 with: @@ -1264,13 +1264,13 @@ jobs: test_tvos: name: test-tvos-${{ matrix.build_os }}-${{ matrix.tvos_device }} needs: [check_and_prepare, build_tvos] - runs-on: macos-12 + runs-on: macos-13 if: contains(needs.check_and_prepare.outputs.matrix_platform, 'tvOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled() strategy: fail-fast: false matrix: tvos_device: ${{ fromJson(needs.check_and_prepare.outputs.tvos_device) }} - build_os: [macos-12] + build_os: [macos-13] steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 63cade37e6..ce025f1adb 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -41,7 +41,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ 'macos-12' ] + os: [ 'macos-13' ] xcode_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_xcode_version) }} steps: - name: Store git credentials for all git commands diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index e285d77bdd..c898e87fa9 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -25,7 +25,7 @@ env: jobs: update_dependencies: name: update-deps - runs-on: macos-12 + runs-on: macos-13 steps: - name: Get token for firebase-workflow-trigger uses: tibdex/github-app-token@v1 diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 066cc85d80..67c2d34bb2 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -73,7 +73,7 @@ PARAMETERS = { "desktop": { "matrix": { - "os": ["ubuntu-20.04", "macos-12"], + "os": ["ubuntu-20.04", "macos-13"], "build_type": ["Release", "Debug"], "architecture": ["x64", "x86", "arm64"], "msvc_runtime": ["static","dynamic"], @@ -81,27 +81,27 @@ "python_version": ["3.7"], EXPANDED_KEY: { - "os": ["ubuntu-20.04", "macos-12", "windows-latest"], - "xcode_version": ["14.1"], + "os": ["ubuntu-20.04", "macos-13", "windows-latest"], + "xcode_version": ["15.1"], } } }, "android": { "matrix": { - "os": ["ubuntu-20.04", "macos-12", "windows-latest"], + "os": ["ubuntu-20.04", "macos-13", "windows-latest"], "architecture": ["x64"], "python_version": ["3.7"], EXPANDED_KEY: { - "os": ["ubuntu-20.04", "macos-12", "windows-latest"] + "os": ["ubuntu-20.04", "macos-13", "windows-latest"] } } }, "integration_tests": { "matrix": { - "os": ["ubuntu-20.04", "macos-12", "windows-latest"], + "os": ["ubuntu-20.04", "macos-13", "windows-latest"], "platform": ["Desktop", "Android", "iOS", "tvOS"], "ssl_lib": ["openssl"], "android_device": ["android_target", "emulator_ftl_target"], From 87e6680b0f16978e593152ff34092afbd4a6277f Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 14 Feb 2024 17:14:14 -0800 Subject: [PATCH 02/10] Force Android build to use Java 8. --- .github/workflows/integration_tests.yml | 4 ++++ scripts/gha/print_matrix_configuration.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index def5bd66e0..6a887cf6c0 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -420,6 +420,10 @@ jobs: with: ref: ${{needs.check_and_prepare.outputs.github_ref}} submodules: true + - name: Force Java 8 (macOS) + if: startsWith(matrix.os, 'macos') + shell: bash + run: echo JAVA_HOME=${JAVA_HOME_8_X64} >> $GITHUB_ENV - name: Add msbuild to PATH (Windows) if: startsWith(matrix.os, 'windows') uses: microsoft/setup-msbuild@v1.1 diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 67c2d34bb2..41d2db2d4b 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -82,7 +82,7 @@ EXPANDED_KEY: { "os": ["ubuntu-20.04", "macos-13", "windows-latest"], - "xcode_version": ["15.1"], + "xcode_version": ["14.1"], } } }, From a7f057b14eae5cc627c0ff8c1bd9d4bc091570be Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 14 Feb 2024 17:14:53 -0800 Subject: [PATCH 03/10] Remove trailing whitespace and add to Android workflow. --- .github/workflows/android.yml | 5 +++++ .github/workflows/integration_tests.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index df6493cab5..43f8de427e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -55,6 +55,11 @@ jobs: if: runner.os == 'macOS' run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer + - name: Force Java 8 (macOS) + if: startsWith(matrix.os, 'macos') + shell: bash + run: echo JAVA_HOME=${JAVA_HOME_8_X64} >> $GITHUB_ENV + - name: Store git credentials for all git commands # Forces all git commands to use authenticated https, to prevent throttling. shell: bash diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 6a887cf6c0..40641f9aa9 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -423,7 +423,7 @@ jobs: - name: Force Java 8 (macOS) if: startsWith(matrix.os, 'macos') shell: bash - run: echo JAVA_HOME=${JAVA_HOME_8_X64} >> $GITHUB_ENV + run: echo JAVA_HOME=${JAVA_HOME_8_X64} >> $GITHUB_ENV - name: Add msbuild to PATH (Windows) if: startsWith(matrix.os, 'windows') uses: microsoft/setup-msbuild@v1.1 From c3f8c12d640dcb26fa0eb9b7ce8c49d9a399248d Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 14 Feb 2024 17:18:01 -0800 Subject: [PATCH 04/10] Add quotes. --- .github/workflows/android.yml | 4 +--- .github/workflows/integration_tests.yml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 43f8de427e..2b4520e51d 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -54,12 +54,10 @@ jobs: - name: setup Xcode version (macos) if: runner.os == 'macOS' run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer - - name: Force Java 8 (macOS) if: startsWith(matrix.os, 'macos') shell: bash - run: echo JAVA_HOME=${JAVA_HOME_8_X64} >> $GITHUB_ENV - + run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV - name: Store git credentials for all git commands # Forces all git commands to use authenticated https, to prevent throttling. shell: bash diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 40641f9aa9..282132a812 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -423,7 +423,7 @@ jobs: - name: Force Java 8 (macOS) if: startsWith(matrix.os, 'macos') shell: bash - run: echo JAVA_HOME=${JAVA_HOME_8_X64} >> $GITHUB_ENV + run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV - name: Add msbuild to PATH (Windows) if: startsWith(matrix.os, 'windows') uses: microsoft/setup-msbuild@v1.1 From c5208d0798616d5992faf59e38edd7e50cced931 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Thu, 15 Feb 2024 10:11:08 -0800 Subject: [PATCH 05/10] Update simulator devices to xcode 15.1 compatible. --- scripts/gha/print_matrix_configuration.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 41d2db2d4b..6fcdb58c17 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -223,9 +223,9 @@ {"type": "ftl", "device": "model=iphone8,version=16.6"}, {"type": "ftl", "device": "model=ipad10,version=16.6"}, ], - "simulator_min": [ {"type": "virtual", "name":"iPhone 8", "version":"15.2"} ], - "simulator_target": [ {"type": "virtual", "name":"iPhone 8", "version":"16.1"} ], - "simulator_latest": [ {"type": "virtual", "name":"iPhone 11", "version":"16.1"} ], + "simulator_min": [ {"type": "virtual", "name":"iPhone SE (3rd generation)", "version":"16.1"} ], + "simulator_target": [ {"type": "virtual", "name":"iPhone 14", "version":"17.0.1"} ], + "simulator_latest": [ {"type": "virtual", "name":"iPhone 14 Pro Max", "version":"17.2"} ], "tvos_simulator": [ {"type": "virtual", "name":"Apple TV", "version":"16.1"} ], } From 77397491d27ebe19c6679d0b05c7c5520fe7da98 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Thu, 15 Feb 2024 14:08:07 -0800 Subject: [PATCH 06/10] Increase Android test timeout. --- .github/workflows/integration_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 282132a812..f231f8867b 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -1040,7 +1040,7 @@ jobs: distribution: 'temurin' java-version: '8' - name: Run Android integration tests on Emulator locally - timeout-minutes: 150 + timeout-minutes: 180 if: steps.device-info.outputs.device_type == 'virtual' run: | python scripts/gha/test_simulator.py --testapp_dir testapps \ @@ -1051,7 +1051,7 @@ jobs: - id: ftl_test if: steps.device-info.outputs.device_type == 'ftl' uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4 - timeout-minutes: 120 + timeout-minutes: 180 with: credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }} testapp_dir: testapps From 3fb44bccf593de0a64ee866f80ca05b9329d3041 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 20 Feb 2024 12:56:05 -0800 Subject: [PATCH 07/10] Increase timeouts. --- .github/workflows/integration_tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index f231f8867b..d8210327e4 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -1051,7 +1051,7 @@ jobs: - id: ftl_test if: steps.device-info.outputs.device_type == 'ftl' uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4 - timeout-minutes: 180 + timeout-minutes: 240 with: credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }} testapp_dir: testapps @@ -1191,7 +1191,7 @@ jobs: run: | firebase emulators:start --only firestore --project demo-example & - name: Run iOS integration tests on Simulator locally - timeout-minutes: 150 + timeout-minutes: 180 if: steps.device-info.outputs.device_type == 'virtual' run: | python scripts/gha/test_simulator.py --testapp_dir testapps \ @@ -1202,7 +1202,7 @@ jobs: - id: ftl_test if: steps.device-info.outputs.device_type == 'ftl' uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4 - timeout-minutes: 90 + timeout-minutes: 120 with: credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }} testapp_dir: testapps @@ -1318,7 +1318,7 @@ jobs: run: | firebase emulators:start --only firestore --project demo-example & - name: Run tvOS integration tests on Simulator locally - timeout-minutes: 90 + timeout-minutes: 120 run: | python scripts/gha/test_simulator.py --testapp_dir testapps \ --tvos_device "${{ matrix.tvos_device }}" \ From 7aae7dc02cddd06abb565f776673976876296c29 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 6 Mar 2024 11:57:45 -0800 Subject: [PATCH 08/10] Remove bad device from Android list. --- scripts/gha/print_matrix_configuration.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 6fcdb58c17..6462fffdf8 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -174,7 +174,6 @@ TEST_DEVICES = { "android_target": [ {"type": "ftl", "device": "model=blueline,version=28"}, # Pixel 3 - {"type": "ftl", "device": "model=dreamlte,version=28"}, # Galaxy S8 {"type": "ftl", "device": "model=gts3lltevzw,version=28"}, # Galaxy Tab S3 {"type": "ftl", "device": "model=SH-01L,version=28"}, # AQUOS sense2 SH-01L ], From d78922a4eefd071c261e539101e6d41a63ce9bc2 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Wed, 6 Mar 2024 14:53:34 -0800 Subject: [PATCH 09/10] Update the integration tests SWIFT_VERSION --- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- .../gameloop.xcodeproj/project.pbxproj | 16 ++++++++-------- .../project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 8 ++++---- 16 files changed, 60 insertions(+), 60 deletions(-) diff --git a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj index 7dbeda497b..4511cf76bf 100644 --- a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj @@ -479,7 +479,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -510,7 +510,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -563,7 +563,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -614,7 +614,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.ios.analytics.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/app/integration_test/integration_test.xcodeproj/project.pbxproj b/app/integration_test/integration_test.xcodeproj/project.pbxproj index 82593ef7f4..c2f33244b9 100644 --- a/app/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/app/integration_test/integration_test.xcodeproj/project.pbxproj @@ -314,7 +314,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -345,7 +345,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj index 16cbe44041..df7fe0c798 100644 --- a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj @@ -427,7 +427,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -459,7 +459,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.appcheck.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -512,7 +512,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -563,7 +563,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.appcheck.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/auth/integration_test/integration_test.xcodeproj/project.pbxproj b/auth/integration_test/integration_test.xcodeproj/project.pbxproj index bdbceb97fc..482db9e51f 100644 --- a/auth/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/auth/integration_test/integration_test.xcodeproj/project.pbxproj @@ -505,7 +505,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -537,7 +537,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.FirebaseCppAuthTestApp.dev; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -590,7 +590,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -641,7 +641,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.FirebaseCppAuthTestApp.dev; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/database/integration_test/integration_test.xcodeproj/project.pbxproj b/database/integration_test/integration_test.xcodeproj/project.pbxproj index 8a2ef30286..4d293c57dc 100644 --- a/database/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/database/integration_test/integration_test.xcodeproj/project.pbxproj @@ -427,7 +427,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -459,7 +459,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.database.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -512,7 +512,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -563,7 +563,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.database.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj b/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj index bf61e2a445..4036c8938a 100644 --- a/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj @@ -314,7 +314,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -345,7 +345,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj index 6f53ba0b95..fe60d59095 100644 --- a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj @@ -523,7 +523,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -555,7 +555,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.firestore.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -611,7 +611,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -665,7 +665,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj index acc596b31b..311b446faf 100644 --- a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj @@ -825,7 +825,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -874,7 +874,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.firestore.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -946,7 +946,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -1016,7 +1016,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/functions/integration_test/integration_test.xcodeproj/project.pbxproj b/functions/integration_test/integration_test.xcodeproj/project.pbxproj index c142aa743c..7f4a8aac6b 100644 --- a/functions/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/functions/integration_test/integration_test.xcodeproj/project.pbxproj @@ -507,7 +507,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -540,7 +540,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.functions.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -597,7 +597,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -652,7 +652,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/gma/integration_test/integration_test.xcodeproj/project.pbxproj b/gma/integration_test/integration_test.xcodeproj/project.pbxproj index 35b4a36051..ed14afbb01 100644 --- a/gma/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/gma/integration_test/integration_test.xcodeproj/project.pbxproj @@ -319,7 +319,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -351,7 +351,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/installations/integration_test/integration_test.xcodeproj/project.pbxproj b/installations/integration_test/integration_test.xcodeproj/project.pbxproj index ba76407391..52c31320be 100644 --- a/installations/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/installations/integration_test/integration_test.xcodeproj/project.pbxproj @@ -314,7 +314,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -345,7 +345,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj index 50397c4fc1..3326d85de3 100644 --- a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj @@ -504,7 +504,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -536,7 +536,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -590,7 +590,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -642,7 +642,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.google.FirebaseCppMessagingTestApp.dev.integration-test-tvos"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj index 9d7e4a4d38..03a180adc4 100644 --- a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj @@ -479,7 +479,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -510,7 +510,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -563,7 +563,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -614,7 +614,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.ios.remoteconfig.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; diff --git a/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj b/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj index 498027e55f..a774bdb83b 100644 --- a/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj +++ b/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj @@ -402,7 +402,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -429,7 +429,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -451,7 +451,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TEST_TARGET_NAME = gameloop_tvos; TVOS_DEPLOYMENT_TARGET = 10.1; @@ -474,7 +474,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TEST_TARGET_NAME = gameloop_tvos; TVOS_DEPLOYMENT_TARGET = 10.1; @@ -610,7 +610,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.gameloop; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 14.5; }; @@ -629,7 +629,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.gameloop; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 14.5; }; @@ -647,7 +647,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.gameloopUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = gameloop; }; @@ -665,7 +665,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.gameloopUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = gameloop; }; diff --git a/scripts/gha/ui_testing/uitest_apple/FirebaseCppUITestApp.xcodeproj/project.pbxproj b/scripts/gha/ui_testing/uitest_apple/FirebaseCppUITestApp.xcodeproj/project.pbxproj index c364a51247..2389a01b57 100644 --- a/scripts/gha/ui_testing/uitest_apple/FirebaseCppUITestApp.xcodeproj/project.pbxproj +++ b/scripts/gha/ui_testing/uitest_apple/FirebaseCppUITestApp.xcodeproj/project.pbxproj @@ -366,7 +366,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.uitestapp.dev; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Google Development"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -385,7 +385,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.uitestapp.dev; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Google Development"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -405,7 +405,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.FirebaseCppUITestAppUITests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Google Development"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = FirebaseCppUITestApp; }; @@ -426,7 +426,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.FirebaseCppUITestAppUITests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Google Development"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = FirebaseCppUITestApp; }; diff --git a/storage/integration_test/integration_test.xcodeproj/project.pbxproj b/storage/integration_test/integration_test.xcodeproj/project.pbxproj index 764c0c9a16..22c9abcf4f 100644 --- a/storage/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/storage/integration_test/integration_test.xcodeproj/project.pbxproj @@ -491,7 +491,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Debug; @@ -523,7 +523,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.cpp.storage.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; WRAPPER_EXTENSION = app; }; name = Release; @@ -579,7 +579,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; @@ -633,7 +633,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.1; }; From f634c7ded3f1b979919cc7f3491c56b194909e09 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 6 Mar 2024 16:15:04 -0800 Subject: [PATCH 10/10] Fix tvOS deployment target in Xcode projects. --- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj index 4511cf76bf..61b2f0a179 100644 --- a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj @@ -565,7 +565,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -616,7 +616,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj index df7fe0c798..f44ee13bf7 100644 --- a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj @@ -514,7 +514,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -565,7 +565,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/auth/integration_test/integration_test.xcodeproj/project.pbxproj b/auth/integration_test/integration_test.xcodeproj/project.pbxproj index 482db9e51f..fafa4a688f 100644 --- a/auth/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/auth/integration_test/integration_test.xcodeproj/project.pbxproj @@ -592,7 +592,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -643,7 +643,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/database/integration_test/integration_test.xcodeproj/project.pbxproj b/database/integration_test/integration_test.xcodeproj/project.pbxproj index 4d293c57dc..563e7d44e9 100644 --- a/database/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/database/integration_test/integration_test.xcodeproj/project.pbxproj @@ -514,7 +514,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -565,7 +565,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj index fe60d59095..9a813b3d6b 100644 --- a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj @@ -613,7 +613,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -667,7 +667,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj index 311b446faf..82e38ef226 100644 --- a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj @@ -948,7 +948,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -1018,7 +1018,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/functions/integration_test/integration_test.xcodeproj/project.pbxproj b/functions/integration_test/integration_test.xcodeproj/project.pbxproj index 7f4a8aac6b..ce3d4ecadb 100644 --- a/functions/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/functions/integration_test/integration_test.xcodeproj/project.pbxproj @@ -599,7 +599,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -654,7 +654,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj index 3326d85de3..3f6535e8b8 100644 --- a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj @@ -592,7 +592,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -644,7 +644,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj index 03a180adc4..5d5250a7df 100644 --- a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj @@ -565,7 +565,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -616,7 +616,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/storage/integration_test/integration_test.xcodeproj/project.pbxproj b/storage/integration_test/integration_test.xcodeproj/project.pbxproj index 22c9abcf4f..35f1e2759b 100644 --- a/storage/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/storage/integration_test/integration_test.xcodeproj/project.pbxproj @@ -581,7 +581,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -635,7 +635,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; };