Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Explicitly declare APPLICATION_EXTENSION_API_ONLY for CocoaPods #171

Merged
merged 2 commits into from
Jan 9, 2023
Merged

Explicitly declare APPLICATION_EXTENSION_API_ONLY for CocoaPods #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a60919
Explicitly declare `APPLICATION_EXTENSION_API_ONLY` for CocoaPods
lickel Jan 6, 2023
7aecc83
Explicit XCode?
lickel Jan 7, 2023
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
9 changes: 6 additions & 3 deletions .github/workflows/swift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
scheme:
scheme:
- Development-Unit-WorkflowTesting
- Development-Unit-WorkflowTests
- Development-Unit-WorkflowUITests
Expand All @@ -25,7 +25,7 @@ jobs:

steps:
- uses: actions/checkout@v3

- name: Cache gems
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -102,7 +102,10 @@ jobs:
run: |
bundle check || bundle install --path .bundle
brew install sourcedocs


- name: Switch Xcode
run: sudo xcode-select -s /Applications/Xcode_13.3.1.app

- name: Swiftdocs
run: |
.buildscript/build_swift_docs.sh ${{ runner.temp }}/swiftdocs
50 changes: 26 additions & 24 deletions Workflow.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
require_relative('version')

Pod::Spec.new do |s|
s.name = 'Workflow'
s.version = WORKFLOW_VERSION
s.summary = 'Reactive application architecture'
s.homepage = 'https://www.github.com/square/workflow-swift'
s.license = 'Apache License, Version 2.0'
s.author = 'Square'
s.source = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{s.version}" }

# 1.7 is needed for `swift_versions` support
s.cocoapods_version = '>= 1.7.0'

s.swift_versions = ['5.0']
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.13'

s.source_files = 'Workflow/Sources/*.swift'

s.dependency 'ReactiveSwift', '~> 7.0.0'

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'Workflow/Tests/**/*.swift'
test_spec.framework = 'XCTest'
test_spec.library = 'swiftos'
end
s.name = 'Workflow'
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I changed all pod spec files to be consistent in formatting (4 spaces).
This can be hidden via adding ?w=1 to the diff URL (hide whitespace in the gear box)

s.version = WORKFLOW_VERSION
s.summary = 'Reactive application architecture'
s.homepage = 'https://www.github.com/square/workflow-swift'
s.license = 'Apache License, Version 2.0'
s.author = 'Square'
s.source = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{s.version}" }

# 1.7 is needed for `swift_versions` support
s.cocoapods_version = '>= 1.7.0'

s.swift_versions = ['5.0']
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.13'

s.source_files = 'Workflow/Sources/*.swift'

s.dependency 'ReactiveSwift', '~> 7.1.1'
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This release sets APPLICATION_EXTENSION_API_ONLY

Copy link
Collaborator Author

@lickel lickel Jan 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

7.1 was a pretty minor update and 7.1.1 only bumps minimum OSes and sets this flag


s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'Workflow/Tests/**/*.swift'
test_spec.framework = 'XCTest'
test_spec.library = 'swiftos'
end

end
14 changes: 7 additions & 7 deletions WorkflowCombine.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ Pod::Spec.new do |s|
s.license = 'Apache License, Version 2.0'
s.author = 'Square'
s.source = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{s.version}" }

# 1.7 is needed for `swift_versions` support
s.cocoapods_version = '>= 1.7.0'

s.swift_versions = ['5.1']
s.ios.deployment_target = '13.0'
s.osx.deployment_target = '10.15'

s.source_files = 'WorkflowCombine/Sources/*.swift'

s.dependency 'Workflow', "#{s.version}"
end

s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }
end
2 changes: 2 additions & 0 deletions WorkflowCombineTesting.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Pod::Spec.new do |s|

s.framework = 'XCTest'

s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }

s.test_spec 'WorkflowCombineTestingTests' do |test_spec|
test_spec.requires_app_host = true
test_spec.source_files = 'WorkflowCombine/TestingTests/**/*.swift'
Expand Down
13 changes: 7 additions & 6 deletions WorkflowConcurrency.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@ Pod::Spec.new do |s|
s.license = 'Apache License, Version 2.0'
s.author = 'Square'
s.source = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{WORKFLOW_VERSION}" }

# 1.7 is needed for `swift_versions` support
s.cocoapods_version = '>= 1.7.0'

