Merge pull request #9 from RxSwiftCommunity/feature/migration-swift-4.2

migration swift4.2 & ready for release 2.2.0

.swift-version

@@ -1 +1 @@
-4.0
+4.2

Example/RxCocoa-Texture.xcodeproj/project.pbxproj

@@ -661,7 +661,7 @@
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "";
  SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  };
  name = Debug;
  };
@@ -680,7 +680,7 @@
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "";
  SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  };
  name = Release;
  };
@@ -702,7 +702,7 @@
  PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
  PRODUCT_NAME = "$(TARGET_NAME)";
  SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RxCocoa-Texture_Example.app/RxCocoa-Texture_Example";
  };
  name = Debug;
@@ -721,7 +721,7 @@
  PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
  PRODUCT_NAME = "$(TARGET_NAME)";
  SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RxCocoa-Texture_Example.app/RxCocoa-Texture_Example";
  };
  name = Release;

Example/RxCocoa-Texture.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEDidComputeMac32BitWarning</key>
+ <true/>
+</dict>
+</plist>

Example/RxCocoa-Texture/AppDelegate.swift

@@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  var window: UIWindow?
 
 
- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
  window = UIWindow(frame: UIScreen.main.bounds) // create UIwindow
  let viewController = RepositoryViewController()
  let navigationController =

Example/RxCocoa-Texture/ButtonTestNode.swift

