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

[chore]: split WorkflowConcurrency versioning to address source-breaking change #169

Merged
merged 1 commit into from
Dec 14, 2022
Merged

[chore]: split WorkflowConcurrency versioning to address source-breaking change #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ MAJOR=1
MINOR=1
PATCH=0
PRE_RELEASE_IDENTIFIER=''

CONCURRENCY_MAJOR=2
CONCURRENCY_MINOR=0
CONCURRENCY_PATCH=0
7 changes: 4 additions & 3 deletions WorkflowConcurrency.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ require_relative('version')

Pod::Spec.new do |s|
s.name = 'WorkflowConcurrency'
s.version = WORKFLOW_VERSION
s.version = WORKFLOW_CONCURRENCY_VERSION

s.summary = 'Infrastructure for Concurrency-powered Workers'
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.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'
Expand All @@ -18,7 +19,7 @@ Pod::Spec.new do |s|

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

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

end

8 changes: 4 additions & 4 deletions WorkflowConcurrencyTesting.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ require_relative('version')

Pod::Spec.new do |s|
s.name = 'WorkflowConcurrencyTesting'
s.version = WORKFLOW_VERSION
s.version = WORKFLOW_CONCURRENCY_VERSION
s.summary = 'Infrastructure for Concurrency-powered Workers'
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.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'
Expand All @@ -18,9 +18,9 @@ Pod::Spec.new do |s|

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

s.dependency 'Workflow', "#{s.version}"
s.dependency 'Workflow', "#{WORKFLOW_VERSION}"
s.dependency 'WorkflowConcurrency', "#{s.version}"
s.dependency 'WorkflowTesting', "#{s.version}"
s.dependency 'WorkflowTesting', "#{WORKFLOW_VERSION}"

s.framework = 'XCTest'

Expand Down
8 changes: 8 additions & 0 deletions version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,12 @@
load('VERSION')
pre_release_append = ((PRE_RELEASE_IDENTIFIER ||= "") != "") ? "-"+PRE_RELEASE_IDENTIFIER : ""
WORKFLOW_VERSION="#{MAJOR}.#{MINOR}.#{PATCH}#{pre_release_append}"

# Due to a source-breaking change, this currently differs from the standard
# `WORKFLOW_VERSION` used for the other libraries.
WORKFLOW_CONCURRENCY_VERSION="#{CONCURRENCY_MAJOR}.#{CONCURRENCY_MINOR}.#{CONCURRENCY_PATCH}"

if (WORKFLOW_CONCURRENCY_VERSION <=> WORKFLOW_VERSION) != 1
puts "[note]: WORKFLOW_CONCURRENCY_VERSION (value: #{WORKFLOW_CONCURRENCY_VERSION}) is not greater than WORKFLOW_VERSION (value: #{WORKFLOW_VERSION}). Please remove WORKFLOW_CONCURRENCY_VERSION in favor of WORKFLOW_VERSION if differing versions are no longer required."
end
end