Skip to content

Commit

Permalink
Merge branch 'master' into default-vs-unspecified-qos
Browse files Browse the repository at this point in the history
  • Loading branch information
mluisbrown authored Mar 18, 2024
2 parents a7eabc1 + bc83377 commit fbb7207
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
1. Fix minimum deployment target of iOS 11 in CocoaPods
1. Fix CI release git tag push trigger (#869, kudos to @p4checo)
1. Find and remove items from Bag using a binary search to improve performance when the collection gets large.
2. Add extension to `ScopedDisposable` for inner `SerialDisposable` (#873, kudos to @sirnacnud)

# 7.1.1
1. Bumped deployment target to iOS 11, tvOS 11, watchOS 4, macOS 10.13, per Xcode 14 warnings (#865, kudos to @lickel)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
**OR**, if you have [Carthage](https://github.com/Carthage/Carthage) installed
- `carthage checkout`
1. Open `ReactiveSwift.xcworkspace`
1. Build `Result-iOS` scheme
1. Build `ReactiveSwift-iOS` scheme
1. Finally open the `ReactiveSwift-UIExamples.playground` through the workspace.
1. Choose `View > Assistant Editor > Show Assistant Editor`
Expand Down
16 changes: 16 additions & 0 deletions Sources/Disposable.swift
Original file line number Diff line number Diff line change
Expand Up @@ -378,3 +378,19 @@ public final class SerialDisposable: Disposable {
state.deinitialize()
}
}

extension ScopedDisposable where Inner == SerialDisposable {
/// The current inner disposable of the `SerialDisposable` wrapped
/// in the `ScopedDisposable` to dispose of.
///
/// Whenever this property is set (even to the same value!), the previous
/// disposable is automatically disposed.
public var inner: Disposable? {
get {
return inner.inner
}
set {
inner.inner = newValue
}
}
}

0 comments on commit fbb7207

Please sign in to comment.