Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[quick_actions]remove custom modulemap and private headers #6229

Closed
hellohuanlin wants to merge 4 commits into from
Closed

[quick_actions]remove custom modulemap and private headers #6229

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31cf883
[quick_actions]remove custom module map and private header files
hellohuanlin Aug 11, 2022
c8dc401
bump version
hellohuanlin Aug 11, 2022
b317b13
remove umbrella file
hellohuanlin Aug 11, 2022
7c4f9d0
remove swift related change in podspec since we dont have swift files…
hellohuanlin Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/quick_actions/quick_actions_ios/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.6.0+15

* Removes custom modulemap file with "Test" submodule and private headers for Swift migration.

## 0.6.0+14

* Refactors `FLTQuickActionsPlugin` class into multiple components.
Expand Down
1 change: 0 additions & 1 deletion ...ages/quick_actions/quick_actions_ios/example/ios/RunnerTests/FLTQuickActionsPluginTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

@import Flutter;
@import quick_actions_ios;
@import quick_actions_ios.Test;
@import XCTest;
#import <OCMock/OCMock.h>

Expand Down
1 change: 0 additions & 1 deletion ...es/quick_actions/quick_actions_ios/example/ios/RunnerTests/FLTShortcutStateManagerTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// found in the LICENSE file.

@import quick_actions_ios;
@import quick_actions_ios.Test;
@import XCTest;
#import <OCMock/OCMock.h>

Expand Down
0 ...ivateHeaders/FLTQuickActionsPlugin_Test.h → .../ios/Classes/FLTQuickActionsPlugin_Test.h
View file
Open in desktop
File renamed without changes.
0 .../PrivateHeaders/FLTShortcutStateManager.h → ...ios/ios/Classes/FLTShortcutStateManager.h
View file
Open in desktop
File renamed without changes.
11 changes: 0 additions & 11 deletions packages/quick_actions/quick_actions_ios/ios/Classes/QuickActionsPlugin.modulemap
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions packages/quick_actions/quick_actions_ios/ios/Classes/quick_actions_ios-umbrella.h
View file
Open in desktop

This file was deleted.

11 changes: 7 additions & 4 deletions packages/quick_actions/quick_actions_ios/ios/quick_actions_ios.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@ Downloaded by pub (not CocoaPods).
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
s.source = { :http => 'https://github.com/flutter/plugins/tree/main/packages/quick_actions' }
s.documentation_url = 'https://pub.dev/packages/quick_actions'
s.source_files = 'Classes/**/*.{h,m}'
s.public_header_files = 'Classes/*.h'
s.private_header_files = 'Classes/PrivateHeaders/*.h'
s.source_files = 'Classes/**/*.{h,m,swift}'
s.public_header_files = 'Classes/**/*.h'
s.dependency 'Flutter'
s.platform = :ios, '9.0'
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
s.module_map = 'Classes/QuickActionsPlugin.modulemap'
s.swift_version = '5.0'
s.xcconfig = {
'LIBRARY_SEARCH_PATHS' => '$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)/ $(SDKROOT)/usr/lib/swift',
'LD_RUNPATH_SEARCH_PATHS' => '/usr/lib/swift',

@jmagman jmagman Aug 11, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hit similar issues in flutter/flutter#16049 (comment). But I don't think you'll need this once you add your first Swift file to the framework, right? Instead of making this modulemap change now can you instead do it when you add the first Swift file so we don't need this frankly sketch workaround?

@hellohuanlin hellohuanlin Aug 11, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed swift related updates since we don't have swift files yet.

@jmagman jmagman Aug 11, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of making this modulemap changes a standalone PR can you instead include it in the PR that actually adds a Swift file? It doesn't seem worth a version bump, and I can't check it out and play with it with the Swift tests you write to see what else can be done instead.

}
end
2 changes: 1 addition & 1 deletion packages/quick_actions/quick_actions_ios/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/plugins/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: 0.6.0+14
version: 0.6.0+15

environment:
sdk: ">=2.15.0 <3.0.0"
Expand Down