From 1b4a2e96853e1c740b93096d31bdbf211f5c0bbc Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 10 Apr 2024 15:23:01 -0400 Subject: [PATCH 01/11] Migrate iOS, untested --- .../file_selector_ios/example/ios/.gitignore | 2 ++ .../ios/Runner.xcodeproj/project.pbxproj | 20 +++++++++++++ .../xcshareddata/xcschemes/Runner.xcscheme | 18 ++++++++++++ .../file_selector_ios/ios/Assets/.gitkeep | 0 .../ios/file_selector_ios.podspec | 7 +++-- .../ios/file_selector_ios/Packages.swift | 29 +++++++++++++++++++ .../FFSFileSelectorPlugin.m | 0 .../FFSFileSelectorPlugin_Test.h | 0 .../Resources/PrivacyInfo.xcprivacy | 0 .../cocoapods_file_selector_ios.modulemap} | 0 .../FFSFileSelectorPlugin.h | 0 .../file_selector_ios-umbrella.h | 0 .../include/module.modulemap | 10 +++++++ .../Sources/file_selector_ios}/messages.g.h | 0 .../Sources/file_selector_ios}/messages.g.m | 0 .../file_selector_ios/pigeons/messages.dart | 4 +-- 16 files changed, 85 insertions(+), 5 deletions(-) delete mode 100644 packages/file_selector/file_selector_ios/ios/Assets/.gitkeep create mode 100644 packages/file_selector/file_selector_ios/ios/file_selector_ios/Packages.swift rename packages/file_selector/file_selector_ios/ios/{Classes => file_selector_ios/Sources/file_selector_ios}/FFSFileSelectorPlugin.m (100%) rename packages/file_selector/file_selector_ios/ios/{Classes => file_selector_ios/Sources/file_selector_ios}/FFSFileSelectorPlugin_Test.h (100%) rename packages/file_selector/file_selector_ios/ios/{ => file_selector_ios/Sources/file_selector_ios}/Resources/PrivacyInfo.xcprivacy (100%) rename packages/file_selector/file_selector_ios/ios/{Classes/FileSelectorPlugin.modulemap => file_selector_ios/Sources/file_selector_ios/include/cocoapods_file_selector_ios.modulemap} (100%) rename packages/file_selector/file_selector_ios/ios/{Classes => file_selector_ios/Sources/file_selector_ios/include/file_selector_ios}/FFSFileSelectorPlugin.h (100%) rename packages/file_selector/file_selector_ios/ios/{Classes => file_selector_ios/Sources/file_selector_ios/include/file_selector_ios}/file_selector_ios-umbrella.h (100%) create mode 100644 packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/module.modulemap rename packages/file_selector/file_selector_ios/ios/{Classes => file_selector_ios/Sources/file_selector_ios}/messages.g.h (100%) rename packages/file_selector/file_selector_ios/ios/{Classes => file_selector_ios/Sources/file_selector_ios}/messages.g.m (100%) diff --git a/packages/file_selector/file_selector_ios/example/ios/.gitignore b/packages/file_selector/file_selector_ios/example/ios/.gitignore index 7a7f9873ad7d..7658df10cb7a 100644 --- a/packages/file_selector/file_selector_ios/example/ios/.gitignore +++ b/packages/file_selector/file_selector_ios/example/ios/.gitignore @@ -32,3 +32,5 @@ Runner/GeneratedPluginRegistrant.* !default.mode2v3 !default.pbxuser !default.perspectivev3 + +**/Flutter/Packages/FlutterGeneratedPluginSwiftPackage diff --git a/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj b/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj index f6d350beac69..fa65f8a53a22 100644 --- a/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj @@ -16,6 +16,7 @@ 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; C71AE4C8281C6B6B0086307A /* FileSelectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C71AE4C5281C6B530086307A /* FileSelectorTests.m */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -72,6 +73,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 21160A929DC757957DE39F1E /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -168,6 +170,9 @@ /* Begin PBXNativeTarget section */ 97C146ED1CF9000F007C117D /* Runner */ = { + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( @@ -212,6 +217,9 @@ /* Begin PBXProject section */ 97C146E61CF9000F007C117D /* Project object */ = { + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); isa = PBXProject; attributes = { LastUpgradeCheck = 1510; @@ -749,6 +757,18 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/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/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 828f48e73f80..5b6df8a1c381 100644 --- a/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + 'BSD', :file => '../LICENSE' } s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_ios' } - s.source_files = 'Classes/**/*.{h,m}' - s.module_map = 'Classes/FileSelectorPlugin.modulemap' + s.source_files = 'file_selector_ios/Sources/file_selector_ios/**/*.{h,m}' + s.public_header_files = 'file_selector_ios/Sources/file_selector_ios/include/file_selector_ios**/*.h' + s.module_map = 'file_selector_ios/Sources/file_selector_ios/include/cocoapods_file_selector_ios.modulemap' s.dependency 'Flutter' s.platform = :ios, '12.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } s.swift_version = '5.0' - s.resource_bundles = {'file_selector_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']} + s.resource_bundles = {'file_selector_ios_privacy' => ['file_selector_ios/Sources/file_selector_ios/Resources/PrivacyInfo.xcprivacy']} end diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Packages.swift b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Packages.swift new file mode 100644 index 000000000000..eb78dbe21a48 --- /dev/null +++ b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Packages.swift @@ -0,0 +1,29 @@ +// 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: "file_selector_ios", + platforms: [ + .iOS("12.0") + ], + products: [ + // If the plugin name contains "_", replace with "-" for the library name + .library(name: "file-selector-ios", targets: ["file_selector_ios"]) + ], + dependencies: [], + targets: [ + .target( + name: "file_selector_ios", + dependencies: [], + exclude: ["include/file_selector_ios.modulemap"], + resources: [ + .process("Resources") + ], + cSettings: [ + .headerSearchPath("include/file_selector_ios") + ] + ) + ] +) diff --git a/packages/file_selector/file_selector_ios/ios/Classes/FFSFileSelectorPlugin.m b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/FFSFileSelectorPlugin.m similarity index 100% rename from packages/file_selector/file_selector_ios/ios/Classes/FFSFileSelectorPlugin.m rename to packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/FFSFileSelectorPlugin.m diff --git a/packages/file_selector/file_selector_ios/ios/Classes/FFSFileSelectorPlugin_Test.h b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/FFSFileSelectorPlugin_Test.h similarity index 100% rename from packages/file_selector/file_selector_ios/ios/Classes/FFSFileSelectorPlugin_Test.h rename to packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/FFSFileSelectorPlugin_Test.h diff --git a/packages/file_selector/file_selector_ios/ios/Resources/PrivacyInfo.xcprivacy b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from packages/file_selector/file_selector_ios/ios/Resources/PrivacyInfo.xcprivacy rename to packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/Resources/PrivacyInfo.xcprivacy diff --git a/packages/file_selector/file_selector_ios/ios/Classes/FileSelectorPlugin.modulemap b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/cocoapods_file_selector_ios.modulemap similarity index 100% rename from packages/file_selector/file_selector_ios/ios/Classes/FileSelectorPlugin.modulemap rename to packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/cocoapods_file_selector_ios.modulemap diff --git a/packages/file_selector/file_selector_ios/ios/Classes/FFSFileSelectorPlugin.h b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/file_selector_ios/FFSFileSelectorPlugin.h similarity index 100% rename from packages/file_selector/file_selector_ios/ios/Classes/FFSFileSelectorPlugin.h rename to packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/file_selector_ios/FFSFileSelectorPlugin.h diff --git a/packages/file_selector/file_selector_ios/ios/Classes/file_selector_ios-umbrella.h b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/file_selector_ios/file_selector_ios-umbrella.h similarity index 100% rename from packages/file_selector/file_selector_ios/ios/Classes/file_selector_ios-umbrella.h rename to packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/file_selector_ios/file_selector_ios-umbrella.h diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/module.modulemap b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/module.modulemap new file mode 100644 index 000000000000..b097198c1354 --- /dev/null +++ b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/module.modulemap @@ -0,0 +1,10 @@ +module file_selector_ios { + umbrella header "file_selector_ios-umbrella.h" + + export * + module * { export * } + + explicit module Test { + header "file_selector_ios/FFSFileSelectorPlugin_Test.h" + } +} diff --git a/packages/file_selector/file_selector_ios/ios/Classes/messages.g.h b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/messages.g.h similarity index 100% rename from packages/file_selector/file_selector_ios/ios/Classes/messages.g.h rename to packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/messages.g.h diff --git a/packages/file_selector/file_selector_ios/ios/Classes/messages.g.m b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/messages.g.m similarity index 100% rename from packages/file_selector/file_selector_ios/ios/Classes/messages.g.m rename to packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/messages.g.m diff --git a/packages/file_selector/file_selector_ios/pigeons/messages.dart b/packages/file_selector/file_selector_ios/pigeons/messages.dart index 66706cc2406e..d1c8661b4a4e 100644 --- a/packages/file_selector/file_selector_ios/pigeons/messages.dart +++ b/packages/file_selector/file_selector_ios/pigeons/messages.dart @@ -7,8 +7,8 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( dartOut: 'lib/src/messages.g.dart', dartTestOut: 'test/test_api.g.dart', - objcHeaderOut: 'ios/Classes/messages.g.h', - objcSourceOut: 'ios/Classes/messages.g.m', + objcHeaderOut: 'ios/file_selector_ios/Sources/file_selector_ios/messages.g.h', + objcSourceOut: 'ios/file_selector_ios/Sources/file_selector_ios/messages.g.m', objcOptions: ObjcOptions( prefix: 'FFS', ), From bab6f26a5ab3be0c6940bd7fe1cd2801d992fd51 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 10 Apr 2024 15:58:04 -0400 Subject: [PATCH 02/11] Migrate macOS, untested --- .../macos/file_selector_macos.podspec | 2 +- .../macos/file_selector_macos/Packages.swift | 22 +++++++++++++++++++ .../FileSelectorPlugin.swift | 0 .../file_selector_macos}/messages.g.swift | 0 .../file_selector_macos/pigeons/messages.dart | 3 ++- 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 packages/file_selector/file_selector_macos/macos/file_selector_macos/Packages.swift rename packages/file_selector/file_selector_macos/macos/{Classes => file_selector_macos/Sources/file_selector_macos}/FileSelectorPlugin.swift (100%) rename packages/file_selector/file_selector_macos/macos/{Classes => file_selector_macos/Sources/file_selector_macos}/messages.g.swift (100%) diff --git a/packages/file_selector/file_selector_macos/macos/file_selector_macos.podspec b/packages/file_selector/file_selector_macos/macos/file_selector_macos.podspec index fb460b41c97d..bb4bffee9e00 100644 --- a/packages/file_selector/file_selector_macos/macos/file_selector_macos.podspec +++ b/packages/file_selector/file_selector_macos/macos/file_selector_macos.podspec @@ -12,7 +12,7 @@ Displays native macOS open and save panels. s.homepage = 'https://github.com/flutter/packages/tree/main/packages/file_selector' s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_macos' } - s.source_files = 'Classes/**/*' + s.source_files = 'file_selector_macos/Sources/file_selector_macos/**/*.swift' s.dependency 'FlutterMacOS' s.platform = :osx, '10.14' diff --git a/packages/file_selector/file_selector_macos/macos/file_selector_macos/Packages.swift b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Packages.swift new file mode 100644 index 000000000000..67760e27ec82 --- /dev/null +++ b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Packages.swift @@ -0,0 +1,22 @@ +// 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: "file_selector_macos", + platforms: [ + .macoOS("10.14") + ], + products: [ + // If the plugin name contains "_", replace with "-" for the library name + .library(name: "file-selector-macos", targets: ["file_selector_macos"]) + ], + dependencies: [], + targets: [ + .target( + name: "file_selector_macos", + dependencies: [], + ) + ] +) diff --git a/packages/file_selector/file_selector_macos/macos/Classes/FileSelectorPlugin.swift b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Sources/file_selector_macos/FileSelectorPlugin.swift similarity index 100% rename from packages/file_selector/file_selector_macos/macos/Classes/FileSelectorPlugin.swift rename to packages/file_selector/file_selector_macos/macos/file_selector_macos/Sources/file_selector_macos/FileSelectorPlugin.swift diff --git a/packages/file_selector/file_selector_macos/macos/Classes/messages.g.swift b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Sources/file_selector_macos/messages.g.swift similarity index 100% rename from packages/file_selector/file_selector_macos/macos/Classes/messages.g.swift rename to packages/file_selector/file_selector_macos/macos/file_selector_macos/Sources/file_selector_macos/messages.g.swift diff --git a/packages/file_selector/file_selector_macos/pigeons/messages.dart b/packages/file_selector/file_selector_macos/pigeons/messages.dart index 85b2996baf8a..698ebcfc1002 100644 --- a/packages/file_selector/file_selector_macos/pigeons/messages.dart +++ b/packages/file_selector/file_selector_macos/pigeons/messages.dart @@ -5,7 +5,8 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( input: 'pigeons/messages.dart', - swiftOut: 'macos/Classes/messages.g.swift', + swiftOut: + 'macos/file_selector_macos/Sources/file_selector_macos/messages.g.swift', dartOut: 'lib/src/messages.g.dart', dartTestOut: 'test/messages_test.g.dart', copyrightHeader: 'pigeons/copyright.txt', From 741c67d0579d91041cf232fb31ab2a54a39775af Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 11 Apr 2024 12:45:16 -0400 Subject: [PATCH 03/11] Fixup --- .../ios/Runner.xcodeproj/project.pbxproj | 36 ++++++------------- .../ios/file_selector_ios.podspec | 1 - .../{Packages.swift => Package.swift} | 2 +- .../FFSFileSelectorPlugin_Test.h | 0 .../file_selector_ios}/messages.g.h | 0 .../include/module.modulemap | 2 +- .../{Packages.swift => Package.swift} | 4 +-- 7 files changed, 14 insertions(+), 31 deletions(-) rename packages/file_selector/file_selector_ios/ios/file_selector_ios/{Packages.swift => Package.swift} (91%) rename packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/{ => include/file_selector_ios}/FFSFileSelectorPlugin_Test.h (100%) rename packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/{ => include/file_selector_ios}/messages.g.h (100%) rename packages/file_selector/file_selector_macos/macos/file_selector_macos/{Packages.swift => Package.swift} (90%) diff --git a/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj b/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj index fa65f8a53a22..727468939cd9 100644 --- a/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj @@ -12,11 +12,11 @@ 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 6165A2F80DFA224EAF50A1D5 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC3841659BF3693FAC5A2F8F /* Pods_RunnerTests.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; C71AE4C8281C6B6B0086307A /* FileSelectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C71AE4C5281C6B530086307A /* FileSelectorTests.m */; }; - 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -170,9 +170,6 @@ /* Begin PBXNativeTarget section */ 97C146ED1CF9000F007C117D /* Runner */ = { - packageProductDependencies = ( - 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, - ); isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( @@ -183,13 +180,15 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - BE6D85B8F242B768015B938B /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -217,9 +216,6 @@ /* Begin PBXProject section */ 97C146E61CF9000F007C117D /* Project object */ = { - packageReferences = ( - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/Packages/FlutterGeneratedPluginSwiftPackage" */, - ); isa = PBXProject; attributes = { LastUpgradeCheck = 1510; @@ -244,6 +240,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -351,23 +350,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - BE6D85B8F242B768015B938B /* [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; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -757,12 +739,14 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + /* Begin XCLocalSwiftPackageReference section */ - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { isa = XCLocalSwiftPackageReference; relativePath = Flutter/Packages/FlutterGeneratedPluginSwiftPackage; }; /* End XCLocalSwiftPackageReference section */ + /* Begin XCSwiftPackageProductDependency section */ 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { isa = XCSwiftPackageProductDependency; diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios.podspec b/packages/file_selector/file_selector_ios/ios/file_selector_ios.podspec index be86256fcf71..b023e345611b 100644 --- a/packages/file_selector/file_selector_ios/ios/file_selector_ios.podspec +++ b/packages/file_selector/file_selector_ios/ios/file_selector_ios.podspec @@ -14,7 +14,6 @@ Displays the native iOS document picker. s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_ios' } s.source_files = 'file_selector_ios/Sources/file_selector_ios/**/*.{h,m}' - s.public_header_files = 'file_selector_ios/Sources/file_selector_ios/include/file_selector_ios**/*.h' s.module_map = 'file_selector_ios/Sources/file_selector_ios/include/cocoapods_file_selector_ios.modulemap' s.dependency 'Flutter' s.platform = :ios, '12.0' diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Packages.swift b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift similarity index 91% rename from packages/file_selector/file_selector_ios/ios/file_selector_ios/Packages.swift rename to packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift index eb78dbe21a48..e71c57f63923 100644 --- a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Packages.swift +++ b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift @@ -17,7 +17,7 @@ let package = Package( .target( name: "file_selector_ios", dependencies: [], - exclude: ["include/file_selector_ios.modulemap"], + exclude: ["include/cocoapods_file_selector_ios.modulemap"], resources: [ .process("Resources") ], diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/FFSFileSelectorPlugin_Test.h b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/file_selector_ios/FFSFileSelectorPlugin_Test.h similarity index 100% rename from packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/FFSFileSelectorPlugin_Test.h rename to packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/file_selector_ios/FFSFileSelectorPlugin_Test.h diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/messages.g.h b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/file_selector_ios/messages.g.h similarity index 100% rename from packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/messages.g.h rename to packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/file_selector_ios/messages.g.h diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/module.modulemap b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/module.modulemap index b097198c1354..8dbd36d9806b 100644 --- a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/module.modulemap +++ b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/module.modulemap @@ -1,5 +1,5 @@ module file_selector_ios { - umbrella header "file_selector_ios-umbrella.h" + umbrella header "file_selector_ios/file_selector_ios-umbrella.h" export * module * { export * } diff --git a/packages/file_selector/file_selector_macos/macos/file_selector_macos/Packages.swift b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift similarity index 90% rename from packages/file_selector/file_selector_macos/macos/file_selector_macos/Packages.swift rename to packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift index 67760e27ec82..eaf360d2fb6c 100644 --- a/packages/file_selector/file_selector_macos/macos/file_selector_macos/Packages.swift +++ b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift @@ -6,7 +6,7 @@ import PackageDescription let package = Package( name: "file_selector_macos", platforms: [ - .macoOS("10.14") + .macOS("10.14") ], products: [ // If the plugin name contains "_", replace with "-" for the library name @@ -16,7 +16,7 @@ let package = Package( targets: [ .target( name: "file_selector_macos", - dependencies: [], + dependencies: [] ) ] ) From 9e49c1d50c73d1af639a949c1c90d02f5d0b9fc7 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 6 May 2024 10:57:56 -0400 Subject: [PATCH 04/11] Revert project changes --- .../file_selector_ios/example/ios/.gitignore | 2 - .../ios/Runner.xcodeproj/project.pbxproj | 40 +++++++++---------- .../xcshareddata/xcschemes/Runner.xcscheme | 18 --------- 3 files changed, 18 insertions(+), 42 deletions(-) diff --git a/packages/file_selector/file_selector_ios/example/ios/.gitignore b/packages/file_selector/file_selector_ios/example/ios/.gitignore index 7658df10cb7a..7a7f9873ad7d 100644 --- a/packages/file_selector/file_selector_ios/example/ios/.gitignore +++ b/packages/file_selector/file_selector_ios/example/ios/.gitignore @@ -32,5 +32,3 @@ Runner/GeneratedPluginRegistrant.* !default.mode2v3 !default.pbxuser !default.perspectivev3 - -**/Flutter/Packages/FlutterGeneratedPluginSwiftPackage diff --git a/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj b/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj index 727468939cd9..f6d350beac69 100644 --- a/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 6165A2F80DFA224EAF50A1D5 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC3841659BF3693FAC5A2F8F /* Pods_RunnerTests.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -73,7 +72,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 21160A929DC757957DE39F1E /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -180,15 +178,13 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + BE6D85B8F242B768015B938B /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( ); name = Runner; - packageProductDependencies = ( - 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, - ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -240,9 +236,6 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; - packageReferences = ( - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, - ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -350,6 +343,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + BE6D85B8F242B768015B938B /* [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; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -739,20 +749,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - -/* Begin XCLocalSwiftPackageReference section */ - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { - isa = XCLocalSwiftPackageReference; - relativePath = Flutter/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/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 5b6df8a1c381..828f48e73f80 100644 --- a/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,24 +5,6 @@ - - - - - - - - - - Date: Mon, 6 May 2024 11:03:07 -0400 Subject: [PATCH 05/11] Version bump --- packages/file_selector/file_selector_ios/CHANGELOG.md | 4 ++++ packages/file_selector/file_selector_ios/pubspec.yaml | 2 +- packages/file_selector/file_selector_macos/CHANGELOG.md | 3 ++- packages/file_selector/file_selector_macos/pubspec.yaml | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/file_selector/file_selector_ios/CHANGELOG.md b/packages/file_selector/file_selector_ios/CHANGELOG.md index 50615cbce706..7216134c73b7 100644 --- a/packages/file_selector/file_selector_ios/CHANGELOG.md +++ b/packages/file_selector/file_selector_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.2 + +* Adds Swift Package Manager compatibility. + ## 0.5.1+9 * Adjusts implementation for testabiity. diff --git a/packages/file_selector/file_selector_ios/pubspec.yaml b/packages/file_selector/file_selector_ios/pubspec.yaml index cae1f78b8400..f0b9a2f45017 100644 --- a/packages/file_selector/file_selector_ios/pubspec.yaml +++ b/packages/file_selector/file_selector_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: file_selector_ios description: iOS implementation of the file_selector plugin. repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22 -version: 0.5.1+9 +version: 0.5.2 environment: sdk: ^3.2.3 diff --git a/packages/file_selector/file_selector_macos/CHANGELOG.md b/packages/file_selector/file_selector_macos/CHANGELOG.md index 03cc77eafe7f..98605a15392c 100644 --- a/packages/file_selector/file_selector_macos/CHANGELOG.md +++ b/packages/file_selector/file_selector_macos/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 0.9.4 +* Adds Swift Package Manager compatibility. * Updates minimum supported SDK version to Flutter 3.13/Dart 3.1. ## 0.9.3+3 diff --git a/packages/file_selector/file_selector_macos/pubspec.yaml b/packages/file_selector/file_selector_macos/pubspec.yaml index 8f1599612c1b..60e0f87da858 100644 --- a/packages/file_selector/file_selector_macos/pubspec.yaml +++ b/packages/file_selector/file_selector_macos/pubspec.yaml @@ -2,7 +2,7 @@ name: file_selector_macos description: macOS implementation of the file_selector plugin. repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_macos issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22 -version: 0.9.3+3 +version: 0.9.4 environment: sdk: ^3.1.0 From f0d99e25dc5b94263dcae59355129e6aa3ec0fa0 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 6 May 2024 11:08:27 -0400 Subject: [PATCH 06/11] Remove unnecessary comments --- .../file_selector_ios/ios/file_selector_ios/Package.swift | 1 - .../file_selector_macos/macos/file_selector_macos/Package.swift | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift index e71c57f63923..7c6f7ba5295a 100644 --- a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift +++ b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift @@ -9,7 +9,6 @@ let package = Package( .iOS("12.0") ], products: [ - // If the plugin name contains "_", replace with "-" for the library name .library(name: "file-selector-ios", targets: ["file_selector_ios"]) ], dependencies: [], diff --git a/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift index eaf360d2fb6c..059ba7a9141b 100644 --- a/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift +++ b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift @@ -9,7 +9,6 @@ let package = Package( .macOS("10.14") ], products: [ - // If the plugin name contains "_", replace with "-" for the library name .library(name: "file-selector-macos", targets: ["file_selector_macos"]) ], dependencies: [], From 8894bf28b3a97f54792aa46459d60ee1ffeb2849 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 6 May 2024 11:14:02 -0400 Subject: [PATCH 07/11] Incude paths --- .../Sources/file_selector_ios/FFSFileSelectorPlugin.m | 3 ++- .../file_selector_ios/Sources/file_selector_ios/messages.g.m | 2 +- packages/file_selector/file_selector_ios/pigeons/messages.dart | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/FFSFileSelectorPlugin.m b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/FFSFileSelectorPlugin.m index e17469c636b9..f91820647499 100644 --- a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/FFSFileSelectorPlugin.m +++ b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/FFSFileSelectorPlugin.m @@ -3,8 +3,9 @@ // found in the LICENSE file. #import "FFSFileSelectorPlugin.h" + +#import "./include/file_selector_ios/messages.g.h" #import "FFSFileSelectorPlugin_Test.h" -#import "messages.g.h" #import diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/messages.g.m b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/messages.g.m index 1905261653ba..eb5b16509ee5 100644 --- a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/messages.g.m +++ b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/messages.g.m @@ -4,7 +4,7 @@ // Autogenerated from Pigeon (v13.0.0), do not edit directly. // See also: https://pub.dev/packages/pigeon -#import "messages.g.h" +#import "./include/file_selector_ios/messages.g.h" #if TARGET_OS_OSX #import diff --git a/packages/file_selector/file_selector_ios/pigeons/messages.dart b/packages/file_selector/file_selector_ios/pigeons/messages.dart index d1c8661b4a4e..e535569a2c66 100644 --- a/packages/file_selector/file_selector_ios/pigeons/messages.dart +++ b/packages/file_selector/file_selector_ios/pigeons/messages.dart @@ -11,6 +11,7 @@ import 'package:pigeon/pigeon.dart'; objcSourceOut: 'ios/file_selector_ios/Sources/file_selector_ios/messages.g.m', objcOptions: ObjcOptions( prefix: 'FFS', + headerIncludePath: './include/file_selector_ios/messages.g.h', ), copyrightHeader: 'pigeons/copyright.txt', )) From 28b85b253ad1ee269b732712dadf02faa68a6d48 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 6 May 2024 11:21:54 -0400 Subject: [PATCH 08/11] Autoformat --- .../ios/file_selector_ios/Package.swift | 42 +++++++++---------- .../macos/file_selector_macos/Package.swift | 28 ++++++------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift index 7c6f7ba5295a..181c69bc4ed5 100644 --- a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift +++ b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift @@ -4,25 +4,25 @@ import PackageDescription let package = Package( - name: "file_selector_ios", - platforms: [ - .iOS("12.0") - ], - products: [ - .library(name: "file-selector-ios", targets: ["file_selector_ios"]) - ], - dependencies: [], - targets: [ - .target( - name: "file_selector_ios", - dependencies: [], - exclude: ["include/cocoapods_file_selector_ios.modulemap"], - resources: [ - .process("Resources") - ], - cSettings: [ - .headerSearchPath("include/file_selector_ios") - ] - ) - ] + name: "file_selector_ios", + platforms: [ + .iOS("12.0") + ], + products: [ + .library(name: "file-selector-ios", targets: ["file_selector_ios"]) + ], + dependencies: [], + targets: [ + .target( + name: "file_selector_ios", + dependencies: [], + exclude: ["include/cocoapods_file_selector_ios.modulemap"], + resources: [ + .process("Resources") + ], + cSettings: [ + .headerSearchPath("include/file_selector_ios") + ] + ) + ] ) diff --git a/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift index 059ba7a9141b..a7b9071cf067 100644 --- a/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift +++ b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift @@ -4,18 +4,18 @@ import PackageDescription let package = Package( - name: "file_selector_macos", - platforms: [ - .macOS("10.14") - ], - products: [ - .library(name: "file-selector-macos", targets: ["file_selector_macos"]) - ], - dependencies: [], - targets: [ - .target( - name: "file_selector_macos", - dependencies: [] - ) - ] + name: "file_selector_macos", + platforms: [ + .macOS("10.14") + ], + products: [ + .library(name: "file-selector-macos", targets: ["file_selector_macos"]) + ], + dependencies: [], + targets: [ + .target( + name: "file_selector_macos", + dependencies: [] + ) + ] ) From c3a44aadc8f7750cac2238c182c23b6824973245 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 6 May 2024 11:33:05 -0400 Subject: [PATCH 09/11] Licenses --- .../file_selector_ios/ios/file_selector_ios/Package.swift | 4 ++++ .../macos/file_selector_macos/Package.swift | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift index 181c69bc4ed5..aa8774c3d40a 100644 --- a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift +++ b/packages/file_selector/file_selector_ios/ios/file_selector_ios/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/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift index a7b9071cf067..97bd0cd8d5dc 100644 --- a/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift +++ b/packages/file_selector/file_selector_macos/macos/file_selector_macos/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( From e8560ba8269134790973cb74cea6b902f331048a Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Mon, 6 May 2024 12:09:09 -0400 Subject: [PATCH 10/11] Update packages/file_selector/file_selector_ios/pigeons/messages.dart Co-authored-by: Victoria Ashworth <15619084+vashworth@users.noreply.github.com> --- packages/file_selector/file_selector_ios/pigeons/messages.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/file_selector/file_selector_ios/pigeons/messages.dart b/packages/file_selector/file_selector_ios/pigeons/messages.dart index e535569a2c66..9c179f94c3be 100644 --- a/packages/file_selector/file_selector_ios/pigeons/messages.dart +++ b/packages/file_selector/file_selector_ios/pigeons/messages.dart @@ -7,7 +7,7 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( dartOut: 'lib/src/messages.g.dart', dartTestOut: 'test/test_api.g.dart', - objcHeaderOut: 'ios/file_selector_ios/Sources/file_selector_ios/messages.g.h', + objcHeaderOut: 'ios/file_selector_ios/Sources/file_selector_ios/include/file_selector_ios/messages.g.h', objcSourceOut: 'ios/file_selector_ios/Sources/file_selector_ios/messages.g.m', objcOptions: ObjcOptions( prefix: 'FFS', From be979dac798f9fca104e70ccea8a2675949bd11b Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Mon, 6 May 2024 15:38:56 -0400 Subject: [PATCH 11/11] Update packages/file_selector/file_selector_ios/pigeons/messages.dart Co-authored-by: Victoria Ashworth <15619084+vashworth@users.noreply.github.com> --- packages/file_selector/file_selector_ios/pigeons/messages.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/file_selector/file_selector_ios/pigeons/messages.dart b/packages/file_selector/file_selector_ios/pigeons/messages.dart index 9c179f94c3be..b7cd3c996bd6 100644 --- a/packages/file_selector/file_selector_ios/pigeons/messages.dart +++ b/packages/file_selector/file_selector_ios/pigeons/messages.dart @@ -7,7 +7,8 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( dartOut: 'lib/src/messages.g.dart', dartTestOut: 'test/test_api.g.dart', - objcHeaderOut: 'ios/file_selector_ios/Sources/file_selector_ios/include/file_selector_ios/messages.g.h', + objcHeaderOut: + 'ios/file_selector_ios/Sources/file_selector_ios/include/file_selector_ios/messages.g.h', objcSourceOut: 'ios/file_selector_ios/Sources/file_selector_ios/messages.g.m', objcOptions: ObjcOptions( prefix: 'FFS',