Skip to content

Commit a3e91fb

Browse files
farshadtxfreak4pc
farshadtx
authored and
freak4pc
committed
Update RxSwift to latest version (5.0) (#20)
1 parent 3cfa7b3 commit a3e91fb

File tree

13 files changed

+92
-55
lines changed

13 files changed

+92
-55
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode9.2
2+
osx_image: xcode10.2
33
before_install:
44
- carthage bootstrap --no-use-binaries --platform ios
55
script: xcodebuild clean build test -scheme 'RxSwiftUtilities iOS' -destination "platform=iOS Simulator,name=iPhone 6S" -enableCodeCoverage YES

‎Cartfile‎

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

‎Cartfile.resolved‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "4.4.0"
1+
github "ReactiveX/RxSwift" "5.0.1"

‎RxSwiftUtilities.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ Helpful classes and extensions for RxSwift which don't belong in RxSwift core.
1616
s.source = { :git => "https://github.com/RxSwiftCommunity/RxSwiftUtilities.git", :tag => "#{s.version}" }
1717
s.source_files = 'Source/Common/*.swift'
1818
s.ios.source_files = 'Source/iOS/*.swift'
19-
s.dependency "RxSwift", "~> 4.4"
20-
s.dependency "RxCocoa", "~> 4.4"
19+
s.dependency "RxSwift", "~> 5.0"
20+
s.dependency "RxCocoa", "~> 5.0"
2121
end

‎RxSwiftUtilities.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
42A23D1822C680A2009E255F /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A23D1722C680A2009E255F /* RxRelay.framework */; };
11+
42A23D1D22C681A5009E255F /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A23D1C22C681A5009E255F /* RxRelay.framework */; };
12+
42A23D1F22C681B8009E255F /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A23D1E22C681B8009E255F /* RxRelay.framework */; };
13+
42A23D2122C681C3009E255F /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A23D2022C681C3009E255F /* RxRelay.framework */; };
14+
42A23D2222C6825F009E255F /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A23D1722C680A2009E255F /* RxRelay.framework */; };
15+
42A23D2322C68265009E255F /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A23D1C22C681A5009E255F /* RxRelay.framework */; };
16+
42A23D2422C6826C009E255F /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A23D1E22C681B8009E255F /* RxRelay.framework */; };
1017
880343121DE303160055DA33 /* RxSwiftUtilities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 880343081DE303160055DA33 /* RxSwiftUtilities.framework */; };
1118
880343191DE303160055DA33 /* RxSwiftUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 8803430B1DE303160055DA33 /* RxSwiftUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
1219
880343681DE395A20055DA33 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 880343671DE395A20055DA33 /* RxCocoa.framework */; };
@@ -65,6 +72,10 @@
6572
/* End PBXContainerItemProxy section */
6673

