From c417c6db503b71247531ebd0638444fcbab49dc4 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 16 Aug 2024 11:29:29 -0700 Subject: [PATCH 1/3] macOS --- .ci/targets/ios_platform_tests.yaml | 2 +- .ci/targets/macos_platform_tests.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index e679834961f..6287cb4a03a 100644 --- a/.ci/targets/ios_platform_tests.yaml +++ b/.ci/targets/ios_platform_tests.yaml @@ -18,7 +18,7 @@ tasks: - name: xcode analyze deprecation # Ensure we don't accidentally introduce deprecated code. script: .ci/scripts/tool_runner.sh - args: ["xcode-analyze", "--ios", "--ios-min-version=13.0"] + args: ["xcode-analyze", "--ios", "--ios-min-version=14.0"] - name: native test script: .ci/scripts/tool_runner.sh # Simulator name and version must match name and version in create_simulator.sh diff --git a/.ci/targets/macos_platform_tests.yaml b/.ci/targets/macos_platform_tests.yaml index 1dd105f109f..156824c2ebf 100644 --- a/.ci/targets/macos_platform_tests.yaml +++ b/.ci/targets/macos_platform_tests.yaml @@ -15,7 +15,7 @@ tasks: - name: xcode analyze deprecation # Ensure we don't accidentally introduce deprecated code. script: .ci/scripts/tool_runner.sh - args: ["xcode-analyze", "--macos", "--macos-min-version=12.3"] + args: ["xcode-analyze", "--macos", "--macos-min-version=13.0"] - name: native test script: .ci/scripts/tool_runner.sh args: ["native-test", "--macos"] From d4329612d0980bdae22d24bbed2f8278b1d2a573 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Mon, 26 Aug 2024 15:51:35 -0700 Subject: [PATCH 2/3] exclude_xcode_deprecation_ios --- .ci/targets/ios_platform_tests.yaml | 2 +- script/configs/exclude_xcode_deprecation_ios.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 script/configs/exclude_xcode_deprecation_ios.yaml diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index 6287cb4a03a..6eb4dae9cc9 100644 --- a/.ci/targets/ios_platform_tests.yaml +++ b/.ci/targets/ios_platform_tests.yaml @@ -18,7 +18,7 @@ tasks: - name: xcode analyze deprecation # Ensure we don't accidentally introduce deprecated code. script: .ci/scripts/tool_runner.sh - args: ["xcode-analyze", "--ios", "--ios-min-version=14.0"] + args: ["xcode-analyze", "--ios", "--ios-min-version=14.0", "--exclude=script/configs/exclude_xcode_deprecation_ios.yaml"] - name: native test script: .ci/scripts/tool_runner.sh # Simulator name and version must match name and version in create_simulator.sh diff --git a/script/configs/exclude_xcode_deprecation_ios.yaml b/script/configs/exclude_xcode_deprecation_ios.yaml new file mode 100644 index 00000000000..6ffd3b1922c --- /dev/null +++ b/script/configs/exclude_xcode_deprecation_ios.yaml @@ -0,0 +1,2 @@ +# TODO(louisehsu): Remove deprecation check when StoreKit 2 is adopted. https://github.com/flutter/flutter/issues/116383 +- in_app_purchase_ios From a855a6ffffdeecbe281e939b83c951c18c1a6fbc Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Mon, 26 Aug 2024 16:38:00 -0700 Subject: [PATCH 3/3] macos exclusion --- .ci/targets/ios_platform_tests.yaml | 2 +- .ci/targets/macos_platform_tests.yaml | 2 +- ...code_deprecation_ios.yaml => exclude_xcode_deprecation.yaml} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename script/configs/{exclude_xcode_deprecation_ios.yaml => exclude_xcode_deprecation.yaml} (81%) diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index 6eb4dae9cc9..bc962e41ece 100644 --- a/.ci/targets/ios_platform_tests.yaml +++ b/.ci/targets/ios_platform_tests.yaml @@ -18,7 +18,7 @@ tasks: - name: xcode analyze deprecation # Ensure we don't accidentally introduce deprecated code. script: .ci/scripts/tool_runner.sh - args: ["xcode-analyze", "--ios", "--ios-min-version=14.0", "--exclude=script/configs/exclude_xcode_deprecation_ios.yaml"] + args: ["xcode-analyze", "--ios", "--ios-min-version=14.0", "--exclude=script/configs/exclude_xcode_deprecation.yaml"] - name: native test script: .ci/scripts/tool_runner.sh # Simulator name and version must match name and version in create_simulator.sh diff --git a/.ci/targets/macos_platform_tests.yaml b/.ci/targets/macos_platform_tests.yaml index 156824c2ebf..db7867d4a58 100644 --- a/.ci/targets/macos_platform_tests.yaml +++ b/.ci/targets/macos_platform_tests.yaml @@ -15,7 +15,7 @@ tasks: - name: xcode analyze deprecation # Ensure we don't accidentally introduce deprecated code. script: .ci/scripts/tool_runner.sh - args: ["xcode-analyze", "--macos", "--macos-min-version=13.0"] + args: ["xcode-analyze", "--macos", "--macos-min-version=13.0", "--exclude=script/configs/exclude_xcode_deprecation.yaml"] - name: native test script: .ci/scripts/tool_runner.sh args: ["native-test", "--macos"] diff --git a/script/configs/exclude_xcode_deprecation_ios.yaml b/script/configs/exclude_xcode_deprecation.yaml similarity index 81% rename from script/configs/exclude_xcode_deprecation_ios.yaml rename to script/configs/exclude_xcode_deprecation.yaml index 6ffd3b1922c..416839c8e38 100644 --- a/script/configs/exclude_xcode_deprecation_ios.yaml +++ b/script/configs/exclude_xcode_deprecation.yaml @@ -1,2 +1,2 @@ # TODO(louisehsu): Remove deprecation check when StoreKit 2 is adopted. https://github.com/flutter/flutter/issues/116383 -- in_app_purchase_ios +- in_app_purchase_storekit