Skip to content

Commit

Permalink
Merge pull request #13 from iZettle/presentation-1.2.1
Browse files Browse the repository at this point in the history
[release] Bump version to 1.2.1
  • Loading branch information
Arikis authored Oct 2, 2018
2 parents f1f1141 + e77e854 commit 5f5fb97
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# 1.2.1

- Remove Carthage copy phase to avoid iTunes connect invalid Bundle error [#10]
- Update Flow to 1.3

# 1.2.0

- Updated modallyPresentQueued to accept an options parameter instead of animated and improved handling of `.failOnBlock`. Old version has been deprecated.
- Updated modallyPresentQueued to accept an options parameter instead of animated and improved handling of `.failOnBlock`. Old version has been deprecated.

# 1.1.0

Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "iZettle/Flow" ~> 1.2
github "iZettle/Flow" ~> 1.3
2 changes: 1 addition & 1 deletion Presentation/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<string>1.2.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions PresentationFramework.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "PresentationFramework"
s.version = "1.2.0"
s.version = "1.2.1"
s.module_name = "Presentation"
s.summary = "Driving presentations from model to result"
s.description = <<-DESC
Expand All @@ -11,7 +11,7 @@ Pod::Spec.new do |s|
s.author = { 'iZettle AB' => '[email protected]' }

s.ios.deployment_target = "9.0"
s.dependency 'FlowFramework', '~> 1.2'
s.dependency 'FlowFramework', '~> 1.3'

s.source = { :git => "https://github.com/iZettle/Presentation.git", :tag => "#{s.version}" }
s.source_files = "Presentation/*.{swift}"
Expand Down
2 changes: 1 addition & 1 deletion PresentationTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<string>1.2.1</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down

0 comments on commit 5f5fb97

Please sign in to comment.