Skip to content

Commit d64b5ff

Browse files
authored
Merge pull request #55 from Gurpartap/hotfix/carthage-rxswift-4
hotfix: RxSwift 4.0 and Carthage ketchup
2 parents 65548c8 + 79bb89e commit d64b5ff

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" ~> 3.0.0
1+
github "ReactiveX/RxSwift" ~> 4.0

Cartfile.resolved

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "ReactiveX/RxSwift" "4.0.0"

NSObject-Rx.xcodeproj/project.pbxproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@
88

99
/* Begin PBXBuildFile section */
1010
188C6DA31C47B4240092101A /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 188C6DA21C47B4240092101A /* RxSwift.framework */; };
11-
5E6ACB5B1F58657A0050E957 /* HasDisposeBag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E6ACB591F58657A0050E957 /* HasDisposeBag.swift */; };
1211
5E6ACB5C1F58657A0050E957 /* NSObject+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E6ACB5A1F58657A0050E957 /* NSObject+Rx.swift */; };
1312
/* End PBXBuildFile section */
1413

1514
/* Begin PBXFileReference section */
1615
188C6D911C47B2B20092101A /* NSObject_Rx.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NSObject_Rx.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1716
188C6DA21C47B4240092101A /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = SOURCE_ROOT; };
1817
1AE62DBF1F50C8230011BA4F /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
19-
5E6ACB591F58657A0050E957 /* HasDisposeBag.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HasDisposeBag.swift; sourceTree = SOURCE_ROOT; };
2018
5E6ACB5A1F58657A0050E957 /* NSObject+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSObject+Rx.swift"; sourceTree = SOURCE_ROOT; };
2119
FE5EDFCF1F6A2CBF000ABFAC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2220
/* End PBXFileReference section */
@@ -36,11 +34,10 @@
3634
188C6D921C47B2B20092101A /* NSObject_Rx */ = {
3735
isa = PBXGroup;
3836
children = (
39-
5E6ACB591F58657A0050E957 /* HasDisposeBag.swift */,
4037
5E6ACB5A1F58657A0050E957 /* NSObject+Rx.swift */,
4138
188C6DA21C47B4240092101A /* RxSwift.framework */,
4239
);
43-
path = NSObject_Rx;
40+
name = NSObject_Rx;
4441
sourceTree = "<group>";
4542
};
4643
18EE7A0F1C47B12F00C7256C = {
@@ -141,7 +138,6 @@
141138
isa = PBXSourcesBuildPhase;
142139
buildActionMask = 2147483647;
143140
files = (
144-
5E6ACB5B1F58657A0050E957 /* HasDisposeBag.swift in Sources */,
145141
5E6ACB5C1F58657A0050E957 /* NSObject+Rx.swift in Sources */,
146142
);
147143
runOnlyForDeploymentPostprocessing = 0;

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ And that'll be 👌
4848

4949
Add to `Cartfile`:
5050
```
51-
github "RxSwiftCommunity/NSObject-Rx" ~> 2.0.0
51+
github "RxSwiftCommunity/NSObject-Rx"
5252
```
5353
Add frameworks to your project (no need to "copy items if needed")
5454

0 commit comments

Comments
 (0)