From a8994b8f9a77d8284016b1ff668be995d2725d43 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 7 May 2024 11:26:42 -0400 Subject: [PATCH 1/5] Add SPM support --- .../ios/quick_actions_ios.podspec | 4 +-- .../ios/quick_actions_ios/Package.swift | 27 +++++++++++++++++++ .../QuickActionsPlugin.swift | 0 .../Resources/PrivacyInfo.xcprivacy | 0 .../ShortcutItemProviding.swift | 0 .../quick_actions_ios}/messages.g.swift | 0 .../quick_actions_ios/pigeons/messages.dart | 2 +- 7 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Package.swift rename packages/quick_actions/quick_actions_ios/ios/{Classes => quick_actions_ios/Sources/quick_actions_ios}/QuickActionsPlugin.swift (100%) rename packages/quick_actions/quick_actions_ios/ios/{ => quick_actions_ios/Sources/quick_actions_ios}/Resources/PrivacyInfo.xcprivacy (100%) rename packages/quick_actions/quick_actions_ios/ios/{Classes => quick_actions_ios/Sources/quick_actions_ios}/ShortcutItemProviding.swift (100%) rename packages/quick_actions/quick_actions_ios/ios/{Classes => quick_actions_ios/Sources/quick_actions_ios}/messages.g.swift (100%) diff --git a/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios.podspec b/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios.podspec index 77082f66ec3..6bfb72f4231 100644 --- a/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios.podspec +++ b/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios.podspec @@ -15,7 +15,7 @@ Downloaded by pub (not CocoaPods). s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/quick_actions' } s.documentation_url = 'https://pub.dev/packages/quick_actions' s.swift_version = '5.0' - s.source_files = 'Classes/**/*.swift' + s.source_files = 'quick_actions_ios/Sources/quick_actions_ios/*.swift' s.xcconfig = { 'LIBRARY_SEARCH_PATHS' => '$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)/ $(SDKROOT)/usr/lib/swift', 'LD_RUNPATH_SEARCH_PATHS' => '/usr/lib/swift', @@ -23,5 +23,5 @@ Downloaded by pub (not CocoaPods). s.dependency 'Flutter' s.platform = :ios, '12.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } - s.resource_bundles = {'quick_actions_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']} + s.resource_bundles = {'quick_actions_ios_privacy' => ['quick_actions_ios/Sources/quick_actions_ios/Resources/PrivacyInfo.xcprivacy']} end diff --git a/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Package.swift b/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Package.swift new file mode 100644 index 00000000000..f8c65fff890 --- /dev/null +++ b/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Package.swift @@ -0,0 +1,27 @@ +// swift-tools-version: 5.9 + +// 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: "quick_actions_ios", + platforms: [ + .iOS("12.0"), + ], + products: [ + .library(name: "quick-actions-ios", targets: ["quick_actions_ios"]) + ], + dependencies: [], + targets: [ + .target( + name: "quick_actions_ios", + dependencies: [], + resources: [ + .process("Resources") + ] + ) + ] +) diff --git a/packages/quick_actions/quick_actions_ios/ios/Classes/QuickActionsPlugin.swift b/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Sources/quick_actions_ios/QuickActionsPlugin.swift similarity index 100% rename from packages/quick_actions/quick_actions_ios/ios/Classes/QuickActionsPlugin.swift rename to packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Sources/quick_actions_ios/QuickActionsPlugin.swift diff --git a/packages/quick_actions/quick_actions_ios/ios/Resources/PrivacyInfo.xcprivacy b/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Sources/quick_actions_ios/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from packages/quick_actions/quick_actions_ios/ios/Resources/PrivacyInfo.xcprivacy rename to packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Sources/quick_actions_ios/Resources/PrivacyInfo.xcprivacy diff --git a/packages/quick_actions/quick_actions_ios/ios/Classes/ShortcutItemProviding.swift b/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Sources/quick_actions_ios/ShortcutItemProviding.swift similarity index 100% rename from packages/quick_actions/quick_actions_ios/ios/Classes/ShortcutItemProviding.swift rename to packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Sources/quick_actions_ios/ShortcutItemProviding.swift diff --git a/packages/quick_actions/quick_actions_ios/ios/Classes/messages.g.swift b/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Sources/quick_actions_ios/messages.g.swift similarity index 100% rename from packages/quick_actions/quick_actions_ios/ios/Classes/messages.g.swift rename to packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Sources/quick_actions_ios/messages.g.swift diff --git a/packages/quick_actions/quick_actions_ios/pigeons/messages.dart b/packages/quick_actions/quick_actions_ios/pigeons/messages.dart index 553d8552cf7..7cf7d20d587 100644 --- a/packages/quick_actions/quick_actions_ios/pigeons/messages.dart +++ b/packages/quick_actions/quick_actions_ios/pigeons/messages.dart @@ -6,7 +6,7 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( dartOut: 'lib/messages.g.dart', - swiftOut: 'ios/Classes/messages.g.swift', + swiftOut: 'ios/quick_actions_ios/Sources/quick_actions_ios/messages.g.swift', copyrightHeader: 'pigeons/copyright.txt', )) From 82a713237411d0f44cc8a3c0b599ff5f956761bc Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 7 May 2024 11:26:55 -0400 Subject: [PATCH 2/5] Version bump --- packages/quick_actions/quick_actions_ios/CHANGELOG.md | 3 ++- packages/quick_actions/quick_actions_ios/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/quick_actions/quick_actions_ios/CHANGELOG.md b/packages/quick_actions/quick_actions_ios/CHANGELOG.md index c7f6a3b983c..47d7d1ddbf7 100644 --- a/packages/quick_actions/quick_actions_ios/CHANGELOG.md +++ b/packages/quick_actions/quick_actions_ios/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 1.1.0 +* Adds Swift Package Manager compatibility. * Updates minimum iOS version to 12.0 and minimum Flutter version to 3.16.6. ## 1.0.10 diff --git a/packages/quick_actions/quick_actions_ios/pubspec.yaml b/packages/quick_actions/quick_actions_ios/pubspec.yaml index 3a7cd8f8f16..41bfb0ceebc 100644 --- a/packages/quick_actions/quick_actions_ios/pubspec.yaml +++ b/packages/quick_actions/quick_actions_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: quick_actions_ios description: An implementation for the iOS platform of the Flutter `quick_actions` plugin. repository: https://github.com/flutter/packages/tree/main/packages/quick_actions/quick_actions_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22 -version: 1.0.10 +version: 1.1.0 environment: sdk: ^3.2.3 From 59b4afb5ff043c2a3b97e54025efdfa711ae8c78 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 7 May 2024 11:29:12 -0400 Subject: [PATCH 3/5] Fix test compilation --- .../example/ios/RunnerTests/Mocks/MockShortcutItemProvider.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/quick_actions/quick_actions_ios/example/ios/RunnerTests/Mocks/MockShortcutItemProvider.swift b/packages/quick_actions/quick_actions_ios/example/ios/RunnerTests/Mocks/MockShortcutItemProvider.swift index 85477415667..84c9d85eb68 100644 --- a/packages/quick_actions/quick_actions_ios/example/ios/RunnerTests/Mocks/MockShortcutItemProvider.swift +++ b/packages/quick_actions/quick_actions_ios/example/ios/RunnerTests/Mocks/MockShortcutItemProvider.swift @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import UIKit @testable import quick_actions_ios final class MockShortcutItemProvider: ShortcutItemProviding { From 96e03dd48996e8286789f17a69751dbf19a7ff67 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Fri, 10 May 2024 12:41:52 -0400 Subject: [PATCH 4/5] Update packages/quick_actions/quick_actions_ios/example/ios/RunnerTests/Mocks/MockShortcutItemProvider.swift Co-authored-by: Victoria Ashworth <15619084+vashworth@users.noreply.github.com> --- .../example/ios/RunnerTests/Mocks/MockShortcutItemProvider.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/quick_actions/quick_actions_ios/example/ios/RunnerTests/Mocks/MockShortcutItemProvider.swift b/packages/quick_actions/quick_actions_ios/example/ios/RunnerTests/Mocks/MockShortcutItemProvider.swift index 84c9d85eb68..c1924113ba1 100644 --- a/packages/quick_actions/quick_actions_ios/example/ios/RunnerTests/Mocks/MockShortcutItemProvider.swift +++ b/packages/quick_actions/quick_actions_ios/example/ios/RunnerTests/Mocks/MockShortcutItemProvider.swift @@ -3,6 +3,7 @@ // found in the LICENSE file. import UIKit + @testable import quick_actions_ios final class MockShortcutItemProvider: ShortcutItemProviding { From 6e8ac0ec83f131e62399aab0f64f1b90fa871f71 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Fri, 10 May 2024 12:41:59 -0400 Subject: [PATCH 5/5] Update packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Package.swift Co-authored-by: Victoria Ashworth <15619084+vashworth@users.noreply.github.com> --- .../quick_actions_ios/ios/quick_actions_ios/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Package.swift b/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Package.swift index f8c65fff890..c02db8e9c26 100644 --- a/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Package.swift +++ b/packages/quick_actions/quick_actions_ios/ios/quick_actions_ios/Package.swift @@ -9,7 +9,7 @@ import PackageDescription let package = Package( name: "quick_actions_ios", platforms: [ - .iOS("12.0"), + .iOS("12.0") ], products: [ .library(name: "quick-actions-ios", targets: ["quick_actions_ios"])