From e9a4a2950fa1fb5e49fb344ca047ed2609efb984 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Wed, 30 Apr 2025 10:39:43 -0500 Subject: [PATCH 1/3] Add link to manual integration instructions --- .../swift_package_manager_integration_migration.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart b/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart index 56c7d909dee99..4e7ed1d2df665 100644 --- a/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart +++ b/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart @@ -173,8 +173,6 @@ class SwiftPackageManagerIntegrationMigration extends ProjectMigrator { await _xcodeProjectInterpreter.getInfo(_xcodeProject.hostAppRoot.path); } on Exception catch (e) { restoreFromBackup(schemeInfo); - // TODO(vashworth): Add link to instructions on how to manually integrate - // once available on website. throwToolExit( 'An error occurred when adding Swift Package Manager integration:\n' ' $e\n\n' @@ -184,10 +182,12 @@ class SwiftPackageManagerIntegrationMigration extends ProjectMigrator { ' ${_platform.name}/Runner.xcodeproj/project.pbxproj\n' ' ${_platform.name}/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme ' '(or the scheme for the flavor used)\n\n' - 'To avoid this failure, disable Flutter Swift Package Manager integration for the project\n' + 'To add Swift Package Manager integration manually, please use the following instructions:\n' + 'https://docs.flutter.dev/packages-and-plugins/swift-package-manager/for-app-developers#add-to-a-flutter-app-manually.\n\n' + 'Alternatively, to avoid this failure, disable Flutter Swift Package Manager integration for the project\n' 'by adding the following in the project\'s pubspec.yaml under the "flutter" section:\n' ' "disable-swift-package-manager: true"\n' - 'Alternatively, disable Flutter Swift Package Manager integration globally with the\n' + 'Or disable Flutter Swift Package Manager integration globally with the\n' 'following command:\n' ' "flutter config --no-enable-swift-package-manager"\n', ); From ce296c87514352d47759572f962bb70cd8379503 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Wed, 30 Apr 2025 13:12:29 -0500 Subject: [PATCH 2/3] Remove period at end of url --- .../migrations/swift_package_manager_integration_migration.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart b/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart index 4e7ed1d2df665..393d5ed9232f1 100644 --- a/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart +++ b/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart @@ -183,7 +183,7 @@ class SwiftPackageManagerIntegrationMigration extends ProjectMigrator { ' ${_platform.name}/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme ' '(or the scheme for the flavor used)\n\n' 'To add Swift Package Manager integration manually, please use the following instructions:\n' - 'https://docs.flutter.dev/packages-and-plugins/swift-package-manager/for-app-developers#add-to-a-flutter-app-manually.\n\n' + 'https://docs.flutter.dev/packages-and-plugins/swift-package-manager/for-app-developers#add-to-a-flutter-app-manually\n\n' 'Alternatively, to avoid this failure, disable Flutter Swift Package Manager integration for the project\n' 'by adding the following in the project\'s pubspec.yaml under the "flutter" section:\n' ' "disable-swift-package-manager: true"\n' From c16972c67997da318c13aad2537fdb268ae5390f Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Fri, 2 May 2025 13:44:26 -0500 Subject: [PATCH 3/3] update website link --- .../migrations/swift_package_manager_integration_migration.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart b/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart index 393d5ed9232f1..74bad5a17860d 100644 --- a/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart +++ b/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart @@ -183,7 +183,7 @@ class SwiftPackageManagerIntegrationMigration extends ProjectMigrator { ' ${_platform.name}/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme ' '(or the scheme for the flavor used)\n\n' 'To add Swift Package Manager integration manually, please use the following instructions:\n' - 'https://docs.flutter.dev/packages-and-plugins/swift-package-manager/for-app-developers#add-to-a-flutter-app-manually\n\n' + 'https://docs.flutter.dev/to/add-swift-package-manager-manually\n\n' 'Alternatively, to avoid this failure, disable Flutter Swift Package Manager integration for the project\n' 'by adding the following in the project\'s pubspec.yaml under the "flutter" section:\n' ' "disable-swift-package-manager: true"\n'