s.swift_versions = ['5.5']
s.ios.deployment_target = '13.0'
s.osx.deployment_target = '10.15'

s.source_files = 'WorkflowConcurrency/Sources/*.swift'

s.dependency 'Workflow', "#{WORKFLOW_VERSION}"


s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }

end

2 changes: 2 additions & 0 deletions WorkflowConcurrencyTesting.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Pod::Spec.new do |s|

s.framework = 'XCTest'

s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }

s.test_spec 'WorkflowConcurrencyTestingTests' do |test_spec|
test_spec.requires_app_host = true
test_spec.source_files = 'WorkflowConcurrency/TestingTests/**/*.swift'
Expand Down
1 change: 0 additions & 1 deletion WorkflowReactiveSwift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Pod::Spec.new do |s|
s.source_files = 'WorkflowReactiveSwift/Sources/**/*.swift'

s.dependency 'Workflow', "#{s.version}"
s.dependency 'ReactiveSwift', '~> 7.0.0'
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is redundant via s.dependency 'Workflow', "#{s.version}"


s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'WorkflowReactiveSwift/Tests/**/*.swift'
Expand Down
2 changes: 2 additions & 0 deletions WorkflowReactiveSwiftTesting.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Pod::Spec.new do |s|

s.framework = 'XCTest'

s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }

s.test_spec 'WorkflowReactiveSwiftTestingTests' do |test_spec|
test_spec.requires_app_host = true
test_spec.source_files = 'WorkflowReactiveSwift/TestingTests/**/*.swift'
Expand Down
47 changes: 25 additions & 22 deletions WorkflowRxSwift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
require_relative('version')

Pod::Spec.new do |s|
s.name = 'WorkflowRxSwift'
s.version = WORKFLOW_VERSION
s.summary = 'Infrastructure for Workflow-powered Swift'
s.homepage = 'https://www.github.com/square/workflow-swift'
s.license = 'Apache License, Version 2.0'
s.author = 'Square'
s.source = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{s.version}" }
s.name = 'WorkflowRxSwift'
s.version = WORKFLOW_VERSION
s.summary = 'Infrastructure for Workflow-powered Swift'
s.homepage = 'https://www.github.com/square/workflow-swift'
s.license = 'Apache License, Version 2.0'
s.author = 'Square'
s.source = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{s.version}" }

# 1.7 is needed for `swift_versions` support
s.cocoapods_version = '>= 1.7.0'
# 1.7 is needed for `swift_versions` support
s.cocoapods_version = '>= 1.7.0'

s.swift_versions = ['5.0']
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.13'
s.swift_versions = ['5.0']
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.13'

s.source_files = 'WorkflowRxSwift/Sources/**/*.swift'
s.source_files = 'WorkflowRxSwift/Sources/**/*.swift'

s.dependency 'Workflow', "#{s.version}"
s.dependency 'RxSwift', '~> 6.2'
s.dependency 'Workflow', "#{s.version}"
s.dependency 'RxSwift', '~> 6.2'

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'WorkflowRxSwift/Tests/**/*.swift'
test_spec.framework = 'XCTest'
test_spec.library = 'swiftos'
test_spec.dependency 'WorkflowTesting', "#{s.version}"
test_spec.dependency 'WorkflowReactiveSwift', "#{s.version}"
end
# https://github.com/ReactiveX/RxSwift/pull/2475
Copy link
Contributor

Choose a reason for hiding this comment

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

do you want to wait for these changes to be available before merging/releasing this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Nah I have no idea if they want this, and if so, what the timeline would be

# s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'WorkflowRxSwift/Tests/**/*.swift'
test_spec.framework = 'XCTest'
test_spec.library = 'swiftos'
test_spec.dependency 'WorkflowTesting', "#{s.version}"
test_spec.dependency 'WorkflowReactiveSwift', "#{s.version}"
end
end
65 changes: 34 additions & 31 deletions WorkflowRxSwiftTesting.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,38 @@
require_relative('version')

Pod::Spec.new do |s|
s.name = 'WorkflowRxSwiftTesting'
s.version = WORKFLOW_VERSION
s.summary = 'Infrastructure for Workflow-powered Swift'
s.homepage = 'https://www.github.com/square/workflow-swift'
s.license = 'Apache License, Version 2.0'
s.author = 'Square'
s.source = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{s.version}" }

