Skip to content

Commit af39eb1

Browse files
freak4pcfreak4pc
committed
RxSwiftExt 5.0.0: Specs and Meta
1 parent ee40236 commit af39eb1

14 files changed

+76
-50
lines changed

‎.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
XCODE_TEST_REPORTS: /tmp/xcode-test-results
99
LANG: en_US.UTF-8
1010
macos:
11-
xcode: '9.4.0'
11+
xcode: '10.2.0'
1212
steps:
1313
- checkout
1414
- run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS $XCODE_TEST_REPORTS
@@ -42,7 +42,7 @@ jobs:
4242
environment:
4343
LANG: en_US.UTF-8
4444
macos:
45-
xcode: '9.2.0'
45+
xcode: '10.2.0'
4646
steps:
4747
- checkout
4848
- run:

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ profile
1818
DerivedData
1919
*.hmap
2020
*.ipa
21+
*.o
2122

2223
# Bundler
2324
.bundle

‎CHANGELOG.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
Changelog
22
=========
33

4-
master
4+
5.0.0
55
-----
6+
- Update to RxSwift 5.0.
7+
- Requires the Swift 5 compiler (Xcode 10.2 and up).i
68
- added `partition(_:)` operator
79
- added `bufferWithTrigger` operator
810
- added `fromAsync` operator for `Single`
911

12+
4.0.0
13+
------
14+
Version 4.x has been skipped to align with RxSwift versioning.
15+
16+
RxSwiftExt 5.x supports Swift 5.x
17+
RxSwiftExt 3.x supports Swift 4.x
18+
1019
3.4.0
1120
-----
1221
- Fix `withUnretained` so it allows proper destructuring

‎Cartfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" ~> 4.0
1+
github "ReactiveX/RxSwift" ~> 5.0

‎Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "4.4.0"
1+
github "ReactiveX/RxSwift" "5.0.1"

‎Readme.md

+7-14
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@ If you're using [RxSwift](https://github.com/ReactiveX/RxSwift), you may have en
1010
Installation
1111
===========
1212

13-
This branch of RxSwiftExt targets Swift 4.x and RxSwift 4.0.0 or later.
13+
This branch of RxSwiftExt targets Swift 5.x and RxSwift 5.0.0 or later.
1414

15-
* If you're looking for the Swift 3 version of RxSwiftExt, please use version `2.5.1` of the framework.
16-
* If your project is running on Swift 2.x, please use version `1.2` of the framework.
15+
* If you're looking for the Swift 4 version of RxSwiftExt, please use version `3.4.0` of the framework.
1716

1817
#### CocoaPods
1918

20-
Using Swift 4:
19+
Add to your `Podfile`:
2120

2221
```ruby
23-
pod 'RxSwiftExt'
22+
pod 'RxSwiftExt', '~> 5'
2423
```
2524

2625
This will install both the `RxSwift` and `RxCocoa` extensions.
@@ -30,16 +29,10 @@ If you're interested in only installing the `RxSwift` extensions, without the `R
3029
pod 'RxSwiftExt/Core'
3130
```
3231

33-
Using Swift 3:
34-
35-
```ruby
36-
pod 'RxSwiftExt', '2.5.1'
37-
```
38-
39-
If you use Swift 2.x:
32+
Using Swift 4:
4033

4134
```ruby
42-
pod 'RxSwiftExt', '1.2'
35+
pod 'RxSwiftExt', '~> 3'
4336
```
4437

4538
#### Carthage
@@ -653,6 +646,6 @@ slider.rx.value.map(CGFloat.init)
653646
```
654647
## License
655648

656-
This library belongs to _RxSwiftCommunity_.
649+
This library belongs to _RxSwift Community_.
657650

658651
RxSwiftExt is available under the MIT license. See the LICENSE file for more info.

‎RxSwiftExt.podspec

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "RxSwiftExt"
3-
s.version = "3.4.0"
3+
s.version = "5.0.0"
44
s.summary = "RxSwift operators not found in the core distribtion"
55
s.description = <<-DESC
66
A collection of operators for RxSwift adding commonly requested operations not found in the core distribution
@@ -12,21 +12,21 @@ Pod::Spec.new do |s|
1212

1313
s.ios.deployment_target = '8.0'
1414
s.osx.deployment_target = '10.10'
15-
s.watchos.deployment_target = '2.0'
15+
s.watchos.deployment_target = '3.0'
1616
s.tvos.deployment_target = '9.0'
1717

1818
s.source = { :git => "https://github.com/RxSwiftCommunity/RxSwiftExt.git", :tag => s.version }
1919

2020
s.subspec "Core" do |cs|
2121
cs.source_files = "Source/RxSwift", "Source/Tools"
2222
cs.frameworks = "Foundation"
23-
cs.dependency "RxSwift", '~> 4.0'
23+
cs.dependency "RxSwift", '~> 5.0'
2424
end
2525

