Skip to content

Commit

Permalink
Merge pull request #743 from ReactiveCocoa/release-6.1.0
Browse files Browse the repository at this point in the history
Bump version to 6.1.0
  • Loading branch information
mdiep committed Jun 20, 2019
2 parents 7763d88 + 18a4379 commit b772fa0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# master
*Please add new entries at the top.*

# 6.1.0

1. add possibility to use `all` and `any` operators with array of arguments (#735, kudos to @olejnjak)
```swift
let property = Property.any([boolProperty1, boolProperty2, boolProperty3])
```
2. Fixed Result extensions ambiguity (#733, kudos to @nekrich)
1. Fixed Result extensions ambiguity (#733, kudos to @nekrich)
1. Add `<~` binding operator to `Signal.Observer` (#635, kudos to @Marcocanc)

Expand Down
4 changes: 2 additions & 2 deletions ReactiveSwift.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "ReactiveSwift"
# Version goes here and will be used to access the git tag later on, once we have a first release.
s.version = "6.0.0"
s.version = "6.1.0"
s.summary = "Streams of values over time"
s.description = <<-DESC
ReactiveSwift is a Swift framework inspired by Functional Reactive Programming. It provides APIs for composing and transforming streams of values over time.
Expand All @@ -21,5 +21,5 @@ Pod::Spec.new do |s|
s.pod_target_xcconfig = {"OTHER_SWIFT_FLAGS[config=Release]" => "$(inherited) -suppress-warnings" }

s.cocoapods_version = ">= 1.4.0"
s.swift_version = "5.0"
s.swift_versions = ["5.0", "5.1"]
end
2 changes: 1 addition & 1 deletion Sources/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>6.0.0</string>
<string>6.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Tests/ReactiveSwiftTests/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>6.0.0</string>
<string>6.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit b772fa0

Please sign in to comment.