Skip to content

Commit 54bf88f

Browse files
committed
Merge remote-tracking branch 'origin/master' into event-transforming
2 parents 4bc0c81 + f95b2e4 commit 54bf88f

File tree

7 files changed

+17
-12
lines changed

7 files changed

+17
-12
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44
1. The `SignalProducer` internals have undergone a significant refactoring, which bootstraps the effort to reduce the overhead of constant producers and producer compositions. (#487, kudos to @andersio)
55

6+
# 2.0.1
7+
1. Addressed the exceptionally high build time. (#495)
8+
69
1. New method ``retry(upTo:interval:on:)``. This delays retrying on failure by `interval` until hitting the `upTo` limitation.
710

811
1. Addressed the exceptionally high build time. (#495)

Documentation/FrameworkOverview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ For more information about cancellation, see the RAC [Design Guidelines][].
194194

195195
## Schedulers
196196

197-
A **scheduler**, represented by the [`SchedulerProtocol`][Scheduler] protocol, is a
197+
A **scheduler**, represented by the [`Scheduler`][Scheduler] protocol, is a
198198
serial execution queue to perform work or deliver results upon.
199199

200200
[Signals](#signals) and [signal producers](#signal-producers) can be ordered to

Package.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import Foundation
22
import PackageDescription
33

44
var isSwiftPackagerManagerTest: Bool {
5-
return ProcessInfo.processInfo.environment["SWIFTPM_TEST_ReactiveSwift"] == "YES"
5+
let environment = ProcessInfo.processInfo.environment
6+
guard let value = environment["SWIFTPM_TEST_ReactiveSwift"] else { return false }
7+
return NSString(string: value).boolValue
68
}
79

810
let package = Package(

ReactiveSwift.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "ReactiveSwift"
33
# Version goes here and will be used to access the git tag later on, once we have a first release.
4-
s.version = "2.0.0"
4+
s.version = "2.0.1"
55
s.summary = "Streams of values over time"
66
s.description = <<-DESC
77
ReactiveSwift is a Swift framework inspired by Functional Reactive Programming. It provides APIs for composing and transforming streams of values over time.

ReactiveSwift.xcodeproj/project.pbxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@
646646
dependencies = (
647647
);
648648
name = "ReactiveSwift-tvOS";
649-
productName = ReactiveCocoa;
649+
productName = "ReactiveSwift-tvOS";
650650
productReference = 57A4D2411BA13D7A00F7D4B1 /* ReactiveSwift.framework */;
651651
productType = "com.apple.product-type.framework";
652652
};
@@ -665,7 +665,7 @@
665665
7DFBED0A1CDB8C9500EE435B /* PBXTargetDependency */,
666666
);
667667
name = "ReactiveSwift-tvOSTests";
668-
productName = "ReactiveCocoa-tvOSTests";
668+
productName = "ReactiveSwift-tvOSTests";
669669
productReference = 7DFBED031CDB8C9500EE435B /* ReactiveSwiftTests.xctest */;
670670
productType = "com.apple.product-type.bundle.unit-test";
671671
};
@@ -683,7 +683,7 @@
683683
dependencies = (
684684
);
685685
name = "ReactiveSwift-watchOS";
686-
productName = ReactiveCocoa;
686+
productName = "ReactiveSwift-watchOS";
687687
productReference = A9B315541B3940610001CB9C /* ReactiveSwift.framework */;
688688
productType = "com.apple.product-type.framework";
689689
};
@@ -701,7 +701,7 @@
701701
dependencies = (
702702
);
703703
name = "ReactiveSwift-macOS";
704-
productName = ReactiveCocoa;
704+
productName = "ReactiveSwift-macOS";
705705
productReference = D04725EA19E49ED7006002AA /* ReactiveSwift.framework */;
706706
productType = "com.apple.product-type.framework";
707707
};
@@ -719,7 +719,7 @@
719719
D04725F819E49ED7006002AA /* PBXTargetDependency */,
720720
);
721721
name = "ReactiveSwift-macOSTests";
722-
productName = ReactiveCocoaTests;
722+
productName = "ReactiveSwift-macOSTests";
723723
productReference = D04725F519E49ED7006002AA /* ReactiveSwiftTests.xctest */;
724724
productType = "com.apple.product-type.bundle.unit-test";
725725
};
@@ -737,7 +737,7 @@
737737
dependencies = (
738738
);
739739
name = "ReactiveSwift-iOS";
740-
productName = ReactiveCocoa;
740+
productName = "ReactiveSwift-iOS";
741741
productReference = D047260C19E49F82006002AA /* ReactiveSwift.framework */;
742742
productType = "com.apple.product-type.framework";
743743
};
@@ -756,7 +756,7 @@
756756
D047261919E49F82006002AA /* PBXTargetDependency */,
757757
);
758758
name = "ReactiveSwift-iOSTests";
759-
productName = ReactiveCocoaTests;
759+
productName = "ReactiveSwift-iOSTests";
760760
productReference = D047261619E49F82006002AA /* ReactiveSwiftTests.xctest */;
761761
productType = "com.apple.product-type.bundle.unit-test";
762762
};

Sources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.0.0</string>
18+
<string>2.0.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

Tests/ReactiveSwiftTests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.0.0</string>
18+
<string>2.0.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)