@@ -23,8 +23,8 @@ class ButtonTestNode: ASDisplayNode {
  let url = URL(string: "https://koreaboo-cdn.storage.googleapis.com/2017/08/sana-1-1.jpg")
  let touchRelay = PublishRelay<Void>()
 
- let defaultAttr = [NSAttributedStringKey.foregroundColor: UIColor.black]
- let disableAttr = [NSAttributedStringKey.foregroundColor: UIColor.gray]
+ let defaultAttr = [NSAttributedString.Key.foregroundColor: UIColor.black]
+ let disableAttr = [NSAttributedString.Key.foregroundColor: UIColor.gray]
 
  override init() {
  super.init()

Example/RxCocoa-Texture/EditableTextTestNode.swift

@@ -15,7 +15,7 @@ class EditableTextTestNode: ASDisplayNode {
 
  lazy var textNode = ASEditableTextNode()
  let disposeBag = DisposeBag()
- static let attribute = [NSAttributedStringKey.foregroundColor: UIColor.gray]
+ static let attribute = [NSAttributedString.Key.foregroundColor: UIColor.gray]
 
  override init() {
  super.init()

Example/RxCocoa-Texture/RepositoryListCellNode.swift

@@ -141,23 +141,23 @@ extension RepositoryListCellNode {
 }
 
 extension RepositoryListCellNode {
- static var usernameAttributes: [NSAttributedStringKey: Any] {
- return [NSAttributedStringKey.foregroundColor: UIColor.black,
- NSAttributedStringKey.font: UIFont.systemFont(ofSize: 20.0)]
+ static var usernameAttributes: [NSAttributedString.Key: Any] {
+ return [NSAttributedString.Key.foregroundColor: UIColor.black,
+ NSAttributedString.Key.font: UIFont.systemFont(ofSize: 20.0)]
  }
 
- static var descAttributes: [NSAttributedStringKey: Any] {
- return [NSAttributedStringKey.foregroundColor: UIColor.darkGray,
- NSAttributedStringKey.font: UIFont.systemFont(ofSize: 15.0)]
+ static var descAttributes: [NSAttributedString.Key: Any] {
+ return [NSAttributedString.Key.foregroundColor: UIColor.darkGray,
+ NSAttributedString.Key.font: UIFont.systemFont(ofSize: 15.0)]
  }
 
- static var statusAttributes: [NSAttributedStringKey: Any] {
- return [NSAttributedStringKey.foregroundColor: UIColor.gray,
- NSAttributedStringKey.font: UIFont.systemFont(ofSize: 12.0)]
+ static var statusAttributes: [NSAttributedString.Key: Any] {
+ return [NSAttributedString.Key.foregroundColor: UIColor.gray,
+ NSAttributedString.Key.font: UIFont.systemFont(ofSize: 12.0)]
  }
 
- static var moreSeeAttributes: [NSAttributedStringKey: Any] {
- return [NSAttributedStringKey.foregroundColor: UIColor.darkGray,
- NSAttributedStringKey.font: UIFont.systemFont(ofSize: 15.0, weight: .medium)]
+ static var moreSeeAttributes: [NSAttributedString.Key: Any] {
+ return [NSAttributedString.Key.foregroundColor: UIColor.darkGray,
+ NSAttributedString.Key.font: UIFont.systemFont(ofSize: 15.0, weight: .medium)]
  }
 }

Example/RxCocoa-Texture/RepositoryViewController.swift

@@ -125,7 +125,7 @@ extension RepositoryViewController: ASTableDelegate {
  }
 
  func tableView(_ tableView: UITableView,
- commit editingStyle: UITableViewCellEditingStyle,
+ commit editingStyle: UITableViewCell.EditingStyle,
  forRowAt indexPath: IndexPath) {
 
  if editingStyle == .delete {

Example/RxCocoa-Texture/TextTestNode.swift

@@ -20,7 +20,7 @@ class TextTestNode: ASDisplayNode {
 
  lazy var textNode = ASTextNode()
  let disposeBag = DisposeBag()
- static let attribute = [NSAttributedStringKey.foregroundColor: UIColor.gray]
+ static let attribute = [NSAttributedString.Key.foregroundColor: UIColor.gray]
 
  override init() {
  super.init()

RxCocoa-Texture.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'RxCocoa-Texture'
- s.version = '2.1.0'
+ s.version = '2.2.0'
  s.summary = 'RxCocoa Extension Library for Texture'
 
  s.description = 'This library is built on Texture with RxCocoa, RxCocoa is a framework that helps make Cocoa APIs used in iOS and OS X easier to use with reactive techniques.'

RxCocoa-Texture/Classes/ASButtonNode+Rx.swift

@@ -32,15 +32,15 @@ extension Reactive where Base: ASButtonNode {
  }
 
  // apply attributedText on targeted control state
- public func attributedText(_ controlState: UIControlState) -> ASBinder<NSAttributedString?> {
+ public func attributedText(_ controlState: UIControl.State) -> ASBinder<NSAttributedString?> {
 
  return ASBinder(self.base) { node, attributedText in
  node.setAttributedTitle(attributedText, for: controlState)
  }
  }
 
  // apply text with attribute on all control state
- public func text(_ attribute: [NSAttributedStringKey: Any]?) -> ASBinder<String?> {
+ public func text(_ attribute: [NSAttributedString.Key: Any]?) -> ASBinder<String?> {
 
  return ASBinder(self.base) { node, text in
  guard let text = text else {
@@ -54,8 +54,8 @@ extension Reactive where Base: ASButtonNode {
  }
 
  // apply text with attribute on targeted control state
- public func text(_ attribute: [NSAttributedStringKey: Any]?,
- target: UIControlState) -> ASBinder<String?> {
+ public func text(_ attribute: [NSAttributedString.Key: Any]?,
+  target: UIControl.State) -> ASBinder<String?> {
 
  return ASBinder(self.base) { node, text in
  guard let text = text else {
@@ -145,7 +145,7 @@ extension Reactive where Base: ASButtonNode {
  case disabled(Any?)
  case selected(Any?)
 
- var state: UIControlState {
+ var state: UIControl.State {
 
  switch self {
  case .normal:
@@ -187,17 +187,17 @@ extension Reactive where Base: ASButtonNode {
  }
  }
 
- var attributes: [NSAttributedStringKey: Any]? {
+ var attributes: [NSAttributedString.Key: Any]? {
 
  switch self {
  case .normal(let attr):
- return attr as? [NSAttributedStringKey: Any]
+ return attr as? [NSAttributedString.Key: Any]
  case .highlighted(let attr):
- return attr as? [NSAttributedStringKey: Any]
+ return attr as? [NSAttributedString.Key: Any]
  case .disabled(let attr):
- return attr as? [NSAttributedStringKey: Any]
+ return attr as? [NSAttributedString.Key: Any]
  case .selected(let attr):
- return attr as? [NSAttributedStringKey: Any]
+ return attr as? [NSAttributedString.Key: Any]
  }
  }
  }

RxCocoa-Texture/Classes/ASEditableTextNode+Rx.swift

@@ -18,7 +18,7 @@ extension Reactive where Base: ASEditableTextNode {
  }
  }
 
- public func text(_ attributes: [NSAttributedStringKey: Any]?) -> ASBinder<String?> {
+ public func text(_ attributes: [NSAttributedString.Key: Any]?) -> ASBinder<String?> {
 
  return ASBinder(self.base) { node, text in
  guard let text = text else {

RxCocoa-Texture/Classes/ASTextNode+Rx.swift

@@ -18,7 +18,7 @@ extension Reactive where Base: ASTextNode {
  }
  }
 
- public func text(_ attributes: [NSAttributedStringKey: Any]?) -> ASBinder<String?> {
+ public func text(_ attributes: [NSAttributedString.Key: Any]?) -> ASBinder<String?> {
 
  return ASBinder(self.base) { node, text in
  guard let text = text else {