From bd94b19ada8979be0a45fcac6a2d74eadf3f9471 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 17 Apr 2025 10:08:07 -0400 Subject: [PATCH 1/4] SPM for test_plugin --- .../test_plugin/darwin/test_plugin.podspec | 2 +- .../darwin/test_plugin/Package.swift | 23 +++++++++++++++++++ .../Sources/test_plugin}/.gitignore | 0 .../Sources/test_plugin}/CoreTests.gen.swift | 0 .../test_plugin}/EventChannelTests.gen.swift | 0 .../test_plugin}/ProxyApiTestClass.swift | 0 .../test_plugin}/ProxyApiTests.gen.swift | 0 .../Sources/test_plugin}/TestPlugin.swift | 0 packages/pigeon/tool/shared/generation.dart | 8 ++++--- 9 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Package.swift rename packages/pigeon/platform_tests/test_plugin/darwin/{Classes => test_plugin/Sources/test_plugin}/.gitignore (100%) rename packages/pigeon/platform_tests/test_plugin/darwin/{Classes => test_plugin/Sources/test_plugin}/CoreTests.gen.swift (100%) rename packages/pigeon/platform_tests/test_plugin/darwin/{Classes => test_plugin/Sources/test_plugin}/EventChannelTests.gen.swift (100%) rename packages/pigeon/platform_tests/test_plugin/darwin/{Classes => test_plugin/Sources/test_plugin}/ProxyApiTestClass.swift (100%) rename packages/pigeon/platform_tests/test_plugin/darwin/{Classes => test_plugin/Sources/test_plugin}/ProxyApiTests.gen.swift (100%) rename packages/pigeon/platform_tests/test_plugin/darwin/{Classes => test_plugin/Sources/test_plugin}/TestPlugin.swift (100%) diff --git a/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin.podspec b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin.podspec index 6cc844c5968..42b91b20960 100644 --- a/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin.podspec +++ b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin.podspec @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.license = { :type => 'BSD', :file => '../../../LICENSE' } s.author = { 'Your Company' => 'email@example.com' } s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/pigeon' } - s.source_files = 'Classes/**/*' + s.source_files = 'test_plugin/Sources/test_plugin/**/*.swift' s.ios.dependency 'Flutter' s.osx.dependency 'FlutterMacOS' s.ios.deployment_target = '12.0' diff --git a/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Package.swift b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Package.swift new file mode 100644 index 00000000000..2fce817bdc9 --- /dev/null +++ b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Package.swift @@ -0,0 +1,23 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "test_plugin", + platforms: [ + .iOS("12.0"), + .macOS("10.14") + ], + products: [ + .library(name: "test-plugin", targets: ["test_plugin"]) + ], + dependencies: [], + targets: [ + .target( + name: "test_plugin", + dependencies: [], + resources: [] + ) + ] +) diff --git a/packages/pigeon/platform_tests/test_plugin/darwin/Classes/.gitignore b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/.gitignore similarity index 100% rename from packages/pigeon/platform_tests/test_plugin/darwin/Classes/.gitignore rename to packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/.gitignore diff --git a/packages/pigeon/platform_tests/test_plugin/darwin/Classes/CoreTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/CoreTests.gen.swift similarity index 100% rename from packages/pigeon/platform_tests/test_plugin/darwin/Classes/CoreTests.gen.swift rename to packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/CoreTests.gen.swift diff --git a/packages/pigeon/platform_tests/test_plugin/darwin/Classes/EventChannelTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/EventChannelTests.gen.swift similarity index 100% rename from packages/pigeon/platform_tests/test_plugin/darwin/Classes/EventChannelTests.gen.swift rename to packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/EventChannelTests.gen.swift diff --git a/packages/pigeon/platform_tests/test_plugin/darwin/Classes/ProxyApiTestClass.swift b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/ProxyApiTestClass.swift similarity index 100% rename from packages/pigeon/platform_tests/test_plugin/darwin/Classes/ProxyApiTestClass.swift rename to packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/ProxyApiTestClass.swift diff --git a/packages/pigeon/platform_tests/test_plugin/darwin/Classes/ProxyApiTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/ProxyApiTests.gen.swift similarity index 100% rename from packages/pigeon/platform_tests/test_plugin/darwin/Classes/ProxyApiTests.gen.swift rename to packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/ProxyApiTests.gen.swift diff --git a/packages/pigeon/platform_tests/test_plugin/darwin/Classes/TestPlugin.swift b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/TestPlugin.swift similarity index 100% rename from packages/pigeon/platform_tests/test_plugin/darwin/Classes/TestPlugin.swift rename to packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/TestPlugin.swift diff --git a/packages/pigeon/tool/shared/generation.dart b/packages/pigeon/tool/shared/generation.dart index 8972745553c..dd9e02418a6 100644 --- a/packages/pigeon/tool/shared/generation.dart +++ b/packages/pigeon/tool/shared/generation.dart @@ -101,9 +101,11 @@ Future generateTestPigeons( 'proxy_api_tests', }; - final String outputBase = p.join(baseDir, 'platform_tests', 'test_plugin'); + const String testPluginName = 'test_plugin'; + const String alternateTestPluginName = 'alternate_language_test_plugin'; + final String outputBase = p.join(baseDir, 'platform_tests', testPluginName); final String alternateOutputBase = - p.join(baseDir, 'platform_tests', 'alternate_language_test_plugin'); + p.join(baseDir, 'platform_tests', alternateTestPluginName); final String sharedDartOutputBase = p.join(baseDir, 'platform_tests', 'shared_test_plugin_code'); @@ -144,7 +146,7 @@ Future generateTestPigeons( // iOS/macOS swiftOut: skipLanguages.contains(GeneratorLanguage.swift) ? null - : '$outputBase/darwin/Classes/$pascalCaseName.gen.swift', + : '$outputBase/darwin/$testPluginName/Sources/$testPluginName/$pascalCaseName.gen.swift', swiftErrorClassName: swiftErrorClassName, swiftIncludeErrorClass: input != 'primitive', // Linux From 7f6f557dcda6616a525e9e5287b0fa074db1a8c3 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 17 Apr 2025 10:35:12 -0400 Subject: [PATCH 2/4] SPM for alternate_language_test_plugin --- .../alternate_language_test_plugin.podspec | 4 +-- .../Package.swift | 26 +++++++++++++++++++ .../.gitignore | 0 .../AlternateLanguageTestPlugin.m | 0 .../CoreTests.gen.m | 2 +- .../AlternateLanguageTestPlugin.h | 0 .../CoreTests.gen.h | 0 .../example/.gitignore | 2 ++ packages/pigeon/tool/shared/generation.dart | 15 ++++++++--- 9 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Package.swift rename packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/{Classes => alternate_language_test_plugin/Sources/alternate_language_test_plugin}/.gitignore (100%) rename packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/{Classes => alternate_language_test_plugin/Sources/alternate_language_test_plugin}/AlternateLanguageTestPlugin.m (100%) rename packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/{Classes => alternate_language_test_plugin/Sources/alternate_language_test_plugin}/CoreTests.gen.m (99%) rename packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/{Classes => alternate_language_test_plugin/Sources/alternate_language_test_plugin/include/alternate_language_test_plugin}/AlternateLanguageTestPlugin.h (100%) rename packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/{Classes => alternate_language_test_plugin/Sources/alternate_language_test_plugin/include/alternate_language_test_plugin}/CoreTests.gen.h (100%) diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin.podspec b/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin.podspec index 3599cd09f49..45bbd5350de 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin.podspec +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin.podspec @@ -13,8 +13,8 @@ A plugin to test Pigeon generation for secondary languages (e.g., Java, Objectiv s.license = { :type => 'BSD', :file => '../../../LICENSE' } s.author = { 'Your Company' => 'email@example.com' } s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/pigeon' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'alternate_language_test_plugin/Sources/alternate_language_test_plugin/**/*.{h,m}' + s.public_header_files = 'alternate_language_test_plugin/Sources/alternate_language_test_plugin/include/**/*.h' s.ios.dependency 'Flutter' s.osx.dependency 'FlutterMacOS' s.ios.deployment_target = '12.0' diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Package.swift b/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Package.swift new file mode 100644 index 00000000000..de029978f20 --- /dev/null +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Package.swift @@ -0,0 +1,26 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "alternate_language_test_plugin", + platforms: [ + .iOS("12.0"), + .macOS("10.14"), + ], + products: [ + .library(name: "alternate-language-test-plugin", targets: ["alternate_language_test_plugin"]) + ], + dependencies: [], + targets: [ + .target( + name: "alternate_language_test_plugin", + dependencies: [], + resources: [], + cSettings: [ + .headerSearchPath("include/alternate_language_test_plugin") + ] + ) + ] +) diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/Classes/.gitignore b/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Sources/alternate_language_test_plugin/.gitignore similarity index 100% rename from packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/Classes/.gitignore rename to packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Sources/alternate_language_test_plugin/.gitignore diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/Classes/AlternateLanguageTestPlugin.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Sources/alternate_language_test_plugin/AlternateLanguageTestPlugin.m similarity index 100% rename from packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/Classes/AlternateLanguageTestPlugin.m rename to packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Sources/alternate_language_test_plugin/AlternateLanguageTestPlugin.m diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/Classes/CoreTests.gen.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Sources/alternate_language_test_plugin/CoreTests.gen.m similarity index 99% rename from packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/Classes/CoreTests.gen.m rename to packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Sources/alternate_language_test_plugin/CoreTests.gen.m index 36fb0a516f5..65d9c336d64 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/Classes/CoreTests.gen.m +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Sources/alternate_language_test_plugin/CoreTests.gen.m @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -#import "CoreTests.gen.h" +#import "./include/alternate_language_test_plugin/CoreTests.gen.h" #if TARGET_OS_OSX #import diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/Classes/AlternateLanguageTestPlugin.h b/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Sources/alternate_language_test_plugin/include/alternate_language_test_plugin/AlternateLanguageTestPlugin.h similarity index 100% rename from packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/Classes/AlternateLanguageTestPlugin.h rename to packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Sources/alternate_language_test_plugin/include/alternate_language_test_plugin/AlternateLanguageTestPlugin.h diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/Classes/CoreTests.gen.h b/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Sources/alternate_language_test_plugin/include/alternate_language_test_plugin/CoreTests.gen.h similarity index 100% rename from packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/Classes/CoreTests.gen.h rename to packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Sources/alternate_language_test_plugin/include/alternate_language_test_plugin/CoreTests.gen.h diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/.gitignore b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/.gitignore index 24476c5d1eb..6c319542b34 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/.gitignore +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related diff --git a/packages/pigeon/tool/shared/generation.dart b/packages/pigeon/tool/shared/generation.dart index dd9e02418a6..1714ffe22b4 100644 --- a/packages/pigeon/tool/shared/generation.dart +++ b/packages/pigeon/tool/shared/generation.dart @@ -172,6 +172,10 @@ Future generateTestPigeons( } // Generate the alternate language test plugin output. + final String objcBase = + '$alternateOutputBase/darwin/$alternateTestPluginName/Sources/$alternateTestPluginName/'; + final String objcBaseRelativeHeaderPath = + 'include/$alternateTestPluginName/$pascalCaseName.gen.h'; generateCode = await runPigeon( input: './pigeons/$input.dart', // Android @@ -185,10 +189,11 @@ Future generateTestPigeons( // iOS/macOS objcHeaderOut: skipLanguages.contains(GeneratorLanguage.objc) ? null - : '$alternateOutputBase/darwin/Classes/$pascalCaseName.gen.h', + : '$objcBase/$objcBaseRelativeHeaderPath', objcSourceOut: skipLanguages.contains(GeneratorLanguage.objc) ? null - : '$alternateOutputBase/darwin/Classes/$pascalCaseName.gen.m', + : '$objcBase/$pascalCaseName.gen.m', + objcHeaderIncludePath: './$objcBaseRelativeHeaderPath', objcPrefix: input == 'core_tests' ? 'FLT' : input == 'enum' @@ -228,6 +233,7 @@ Future runPigeon({ String? objcHeaderOut, String? objcSourceOut, String objcPrefix = '', + String? objcHeaderIncludePath, bool suppressVersion = false, String copyrightHeader = './copyright_header.txt', String? basePath, @@ -287,7 +293,10 @@ Future runPigeon({ ), objcHeaderOut: objcHeaderOut, objcSourceOut: objcSourceOut, - objcOptions: ObjcOptions(prefix: objcPrefix), + objcOptions: ObjcOptions( + prefix: objcPrefix, + headerIncludePath: objcHeaderIncludePath, + ), swiftOut: swiftOut, swiftOptions: SwiftOptions( errorClassName: swiftErrorClassName, From 400dcb1d74e5afd44a32287943591d5cd81ef785 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 17 Apr 2025 10:55:15 -0400 Subject: [PATCH 3/4] Check in all the automatic project changes --- .../ios/Runner.xcodeproj/project.pbxproj | 20 +++++++++ .../xcshareddata/xcschemes/Runner.xcscheme | 21 ++++++++++ .../macos/Runner.xcodeproj/project.pbxproj | 42 ++++++++++--------- .../xcshareddata/xcschemes/Runner.xcscheme | 21 +++++++++- .../example/macos/Runner/AppDelegate.swift | 6 ++- .../darwin/test_plugin/Package.swift | 32 +++++++------- .../ios/Runner.xcodeproj/project.pbxproj | 40 ++++++++++-------- .../xcshareddata/xcschemes/Runner.xcscheme | 21 ++++++++++ .../macos/Runner.xcodeproj/project.pbxproj | 42 ++++++++++--------- .../xcshareddata/xcschemes/Runner.xcscheme | 21 +++++++++- 10 files changed, 191 insertions(+), 75 deletions(-) diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/Runner.xcodeproj/project.pbxproj b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/Runner.xcodeproj/project.pbxproj index d922c88e3d4..25d767028d4 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/Runner.xcodeproj/project.pbxproj @@ -29,6 +29,7 @@ 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; EB2133B34553CD36D4AE374F /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F87F49FAD891F66A75D95E85 /* libPods-Runner.a */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -109,6 +110,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, EB2133B34553CD36D4AE374F /* libPods-Runner.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -240,6 +242,9 @@ productType = "com.apple.product-type.bundle.unit-test"; }; 97C146ED1CF9000F007C117D /* Runner */ = { + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( @@ -264,6 +269,9 @@ /* Begin PBXProject section */ 97C146E61CF9000F007C117D /* Project object */ = { + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); isa = PBXProject; attributes = { LastUpgradeCheck = 1510; @@ -745,6 +753,18 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index d19488d45ea..17337d64b42 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/macos/Runner.xcodeproj/project.pbxproj b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/macos/Runner.xcodeproj/project.pbxproj index 27dfc3decfb..4a79415c598 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/macos/Runner.xcodeproj/project.pbxproj @@ -29,6 +29,7 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -103,6 +104,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 0D7AA04F867B850C58216739 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -240,7 +242,6 @@ 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 271CA0FEC73C4F272B016320 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -248,6 +249,9 @@ 33CC11202044C79F0003C045 /* PBXTargetDependency */, ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 33CC10ED2044A3C60003C045 /* alternate_language_test_plugin_example.app */; productType = "com.apple.product-type.application"; @@ -259,7 +263,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { @@ -291,6 +295,9 @@ Base, ); mainGroup = 33CC10E42044A3C60003C045; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -322,23 +329,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 271CA0FEC73C4F272B016320 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -786,6 +776,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 33CC10E52044A3C60003C045 /* Project object */; } diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index fbd9258fad0..a574a8a2591 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,10 +1,28 @@ + + + + + + + + + + diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/macos/Runner/AppDelegate.swift b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/macos/Runner/AppDelegate.swift index 5cec4c48f62..21fbd0297b2 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/macos/Runner/AppDelegate.swift +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/macos/Runner/AppDelegate.swift @@ -5,9 +5,13 @@ import Cocoa import FlutterMacOS -@NSApplicationMain +@main class AppDelegate: FlutterAppDelegate { override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { return true } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } } diff --git a/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Package.swift b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Package.swift index 2fce817bdc9..e8217247970 100644 --- a/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Package.swift +++ b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Package.swift @@ -4,20 +4,20 @@ import PackageDescription let package = Package( - name: "test_plugin", - platforms: [ - .iOS("12.0"), - .macOS("10.14") - ], - products: [ - .library(name: "test-plugin", targets: ["test_plugin"]) - ], - dependencies: [], - targets: [ - .target( - name: "test_plugin", - dependencies: [], - resources: [] - ) - ] + name: "test_plugin", + platforms: [ + .iOS("12.0"), + .macOS("10.14"), + ], + products: [ + .library(name: "test-plugin", targets: ["test_plugin"]) + ], + dependencies: [], + targets: [ + .target( + name: "test_plugin", + dependencies: [], + resources: [] + ) + ] ) diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/Runner.xcodeproj/project.pbxproj b/packages/pigeon/platform_tests/test_plugin/example/ios/Runner.xcodeproj/project.pbxproj index ea266506b36..576c8070408 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/pigeon/platform_tests/test_plugin/example/ios/Runner.xcodeproj/project.pbxproj @@ -25,6 +25,7 @@ 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 6885ADFFF3D912887C317B7C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 786308B4AA81D1B6AA2FA10F /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 8F85C49D2BBB14F30053FB60 /* InstanceManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F85C49C2BBB14F30053FB60 /* InstanceManagerTests.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; @@ -108,6 +109,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 6885ADFFF3D912887C317B7C /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -239,13 +241,15 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 4D9647CB4932DC9B30ABB8E3 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -279,6 +283,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -327,23 +334,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 4D9647CB4932DC9B30ABB8E3 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 68071F6E376CAAF900FEFD29 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -772,6 +762,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/pigeon/platform_tests/test_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 58761a450d7..c30cba8d26f 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/pigeon/platform_tests/test_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + diff --git a/packages/pigeon/platform_tests/test_plugin/example/macos/Runner.xcodeproj/project.pbxproj b/packages/pigeon/platform_tests/test_plugin/example/macos/Runner.xcodeproj/project.pbxproj index 60de312721d..55a5621471d 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/pigeon/platform_tests/test_plugin/example/macos/Runner.xcodeproj/project.pbxproj @@ -28,6 +28,7 @@ 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; 6315A7A2721DA1118B8E9021 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29E004D53850EB57FB6837A5 /* Pods_RunnerTests.framework */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 875D4A972362F737CAF2FE4C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FC0DA6B36ADE41CB6E0674E /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ @@ -103,6 +104,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 875D4A972362F737CAF2FE4C /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -240,7 +242,6 @@ 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 00374FFAF955BD99437C03D6 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -248,6 +249,9 @@ 33CC11202044C79F0003C045 /* PBXTargetDependency */, ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 33CC10ED2044A3C60003C045 /* test_plugin_example.app */; productType = "com.apple.product-type.application"; @@ -259,7 +263,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1400; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 33A341DA291ED36900D34E0F = { @@ -291,6 +295,9 @@ Base, ); mainGroup = 33CC10E42044A3C60003C045; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -322,23 +329,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 00374FFAF955BD99437C03D6 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -786,6 +776,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 33CC10E52044A3C60003C045 /* Project object */; } diff --git a/packages/pigeon/platform_tests/test_plugin/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/pigeon/platform_tests/test_plugin/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 3e0488488ea..c8eb95c5f73 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/pigeon/platform_tests/test_plugin/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,10 +1,28 @@ + + + + + + + + + + From deacffd62bbaac25aefcf47c02d87417048e2fa4 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 17 Apr 2025 12:32:15 -0400 Subject: [PATCH 4/4] Licenses --- .../darwin/alternate_language_test_plugin/Package.swift | 4 ++++ .../test_plugin/darwin/test_plugin/Package.swift | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Package.swift b/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Package.swift index de029978f20..6d0fb8ffa56 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Package.swift +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Package.swift @@ -1,6 +1,10 @@ // swift-tools-version: 5.9 // The swift-tools-version declares the minimum version of Swift required to build this package. +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + import PackageDescription let package = Package( diff --git a/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Package.swift b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Package.swift index e8217247970..e13c11f7bfa 100644 --- a/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Package.swift +++ b/packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Package.swift @@ -1,6 +1,10 @@ // swift-tools-version: 5.9 // The swift-tools-version declares the minimum version of Swift required to build this package. +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + import PackageDescription let package = Package(