diff --git a/packages/file_selector/file_selector_ios/CHANGELOG.md b/packages/file_selector/file_selector_ios/CHANGELOG.md index 50615cbce70..7216134c73b 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/ios/Assets/.gitkeep b/packages/file_selector/file_selector_ios/ios/Assets/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 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 79156132418..b023e345611 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 @@ -13,11 +13,11 @@ Displays the native iOS document picker. s.license = { :type => '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.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/Package.swift b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift new file mode 100644 index 00000000000..aa8774c3d40 --- /dev/null +++ b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift @@ -0,0 +1,32 @@ +// 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( + 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_ios/ios/Classes/FFSFileSelectorPlugin.m b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/FFSFileSelectorPlugin.m similarity index 98% 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 index e17469c636b..f9182064749 100644 --- 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 @@ -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/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/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/Classes/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/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/Classes/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/Classes/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 new file mode 100644 index 00000000000..8dbd36d9806 --- /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/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.m b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/messages.g.m similarity index 98% 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 index 1905261653b..eb5b16509ee 100644 --- 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 @@ -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 66706cc2406..b7cd3c996bd 100644 --- a/packages/file_selector/file_selector_ios/pigeons/messages.dart +++ b/packages/file_selector/file_selector_ios/pigeons/messages.dart @@ -7,10 +7,12 @@ 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/include/file_selector_ios/messages.g.h', + 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', )) diff --git a/packages/file_selector/file_selector_ios/pubspec.yaml b/packages/file_selector/file_selector_ios/pubspec.yaml index cae1f78b840..f0b9a2f4501 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 03cc77eafe7..98605a15392 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/macos/file_selector_macos.podspec b/packages/file_selector/file_selector_macos/macos/file_selector_macos.podspec index fb460b41c97..bb4bffee9e0 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/Package.swift b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift new file mode 100644 index 00000000000..97bd0cd8d5d --- /dev/null +++ b/packages/file_selector/file_selector_macos/macos/file_selector_macos/Package.swift @@ -0,0 +1,25 @@ +// 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( + 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: [] + ) + ] +) 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 85b2996baf8..698ebcfc100 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', diff --git a/packages/file_selector/file_selector_macos/pubspec.yaml b/packages/file_selector/file_selector_macos/pubspec.yaml index 8f1599612c1..60e0f87da85 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