Merge branch 'main' into remove-deprecated-library

Author: mboetger

.ci/flutter_master.version

@@ -1 +1 @@
-2ec61af30672ebfaf625d7127dd5c99e1796b949
+d117642c18e0d5e3a96ae00d4340b1b0724de24c

.ci/flutter_stable.version

@@ -1 +1 @@
-ff37bef603469fb030f2b72995ab929ccfc227f0
+2c9eb20739dfec95e2c74bd3dfa4601b0a8a36aa

.ci/scripts/create_all_packages_app.sh

@@ -10,10 +10,11 @@ exclusions=("script/configs/exclude_all_packages_app.yaml")
 # Add a wasm-specific exclusion file if "--wasm" is specified.
 if [[ "$1" == "--wasm" ]]; then
   exclusions+=",script/configs/exclude_all_packages_app_wasm.yaml"
+  shift 1
 fi
 
 # Delete ./all_packages if it exists already
 rm -rf ./all_packages
 
 dart ./script/tool/bin/flutter_plugin_tools.dart create-all-packages-app \
-    --output-dir=. --exclude "$exclusions"
+    --output-dir=. --exclude "$exclusions" "$@"

.ci/scripts/enable_swift_package_manager.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright 2013 The Flutter Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+set -e
+
+flutter config --enable-swift-package-manager

.ci/targets/ios_build_all_packages.yaml

@@ -2,12 +2,11 @@ tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
-  - name: download Dart and iOS deps
-    script: .ci/scripts/tool_runner.sh
-    args: ["fetch-deps", "--ios", "--supporting-target-platforms-only"]
-    infra_step: true
   - name: create all_packages app
     script: .ci/scripts/create_all_packages_app.sh
+    # build-examples builds with Swift Package Manager, so run build-all without
+    # it to test both modes in CI.
+    args: ["--no-swift-package-manager"]
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build all_packages for iOS debug
     script: .ci/scripts/build_all_packages_app.sh

.ci/targets/ios_platform_tests.yaml

@@ -2,12 +2,16 @@ tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: enable Swift Package Manager
+    # For consistency between stable and master channels, enable SwiftPM.
+    # TODO(stuartmorgan): Remove this step once it's the default on stable.
+    script: .ci/scripts/enable_swift_package_manager.sh
   - name: create simulator
     script: .ci/scripts/create_simulator.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: download Dart and iOS deps
     script: .ci/scripts/tool_runner.sh
-    args: ["fetch-deps", "--ios", "--supporting-target-platforms-only"]
+    args: ["fetch-deps", "--ios", "--supporting-target-platforms-only", "--swift-package-manager"]
     infra_step: true
   - name: build examples
     script: .ci/scripts/tool_runner.sh

.ci/targets/macos_build_all_packages.yaml

@@ -2,12 +2,11 @@ tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
-  - name: download Dart and macOS deps
-    script: .ci/scripts/tool_runner.sh
-    args: ["fetch-deps", "--macos", "--supporting-target-platforms-only"]
-    infra_step: true
   - name: create all_packages app
     script: .ci/scripts/create_all_packages_app.sh
+    # build-examples builds with Swift Package Manager, so run build-all without
+    # it to test both modes in CI.
+    args: ["--no-swift-package-manager"]
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build all_packages for macOS debug
     script: .ci/scripts/build_all_packages_app.sh

.ci/targets/macos_platform_tests.yaml

@@ -2,9 +2,13 @@ tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: enable Swift Package Manager
+    # For consistency between stable and master channels, enable SwiftPM.
+    # TODO(stuartmorgan): Remove this step once it's the default on stable.
+    script: .ci/scripts/enable_swift_package_manager.sh
   - name: download Dart and macOS deps
     script: .ci/scripts/tool_runner.sh
-    args: ["fetch-deps", "--macos", "--supporting-target-platforms-only"]
+    args: ["fetch-deps", "--macos", "--supporting-target-platforms-only", "--swift-package-manager"]
     infra_step: true
   - name: build examples
     script: .ci/scripts/tool_runner.sh

packages/animations/example/ios/Flutter/AppFrameworkInfo.plist

@@ -20,7 +20,5 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>12.0</string>
 </dict>
 </plist>

packages/animations/example/ios/Runner.xcodeproj/project.pbxproj

@@ -135,7 +135,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "The Flutter Authors";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -283,7 +283,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -366,7 +366,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -415,7 +415,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;