2626
s.subspec "RxCocoa" do |co|
2727
co.source_files = "Source/RxCocoa"
2828
co.frameworks = "Foundation"
29-
co.dependency "RxCocoa", '~> 4.0'
29+
co.dependency "RxCocoa", '~> 5.0'
3030
co.dependency "RxSwiftExt/Core"
3131
end
3232
end

‎RxSwiftExt.xcodeproj/project.pbxproj

+18-7
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
A23E149321A9F73500CD5B2F /* PartitionTests+RxCocoa.swift in Sources */ = {isa = PBXBuildFile; fileRef = A23E149221A9F73500CD5B2F /* PartitionTests+RxCocoa.swift */; };
163163
A23E149421A9F73500CD5B2F /* PartitionTests+RxCocoa.swift in Sources */ = {isa = PBXBuildFile; fileRef = A23E149221A9F73500CD5B2F /* PartitionTests+RxCocoa.swift */; };
164164
A23E149521A9F73500CD5B2F /* PartitionTests+RxCocoa.swift in Sources */ = {isa = PBXBuildFile; fileRef = A23E149221A9F73500CD5B2F /* PartitionTests+RxCocoa.swift */; };
165+
A2A68C992278AF6800586188 /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2A68C972278AF5000586188 /* RxRelay.framework */; };
165166
B69B45492190C27D00F30418 /* count.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B45482190C27D00F30418 /* count.swift */; };
166167
B69B454A2190C3AE00F30418 /* count.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B45482190C27D00F30418 /* count.swift */; };
167168
B69B454B2190C3AF00F30418 /* count.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B45482190C27D00F30418 /* count.swift */; };
@@ -358,6 +359,7 @@
358359
A23E148A21A9F03600CD5B2F /* partition+RxCocoa.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "partition+RxCocoa.swift"; sourceTree = "<group>"; };
359360
A23E148E21A9F10D00CD5B2F /* PartitionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartitionTests.swift; sourceTree = "<group>"; };
360361
A23E149221A9F73500CD5B2F /* PartitionTests+RxCocoa.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PartitionTests+RxCocoa.swift"; sourceTree = "<group>"; };
362+
A2A68C972278AF5000586188 /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = Carthage/Build/iOS/RxRelay.framework; sourceTree = "<group>"; };
361363
B69B45482190C27D00F30418 /* count.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = count.swift; sourceTree = "<group>"; };
362364
B69B454C2190C3BC00F30418 /* CountTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountTests.swift; sourceTree = "<group>"; };
363365
BF515CDF1F3F370600492640 /* curry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = curry.swift; path = Source/Tools/curry.swift; sourceTree = SOURCE_ROOT; };
@@ -393,6 +395,7 @@
393395
buildActionMask = 2147483647;
394396
files = (
395397
3D638E1D1DC2B36A0089A590 /* RxSwift.framework in Frameworks */,
398+
A2A68C992278AF6800586188 /* RxRelay.framework in Frameworks */,
396399
3D638DEC1DC2B2D50089A590 /* RxSwiftExt.framework in Frameworks */,
397400
3D638E1F1DC2B3A40089A590 /* RxTest.framework in Frameworks */,
398401
);
@@ -607,6 +610,7 @@
607610
9DAB77991D6763AC007E85BC /* Frameworks */ = {
608611
isa = PBXGroup;
609612
children = (
613+
A2A68C972278AF5000586188 /* RxRelay.framework */,
610614
1AA8395A207451D5001C49ED /* RxCocoa.framework */,
611615
E36BDFB81F38755F008C9D56 /* tvOS */,
612616
62512C561F0EAEB90083A89F /* macOS */,
@@ -780,7 +784,7 @@
780784
isa = PBXProject;
781785
attributes = {
782786
LastSwiftUpdateCheck = 0830;
783-
LastUpgradeCheck = 0930;
787+
LastUpgradeCheck = 1020;
784788
ORGANIZATIONNAME = RxSwiftCommunity;
785789
TargetAttributes = {
786790
188C6D901C47B2B20092101A = {
@@ -820,7 +824,7 @@
820824
};
821825
buildConfigurationList = 18EE7A131C47B12F00C7256C /* Build configuration list for PBXProject "RxSwiftExt" */;
822826
compatibilityVersion = "Xcode 8.0";
823-
developmentRegion = English;
827+
developmentRegion = en;
824828
hasScannedForEncodings = 0;
825829
knownRegions = (
826830
en,
@@ -897,12 +901,13 @@
897901
"$(SRCROOT)/Carthage/Build/Mac/RxSwift.framework",
898902
"$(SRCROOT)/Carthage/Build/Mac/RxTest.framework",
899903
"$(SRCROOT)/Carthage/Build/Mac/RxCocoa.framework",
904+
"$(SRCROOT)/Carthage/Build/Mac/RxRelay.framework",
900905
);
901906
outputPaths = (
902907
);
903908
runOnlyForDeploymentPostprocessing = 0;
904909
shellPath = /bin/sh;
905-
shellScript = "/usr/local/bin/carthage copy-frameworks";
910+
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
906911
showEnvVarsInLog = 0;
907912
};
908913
6E407C291DCF8E4C008D2828 /* Copy carthage frameworks */ = {
@@ -914,13 +919,14 @@
914919
"$(SRCROOT)/Carthage/Build/iOS/RxSwift.framework",
915920
"$(SRCROOT)/Carthage/Build/iOS/RxTest.framework",
916921
"$(SRCROOT)/Carthage/Build/iOS/RxCocoa.framework",
922+
"$(SRCROOT)/Carthage/Build/iOS/RxRelay.framework",
917923
);
918924
name = "Copy carthage frameworks";
919925
outputPaths = (
920926
);
921927
runOnlyForDeploymentPostprocessing = 0;
922928
shellPath = /bin/sh;
923-
shellScript = "/usr/local/bin/carthage copy-frameworks";
929+
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
924930
};
925931
87B3D2C1203EB014001327A4 /* Swiftlint */ = {
926932
isa = PBXShellScriptBuildPhase;
@@ -986,13 +992,14 @@
986992
"$(SRCROOT)/Carthage/Build/tvOS/RxSwift.framework",
987993
"$(SRCROOT)/Carthage/Build/tvOS/RxTest.framework",
988994
"$(SRCROOT)/Carthage/Build/tvOS/RxCocoa.framework",
995+
"$(SRCROOT)/Carthage/Build/tvOS/RxRelay.framework",
989996
);
990997
name = "Copy carthage frameworks";
991998
outputPaths = (
992999
);
9931000
runOnlyForDeploymentPostprocessing = 0;
9941001
shellPath = /bin/sh;
995-
shellScript = "/usr/local/bin/carthage copy-frameworks";
1002+
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
9961003
};
9971004
/* End PBXShellScriptBuildPhase section */
9981005

@@ -1306,6 +1313,7 @@
13061313
PRODUCT_NAME = RxSwiftExt;
13071314
SKIP_INSTALL = YES;
13081315
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1316+
SWIFT_VERSION = 5.0;
13091317
TARGETED_DEVICE_FAMILY = "1,2";
13101318
VERSIONING_SYSTEM = "apple-generic";
13111319
VERSION_INFO_PREFIX = "";
@@ -1336,6 +1344,7 @@
13361344
PRODUCT_NAME = RxSwiftExt;
13371345
SKIP_INSTALL = YES;
13381346
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1347+
SWIFT_VERSION = 5.0;
13391348
TARGETED_DEVICE_FAMILY = "1,2";
13401349
VERSIONING_SYSTEM = "apple-generic";
13411350
VERSION_INFO_PREFIX = "";
@@ -1393,7 +1402,7 @@
13931402
SDKROOT = iphoneos;
13941403
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
13951404
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1396-
SWIFT_VERSION = 4.0;
1405+
SWIFT_VERSION = 5.0;
13971406
};
13981407
name = Debug;
13991408
};
@@ -1440,7 +1449,7 @@
14401449
MTL_ENABLE_DEBUG_INFO = NO;
14411450
SDKROOT = iphoneos;
14421451
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1443-
SWIFT_VERSION = 4.0;
1452+
SWIFT_VERSION = 5.0;
14441453
VALIDATE_PRODUCT = YES;
14451454
};
14461455
name = Release;
@@ -1510,6 +1519,7 @@
15101519
SDKROOT = macosx;
15111520
SKIP_INSTALL = YES;
15121521
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1522+
SWIFT_VERSION = 5.0;
15131523
VERSIONING_SYSTEM = "apple-generic";
15141524
VERSION_INFO_PREFIX = "";
15151525
};
@@ -1544,6 +1554,7 @@
15441554
SDKROOT = macosx;
15451555
SKIP_INSTALL = YES;
15461556
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1557+
SWIFT_VERSION = 5.0;
15471558
VERSIONING_SYSTEM = "apple-generic";
15481559
VERSION_INFO_PREFIX = "";
15491560
};

‎RxSwiftExt.xcodeproj/xcshareddata/xcschemes/RxSwiftExt-iOS.xcscheme

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
language = ""
4443
shouldUseLaunchSchemeArgsEnv = "YES">
4544
<Testables>
4645
<TestableReference
@@ -70,7 +69,6 @@
7069
buildConfiguration = "Debug"
7170
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7271
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73-
language = ""
7472
launchStyle = "0"
7573
useCustomWorkingDirectory = "NO"
7674
ignoresPersistentStateOnLaunch = "NO"

‎RxSwiftExt.xcodeproj/xcshareddata/xcschemes/RxSwiftExt-macOS.xcscheme

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

‎RxSwiftExt.xcodeproj/xcshareddata/xcschemes/RxSwiftExt-tvOS.xcscheme

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

‎RxSwiftExt.xcodeproj/xcshareddata/xcschemes/RxSwiftExtPlayground.xcscheme

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -37,7 +36,6 @@
3736
buildConfiguration = "Debug"
3837
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3938
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4139
launchStyle = "0"
4240
useCustomWorkingDirectory = "NO"
4341
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)