6774
/* Begin PBXFileReference section */
75+
42A23D1722C680A2009E255F /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = Carthage/Build/iOS/RxRelay.framework; sourceTree = "<group>"; };
76+
42A23D1C22C681A5009E255F /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = Carthage/Build/Mac/RxRelay.framework; sourceTree = "<group>"; };
77+
42A23D1E22C681B8009E255F /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = Carthage/Build/tvOS/RxRelay.framework; sourceTree = "<group>"; };
78+
42A23D2022C681C3009E255F /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = Carthage/Build/watchOS/RxRelay.framework; sourceTree = "<group>"; };
6879
880343081DE303160055DA33 /* RxSwiftUtilities.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxSwiftUtilities.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6980
8803430B1DE303160055DA33 /* RxSwiftUtilities.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxSwiftUtilities.h; sourceTree = "<group>"; };
7081
8803430C1DE303160055DA33 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -97,6 +108,7 @@
97108
files = (
98109
888CC1911DE4839900DAE48A /* RxSwift.framework in Frameworks */,
99110
880343681DE395A20055DA33 /* RxCocoa.framework in Frameworks */,
111+
42A23D1822C680A2009E255F /* RxRelay.framework in Frameworks */,
100112
);
101113
runOnlyForDeploymentPostprocessing = 0;
102114
};
@@ -108,6 +120,7 @@
108120
88EB6322216B43F400130C74 /* RxSwift.framework in Frameworks */,
109121
88798719216B540500ED83F6 /* RxCocoa.framework in Frameworks */,
110122
8879871B216B71F400ED83F6 /* RxTest.framework in Frameworks */,
123+
42A23D2222C6825F009E255F /* RxRelay.framework in Frameworks */,
111124
);
112125
runOnlyForDeploymentPostprocessing = 0;
113126
};
@@ -117,13 +130,15 @@
117130
files = (
118131
888CC1C11DE48C6D00DAE48A /* RxSwift.framework in Frameworks */,
119132
888CC1C01DE48C6B00DAE48A /* RxCocoa.framework in Frameworks */,
133+
42A23D1F22C681B8009E255F /* RxRelay.framework in Frameworks */,
120134
);
121135
runOnlyForDeploymentPostprocessing = 0;
122136
};
123137
888CC1A51DE48A1000DAE48A /* Frameworks */ = {
124138
isa = PBXFrameworksBuildPhase;
125139
buildActionMask = 2147483647;
126140
files = (
141+
42A23D2422C6826C009E255F /* RxRelay.framework in Frameworks */,
127142
888CC1A91DE48A1000DAE48A /* RxSwiftUtilities.framework in Frameworks */,
128143
888CC1C31DE48DE400DAE48A /* RxSwift.framework in Frameworks */,
129144
888CC1C41DE48DE700DAE48A /* RxCocoa.framework in Frameworks */,
@@ -136,13 +151,15 @@
136151
files = (
137152
888CC1EB1DE4900400DAE48A /* RxSwift.framework in Frameworks */,
138153
888CC1E91DE48FFA00DAE48A /* RxCocoa.framework in Frameworks */,
154+
42A23D1D22C681A5009E255F /* RxRelay.framework in Frameworks */,
139155
);
140156
runOnlyForDeploymentPostprocessing = 0;
141157
};
142158
888CC1D11DE48E9100DAE48A /* Frameworks */ = {
143159
isa = PBXFrameworksBuildPhase;
144160
buildActionMask = 2147483647;
145161
files = (
162+
42A23D2322C68265009E255F /* RxRelay.framework in Frameworks */,
146163
888CC1D51DE48E9100DAE48A /* RxSwiftUtilities.framework in Frameworks */,
147164
888CC1EC1DE4903900DAE48A /* RxSwift.framework in Frameworks */,
148165
888CC1ED1DE4903B00DAE48A /* RxCocoa.framework in Frameworks */,
@@ -155,6 +172,7 @@
155172
files = (
156173
888CC1981DE4848300DAE48A /* RxSwift.framework in Frameworks */,
157174
888CC1991DE4848500DAE48A /* RxCocoa.framework in Frameworks */,
175+
42A23D2122C681C3009E255F /* RxRelay.framework in Frameworks */,
158176
);
159177
runOnlyForDeploymentPostprocessing = 0;
160178
};
@@ -237,6 +255,7 @@
237255
888CC1921DE483AC00DAE48A /* iOS */ = {
238256
isa = PBXGroup;
239257
children = (
258+
42A23D1722C680A2009E255F /* RxRelay.framework */,
240259
888CC1901DE4839900DAE48A /* RxSwift.framework */,
241260
880343671DE395A20055DA33 /* RxCocoa.framework */,
242261
);
@@ -246,6 +265,7 @@
246265
888CC1931DE4841400DAE48A /* watchOS */ = {
247266
isa = PBXGroup;
248267
children = (
268+
42A23D2022C681C3009E255F /* RxRelay.framework */,
249269
888CC1961DE4843000DAE48A /* RxSwift.framework */,
250270
888CC1941DE4842B00DAE48A /* RxCocoa.framework */,
251271
);
@@ -255,6 +275,7 @@
255275
888CC1BB1DE48AF800DAE48A /* tvOS */ = {
256276
isa = PBXGroup;
257277
children = (
278+
42A23D1E22C681B8009E255F /* RxRelay.framework */,
258279
888CC1BC1DE48B1300DAE48A /* RxSwift.framework */,
259280
888CC1BE1DE48B1A00DAE48A /* RxCocoa.framework */,
260281
);
@@ -264,6 +285,7 @@
264285
888CC1E61DE48FE600DAE48A /* macOS */ = {
265286
isa = PBXGroup;
266287
children = (
288+
42A23D1C22C681A5009E255F /* RxRelay.framework */,
267289
888CC1EA1DE4900400DAE48A /* RxSwift.framework */,
268290
888CC1E71DE48FF600DAE48A /* RxCocoa.framework */,
269291
);
@@ -460,52 +482,53 @@
460482
isa = PBXProject;
461483
attributes = {
462484
LastSwiftUpdateCheck = 0800;
463-
LastUpgradeCheck = 1000;
485+
LastUpgradeCheck = 1020;
464486
ORGANIZATIONNAME = RxSwiftCommunity;
465487
TargetAttributes = {
466488
880343071DE303160055DA33 = {
467489
CreatedOnToolsVersion = 8.0;
468-
LastSwiftMigration = "";
490+
LastSwiftMigration = 1020;
469491
ProvisioningStyle = Automatic;
470492
};
471493
880343101DE303160055DA33 = {
472494
CreatedOnToolsVersion = 8.0;
473-
LastSwiftMigration = "";
495+
LastSwiftMigration = 1020;
474496
ProvisioningStyle = Automatic;
475497
};
476498
888CC19F1DE48A1000DAE48A = {
477499
CreatedOnToolsVersion = 8.0;
478-
LastSwiftMigration = 0920;
500+
LastSwiftMigration = 1020;
479501
ProvisioningStyle = Automatic;
480502
};
481503
888CC1A71DE48A1000DAE48A = {
482504
CreatedOnToolsVersion = 8.0;
483-
LastSwiftMigration = 0920;
505+
LastSwiftMigration = 1020;
484506
ProvisioningStyle = Automatic;
485507
};
486508
888CC1CB1DE48E9000DAE48A = {
487509
CreatedOnToolsVersion = 8.0;
488-
LastSwiftMigration = 0920;
510+
LastSwiftMigration = 1020;
489511
ProvisioningStyle = Automatic;
490512
};
491513
888CC1D31DE48E9100DAE48A = {
492514
CreatedOnToolsVersion = 8.0;
493-
LastSwiftMigration = 0920;
515+
LastSwiftMigration = 1020;
494516
ProvisioningStyle = Automatic;
495517
};
496518
88E73C601DE481A100C0D2F6 = {
497519
CreatedOnToolsVersion = 8.0;
498-
LastSwiftMigration = 0920;
520+
LastSwiftMigration = 1020;
499521
ProvisioningStyle = Automatic;
500522
};
501523
};
502524
};
503525
buildConfigurationList = 880343021DE303160055DA33 /* Build configuration list for PBXProject "RxSwiftUtilities" */;
504526
compatibilityVersion = "Xcode 3.2";
505-
developmentRegion = English;
527+
developmentRegion = en;
506528
hasScannedForEncodings = 0;
507529
knownRegions = (
508530
en,
531+
Base,
509532
);
510533
mainGroup = 880342FE1DE303160055DA33;
511534
productRefGroup = 880343091DE303160055DA33 /* Products */;
@@ -585,6 +608,7 @@
585608
"$(SRCROOT)/Carthage/Build/iOS/RxSwift.framework",
586609
"$(SRCROOT)/Carthage/Build/iOS/RxCocoa.framework",
587610
"$(SRCROOT)/Carthage/Build/iOS/RxTest.framework",
611+
"$(SRCROOT)/Carthage/Build/iOS/RxRelay.framework",
588612
);
589613
name = Carthage;
590614
outputPaths = (
@@ -601,6 +625,7 @@
601625
inputPaths = (
602626
"$(SRCROOT)/Carthage/Build/tvOS/RxSwift.framework",
603627
"$(SRCROOT)/Carthage/Build/tvOS/RxCocoa.framework",
628+
"$(SRCROOT)/Carthage/Build/tvOS/RxRelay.framework",
604629
);
605630
name = Carthage;
606631
outputPaths = (
@@ -617,6 +642,7 @@
617642
inputPaths = (
618643
"$(SRCROOT)/Carthage/Build/Mac/RxSwift.framework",
619644
"$(SRCROOT)/Carthage/Build/Mac/RxCocoa.framework",
645+
"$(SRCROOT)/Carthage/Build/Mac/RxRelay.framework",
620646
);
621647
name = Carthage;
622648
outputPaths = (
@@ -918,6 +944,7 @@
918944
FRAMEWORK_SEARCH_PATHS = (
919945
"$(inherited)",
920946
"$(PROJECT_DIR)/Carthage/Build/tvOS",
947+
"$(PROJECT_DIR)/Carthage/Build/iOS",
921948
);
922949
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
923950
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -943,6 +970,7 @@
943970
FRAMEWORK_SEARCH_PATHS = (
944971
"$(inherited)",
945972
"$(PROJECT_DIR)/Carthage/Build/tvOS",
973+
"$(PROJECT_DIR)/Carthage/Build/iOS",
946974
);
947975
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
948976
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1005,6 +1033,7 @@
10051033
FRAMEWORK_SEARCH_PATHS = (
10061034
"$(inherited)",
10071035
"$(PROJECT_DIR)/Carthage/Build/Mac",
1036+
"$(PROJECT_DIR)/Carthage/Build/iOS",
10081037
);
10091038
FRAMEWORK_VERSION = A;
10101039
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
@@ -1030,6 +1059,7 @@
10301059
FRAMEWORK_SEARCH_PATHS = (
10311060
"$(inherited)",
10321061
"$(PROJECT_DIR)/Carthage/Build/Mac",
1062+
"$(PROJECT_DIR)/Carthage/Build/iOS",
10331063
);
10341064
FRAMEWORK_VERSION = A;
10351065
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
@@ -1095,6 +1125,7 @@
10951125
FRAMEWORK_SEARCH_PATHS = (
10961126
"$(inherited)",
10971127
"$(PROJECT_DIR)/Carthage/Build/watchOS",
1128+
"$(PROJECT_DIR)/Carthage/Build/iOS",
10981129
);
10991130
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
11001131
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1121,6 +1152,7 @@
11211152
FRAMEWORK_SEARCH_PATHS = (
11221153
"$(inherited)",
11231154
"$(PROJECT_DIR)/Carthage/Build/watchOS",
1155+
"$(PROJECT_DIR)/Carthage/Build/iOS",
11241156
);
11251157
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
11261158
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

‎RxSwiftUtilities.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict/>
5+
</plist>

‎RxSwiftUtilities.xcodeproj/xcshareddata/xcschemes/RxSwiftUtilities iOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎RxSwiftUtilities.xcodeproj/xcshareddata/xcschemes/RxSwiftUtilities macOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎RxSwiftUtilities.xcodeproj/xcshareddata/xcschemes/RxSwiftUtilities tvOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎RxSwiftUtilities.xcodeproj/xcshareddata/xcschemes/RxSwiftUtilities watchOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)