Skip to content

Commit cdfb621

Browse files
authored
Merge branch 'master' into anders/locks
2 parents 0dec921 + 3eecd8c commit cdfb621

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
# master
22

3-
1. When unfair locks from libplatform are unavailable, ReactiveSwift now fallbacks to error checking Pthread mutexes instead of the default. Mitigations regarding issues with `pthread_mutex_trylock` have also been applied. (#654, kudos to @andersio)
4-
5-
# 4.0.0-rc.2
6-
73
*Please add new entries at the top.*
84

5+
1. When unfair locks from libplatform are unavailable, ReactiveSwift now fallbacks to error checking Pthread mutexes instead of the default. Mitigations regarding issues with `pthread_mutex_trylock` have also been applied. (#654, kudos to @andersio)
6+
1. Fix some documentation errors about Carthage usage (#655)
97
1. [CocoaPods] CocoaPods 1.4.0 is the minimum required version. (#651, kudos to @ikesyo)
108
1. `<~` bindings now works with optional left-hand-side operands. (#642, kudos to @andersio and @Ankit-Aggarwal)
119

@@ -17,6 +15,8 @@
1715
nilTarget <~ notifications.map { $0.count }
1816
```
1917

18+
# 4.0.0-rc.2
19+
2020
1. Support Swift 4.2 (Xcode 10) (#644, kudos to @ikesyo)
2121

2222
# 4.0.0-rc.1

ReactiveSwift-UIExamples.playground/Pages/ValidatingProperty.xcplaygroundpage/Contents.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
1. Retrieve the project dependencies using one of the following terminal commands from the ReactiveSwift project root directory:
55
- `git submodule update --init`
66
**OR**, if you have [Carthage](https://github.com/Carthage/Carthage) installed
7-
- `carthage checkout --no-use-binaries`
7+
- `carthage checkout`
88
1. Open `ReactiveSwift.xcworkspace`
99
1. Build `Result-iOS` scheme
1010
1. Build `ReactiveSwift-iOS` scheme

ReactiveSwift.playground/Pages/Sandbox.xcplaygroundpage/Contents.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
1. Retrieve the project dependencies using one of the following terminal commands from the ReactiveSwift project root directory:
55
- `git submodule update --init`
66
**OR**, if you have [Carthage](https://github.com/Carthage/Carthage) installed
7-
- `carthage checkout --no-use-binaries`
7+
- `carthage checkout`
88
1. Open `ReactiveSwift.xcworkspace`
99
1. Build `Result-Mac` scheme
1010
1. Build `ReactiveSwift-macOS` scheme

0 commit comments

Comments
 (0)