# 1.7 is needed for `swift_versions` support
s.cocoapods_version = '>= 1.7.0'

s.swift_versions = ['5.0']
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.13'

s.source_files = 'WorkflowRxSwift/Testing/**/*.swift'

s.dependency 'Workflow', "#{s.version}"
s.dependency 'WorkflowRxSwift', "#{s.version}"
s.dependency 'WorkflowTesting', "#{s.version}"
s.dependency 'RxSwift'

s.framework = 'XCTest'

s.test_spec 'WorkflowRxSwiftTestingTests' do |test_spec|
test_spec.requires_app_host = true
test_spec.source_files = 'WorkflowRxSwift/TestingTests/**/*.swift'
test_spec.framework = 'XCTest'
test_spec.dependency 'WorkflowTesting'
test_spec.library = 'swiftos'
end
s.name = 'WorkflowRxSwiftTesting'
s.version = WORKFLOW_VERSION
s.summary = 'Infrastructure for Workflow-powered Swift'
s.homepage = 'https://www.github.com/square/workflow-swift'
s.license = 'Apache License, Version 2.0'
s.author = 'Square'
s.source = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{s.version}" }

# 1.7 is needed for `swift_versions` support
s.cocoapods_version = '>= 1.7.0'

s.swift_versions = ['5.0']
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.13'

s.source_files = 'WorkflowRxSwift/Testing/**/*.swift'

s.dependency 'Workflow', "#{s.version}"
s.dependency 'WorkflowRxSwift', "#{s.version}"
s.dependency 'WorkflowTesting', "#{s.version}"
s.dependency 'RxSwift'

s.framework = 'XCTest'

# https://github.com/ReactiveX/RxSwift/pull/2475
# s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }

s.test_spec 'WorkflowRxSwiftTestingTests' do |test_spec|
test_spec.requires_app_host = true
test_spec.source_files = 'WorkflowRxSwift/TestingTests/**/*.swift'
test_spec.framework = 'XCTest'
test_spec.dependency 'WorkflowTesting'
test_spec.library = 'swiftos'
end
end
13 changes: 7 additions & 6 deletions WorkflowSwiftUI.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,18 @@ Pod::Spec.new do |s|
s.license = 'Apache License, Version 2.0'
s.author = 'Square'
s.source = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{s.version}" }

# 1.7 is needed for `swift_versions` support
s.cocoapods_version = '>= 1.7.0'

s.swift_versions = ['5.1']
s.ios.deployment_target = '13.0'
s.osx.deployment_target = '10.15'

s.source_files = 'WorkflowSwiftUI/Sources/*.swift'

s.dependency 'Workflow', "#{s.version}"


s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }

end

43 changes: 22 additions & 21 deletions WorkflowTesting.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
require_relative('version')

Pod::Spec.new do |s|
s.name = 'WorkflowTesting'
s.version = WORKFLOW_VERSION
s.summary = 'Reactive application architecture'
s.homepage = 'https://www.github.com/square/workflow-swift'
s.license = 'Apache License, Version 2.0'
s.author = 'Square'
s.source = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{s.version}" }
s.name = 'WorkflowTesting'
s.version = WORKFLOW_VERSION
s.summary = 'Reactive application architecture'
s.homepage = 'https://www.github.com/square/workflow-swift'
s.license = 'Apache License, Version 2.0'
s.author = 'Square'
s.source = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{s.version}" }

# 1.7 is needed for `swift_versions` support
s.cocoapods_version = '>= 1.7.0'
# 1.7 is needed for `swift_versions` support
s.cocoapods_version = '>= 1.7.0'

s.swift_versions = ['5.0']
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.13'
s.swift_versions = ['5.0']
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.13'

s.source_files = 'WorkflowTesting/Sources/**/*.swift'
s.source_files = 'WorkflowTesting/Sources/**/*.swift'

s.dependency 'Workflow', "#{s.version}"
s.framework = 'XCTest'
s.dependency 'Workflow', "#{s.version}"
s.framework = 'XCTest'

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'WorkflowTesting/Tests/**/*.swift'
test_spec.framework = 'XCTest'
test_spec.libraries = 'swiftDispatch', 'swiftFoundation', 'swiftos'
end
end
s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'WorkflowTesting/Tests/**/*.swift'
test_spec.framework = 'XCTest'
test_spec.libraries = 'swiftDispatch', 'swiftFoundation', 'swiftos'
end
end
Loading