From ee62094303a6d200000195f22de284a2f8ad9de2 Mon Sep 17 00:00:00 2001 From: Suyeol Jeon Date: Sun, 7 Apr 2019 21:35:43 +0900 Subject: [PATCH 1/6] Remove .swift-version --- .swift-version | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index bf77d54..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.2 From c7a37e1f9a6695129ff783dca39968e595cf54b4 Mon Sep 17 00:00:00 2001 From: Suyeol Jeon Date: Sun, 7 Apr 2019 21:36:04 +0900 Subject: [PATCH 2/6] Add swift_version to podspec --- ReusableKit.podspec | 1 + 1 file changed, 1 insertion(+) diff --git a/ReusableKit.podspec b/ReusableKit.podspec index 0a037ae..303e909 100644 --- a/ReusableKit.podspec +++ b/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" From e8c5f1bac011d209d9af6d96aa6d0c2e8fc7e10b Mon Sep 17 00:00:00 2001 From: Suyeol Jeon Date: Sun, 7 Apr 2019 21:48:14 +0900 Subject: [PATCH 3/6] Use Swift 5 in Package.swift --- Package.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 99e75d9..48328b0 100644 --- a/Package.swift +++ b/Package.swift @@ -1,9 +1,12 @@ -// swift-tools-version:4.2 +// swift-tools-version:5.0 import PackageDescription let package = Package( name: "ReusableKit", + platforms: [ + .iOS(.v8) + ], products: [ .library(name: "ReusableKit", targets: ["ReusableKit"]), .library(name: "RxReusableKit", targets: ["RxReusableKit"]), @@ -16,5 +19,6 @@ let package = Package( .target(name: "RxReusableKit", dependencies: ["ReusableKit", "RxSwift", "RxCocoa"]), .testTarget(name: "ReusableKitTests", dependencies: ["ReusableKit"]), .testTarget(name: "RxReusableKitTests", dependencies: ["RxReusableKit"]), - ] + ], + swiftLanguageVersions: [.v5] ) From f88ba449e4bc501e2ab9f8705f26b55789e81a61 Mon Sep 17 00:00:00 2001 From: Suyeol Jeon Date: Sun, 7 Apr 2019 21:48:16 +0900 Subject: [PATCH 4/6] Use Xcode 10.2 on Travis --- .travis.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 72102a8..1863188 100644 --- a/.travis.yml +++ b/.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 From 1f18a01cf15f3074668b3a100e08e942972ea719 Mon Sep 17 00:00:00 2001 From: Suyeol Jeon Date: Sun, 7 Apr 2019 21:48:37 +0900 Subject: [PATCH 5/6] Update Swift version in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd9ac1d..40f8aea 100644 --- a/README.md +++ b/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) From a1a912b9bcb847a37e3b9e9f2369352c759127d5 Mon Sep 17 00:00:00 2001 From: Suyeol Jeon Date: Fri, 14 Jun 2019 15:54:24 +0900 Subject: [PATCH 6/6] Use RxSwift 5.0 --- Package.resolved | 4 ++-- Package.swift | 4 ++-- ReusableKit.podspec | 4 ++-- Sources/RxReusableKit/UICollectionView+RxReusableKit.swift | 2 +- Sources/RxReusableKit/UITableView+RxReusableKit.swift | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Package.resolved b/Package.resolved index fbc3172..e3afef8 100644 --- a/Package.resolved +++ b/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" } } ] diff --git a/Package.swift b/Package.swift index 48328b0..1274fcb 100644 --- a/Package.swift +++ b/Package.swift @@ -5,14 +5,14 @@ import PackageDescription let package = Package( name: "ReusableKit", platforms: [ - .iOS(.v8) + .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"), diff --git a/ReusableKit.podspec b/ReusableKit.podspec index 303e909..1f65021 100644 --- a/ReusableKit.podspec +++ b/ReusableKit.podspec @@ -22,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 diff --git a/Sources/RxReusableKit/UICollectionView+RxReusableKit.swift b/Sources/RxReusableKit/UICollectionView+RxReusableKit.swift index 3f34fbe..298cb9e 100644 --- a/Sources/RxReusableKit/UICollectionView+RxReusableKit.swift +++ b/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) diff --git a/Sources/RxReusableKit/UITableView+RxReusableKit.swift b/Sources/RxReusableKit/UITableView+RxReusableKit.swift index 8f42388..6846489 100644 --- a/Sources/RxReusableKit/UITableView+RxReusableKit.swift +++ b/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)