Merge pull request devxoul#9 from devxoul/swift-5.0

Let's Swift 5.0 🚀

.travis.yml

@@ -1,20 +1,16 @@
-osx_image: xcode10
+osx_image: xcode10.2
 language: objective-c
 sudo: required
 env:
   global:
     - PROJECT="ReusableKit.xcodeproj"
     - SCHEME="ReusableKit-Package"
-    - IOS_SDK="iphonesimulator12.0"
+    - IOS_SDK="iphonesimulator12.2"
     - MACOS_SDK="macosx10.14"
-    - TVOS_SDK="appletvsimulator12.0"
+    - TVOS_SDK="appletvsimulator12.2"
     - FRAMEWORK="ReusableKit"
   matrix:
-    - SDK="$IOS_SDK"      DESTINATION="platform=iOS Simulator,name=iPhone XS,OS=12.0"
-
-install:
-  - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
-  - swift --version
+    - SDK="$IOS_SDK"      DESTINATION="platform=iOS Simulator,name=iPhone XS,OS=12.2"
 
 before_script:
   - set -o pipefail

Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "0df62b4d562f8620d4b795b18e4adf0b631527a1",
-          "version": "4.3.1"
+          "revision": "b3e888b4972d9bc76495dd74d30a8c7fad4b9395",
+          "version": "5.0.1"
         }
       }
     ]

Package.swift

@@ -1,20 +1,24 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 
 import PackageDescription
 
 let package = Package(
   name: "ReusableKit",
+  platforms: [
+    .iOS(.v8), .tvOS(.v9)
+  ],
   products: [
     .library(name: "ReusableKit", targets: ["ReusableKit"]),
     .library(name: "RxReusableKit", targets: ["RxReusableKit"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.0.0")),
+    .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0")),
   ],
   targets: [
     .target(name: "ReusableKit"),
     .target(name: "RxReusableKit", dependencies: ["ReusableKit", "RxSwift", "RxCocoa"]),
     .testTarget(name: "ReusableKitTests", dependencies: ["ReusableKit"]),
     .testTarget(name: "RxReusableKitTests", dependencies: ["RxReusableKit"]),
-  ]
+  ],
+  swiftLanguageVersions: [.v5]
 )

README.md

@@ -1,6 +1,6 @@
 # ReusableKit
 
-![Swift](https://img.shields.io/badge/Swift-4.2-orange.svg)
+![Swift](https://img.shields.io/badge/Swift-5.0-orange.svg)
 [![CocoaPods](http://img.shields.io/cocoapods/v/ReusableKit.svg)](https://cocoapods.org/pods/ReusableKit)
 [![Build Status](https://travis-ci.org/devxoul/ReusableKit.svg)](https://travis-ci.org/devxoul/ReusableKit)
 [![Codecov](https://img.shields.io/codecov/c/github/devxoul/ReusableKit.svg)](https://codecov.io/gh/devxoul/ReusableKit)

ReusableKit.podspec

@@ -9,6 +9,7 @@ Pod::Spec.new do |s|
                          :tag => s.version.to_s }
   s.frameworks       = 'UIKit', 'Foundation'
   s.requires_arc     = true
+  s.swift_version    = "5.0"
 
   s.ios.deployment_target = "8.0"
 
@@ -21,7 +22,7 @@ Pod::Spec.new do |s|
   s.subspec "RxSwift" do |ss|
     ss.source_files = "Sources/RxReusableKit/*.swift"
     ss.dependency "ReusableKit/Core"
-    ss.dependency "RxSwift", ">= 4.0.0"
-    ss.dependency "RxCocoa", ">= 4.0.0"
+    ss.dependency "RxSwift", "~> 5.0"
+    ss.dependency "RxCocoa", "~> 5.0"
   end
 end

Sources/RxReusableKit/UICollectionView+RxReusableKit.swift

@@ -14,7 +14,7 @@ extension Reactive where Base: UICollectionView {
   ) -> (_ source: O)
     -> (_ configureCell: @escaping (Int, S.Iterator.Element, Cell) -> Void)
     -> Disposable
-    where O.E == S {
+    where O.Element == S {
     return { source in
       return { configureCell in
         return self.items(cellIdentifier: reusableCell.identifier, cellType: Cell.self)(source)(configureCell)

Sources/RxReusableKit/UITableView+RxReusableKit.swift

@@ -14,7 +14,7 @@ extension Reactive where Base: UITableView {
   ) -> (_ source: O)
     -> (_ configureCell: @escaping (Int, S.Iterator.Element, Cell) -> Void)
     -> Disposable
-    where O.E == S {
+    where O.Element == S {
     return { source in
       return { configureCell in
         return self.items(cellIdentifier: reusableCell.identifier, cellType: Cell.self)(source)(configureCell)