Merge pull request #23 from farshadtx/master

- Add Github Action
- Update PodSpec
- Update Sample to Swift 5

Author: farshadtx

.github/workflows/action.yml

@@ -0,0 +1,32 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  tests:
+    runs-on: macos-10.15
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: actions/cache@v2
+      with:
+        path: Carthage
+        key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
+        restore-keys: |
+          ${{ runner.os }}-carthage-
+
+    - name: Carthage Bootstrap
+      run: carthage bootstrap --cache-builds --no-use-binaries --platform ios
+
+    - name: Run all tests
+      run: xcodebuild clean build test -scheme 'RxSwiftUtilities iOS' -destination "platform=iOS Simulator,name=iPhone 11" -enableCodeCoverage YES
+
+    - name: CodeCov
+      run: bash <(curl -s https://codecov.io/bash) -J 'RxSwiftUtilities'

.travis.yml

@@ -7,6 +7,12 @@ All notable changes to this project will be documented in this file.
 
 * nothing *
 
+## [2.2.0](https://github.com/RxSwiftCommunity/RxSwiftUtilities/releases/tag/2.2.0) (Swift 5 compatible)
+
+* Add Github Action
+* Update to Swift 5
+* Update PodSpec
+
 ## [2.1.0](https://github.com/RxSwiftCommunity/RxSwiftUtilities/releases/tag/2.1.0) (Xcode 10 / Swift 4.2 compatible)
 
 * Add two-way binding operator `<->`

CHANGELOG.md

@@ -1 +1 @@
-github "ReactiveX/RxSwift" "5.0.1"
+github "ReactiveX/RxSwift" "5.1.1"

Cartfile.resolved

@@ -123,20 +123,20 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1150;
 				ORGANIZATIONNAME = RxSwiftCommunity;
 				TargetAttributes = {
 					888CC1F81DE494BB00DAE48A = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeam = 3V4RS4ALV7;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1150;
 						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = 888CC1F41DE494BB00DAE48A /* Build configuration list for PBXProject "ExampleApp" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -173,15 +173,15 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-ExampleApp/Pods-ExampleApp-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework",
 				"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
+				"${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework",
 				"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
 				"${BUILT_PRODUCTS_DIR}/RxSwiftUtilities/RxSwiftUtilities.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwiftUtilities.framework",
 			);
@@ -248,6 +248,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -306,6 +307,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -363,7 +365,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.RxSwiftCommunity.ExampleApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -377,7 +379,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.RxSwiftCommunity.ExampleApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

ExampleApp/ExampleApp.xcodeproj/project.pbxproj

@@ -17,7 +17,7 @@ class TwoWayBindingViewController: UITableViewController, UITextFieldDelegate {
     @IBOutlet private weak var label: UILabel!
     @IBOutlet private weak var stackView: UIStackView!
 
-    private let variable = Variable<String?>(nil)
+    private let behaviorRelay = BehaviorRelay<String?>(value: nil)
     private let disposeBag = DisposeBag()
 
     override func viewDidLoad() {
@@ -40,10 +40,10 @@ class TwoWayBindingViewController: UITableViewController, UITextFieldDelegate {
             })
             .disposed(by: disposeBag)
 
-        (textField.rx.text <-> variable)
+        (textField.rx.text <-> behaviorRelay)
             .disposed(by: disposeBag)
 
-        variable
+        behaviorRelay
             .asDriver()
             .drive(label.rx.text)
             .disposed(by: disposeBag)
@@ -57,7 +57,7 @@ class TwoWayBindingViewController: UITableViewController, UITextFieldDelegate {
             button.rx.tap
                 .asDriver()
                 .map { button.titleLabel?.text }
-                .drive(variable)
+                .drive(behaviorRelay)
                 .disposed(by: disposeBag)
             button.backgroundColor = UIColor(displayP3Red: 0.93, green: 0.93, blue: 0.93, alpha: 1)
             button.layer.cornerRadius = 4

ExampleApp/ExampleApp/TwoWayBindingViewController.swift

@@ -1,32 +1,33 @@
 PODS:
-  - RxAtomic (4.4.0)
-  - RxCocoa (4.4.0):
-    - RxSwift (~> 4.0)
-  - RxSwift (4.4.0):
-    - RxAtomic (~> 4.4)
-  - RxSwiftUtilities (2.1.0):
-    - RxCocoa (~> 4.4)
-    - RxSwift (~> 4.4)
+  - RxCocoa (5.1.1):
+    - RxRelay (~> 5)
+    - RxSwift (~> 5)
+  - RxRelay (5.1.1):
+    - RxSwift (~> 5)
+  - RxSwift (5.1.1)
+  - RxSwiftUtilities (2.2.0):
+    - RxCocoa (~> 5.1)
+    - RxSwift (~> 5.1)
 
 DEPENDENCIES:
   - RxSwiftUtilities (from `../`)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
-    - RxAtomic
+  https://github.com/CocoaPods/Specs.git:
     - RxCocoa
+    - RxRelay
     - RxSwift
 
 EXTERNAL SOURCES:
   RxSwiftUtilities:
     :path: "../"
 
 SPEC CHECKSUMS:
-  RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f
-  RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749
-  RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973
-  RxSwiftUtilities: 01034c5ba9ea6b3910458b46f60eff9eb66103f9
+  RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601
+  RxRelay: d77f7d771495f43c556cbc43eebd1bb54d01e8e9
+  RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
+  RxSwiftUtilities: 891ab1aefae2d3d5669ed6281efd1da20ae31ff6
 
 PODFILE CHECKSUM: 76bf4791be77375ab3f65b32b122237d1e9eaf79
 
-COCOAPODS: 1.6.0.beta.1
+COCOAPODS: 1.8.4

ExampleApp/Podfile.lock

@@ -3,7 +3,7 @@ RxSwiftUtilities
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/RxSwiftUtilities.svg)](https://cocoapods.org/pods/RxSwiftUtilities)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![Platform](https://img.shields.io/cocoapods/p/RxSwiftUtilities.svg?style=flat)](http://cocoadocs.org/docsets/RxSwiftUtilities)
-[![Build Status](https://travis-ci.org/RxSwiftCommunity/RxSwiftUtilities.svg?branch=master)](https://travis-ci.org/RxSwiftCommunity/RxSwiftUtilities)
+![CI](https://github.com/RxSwiftCommunity/RxSwiftUtilities/workflows/CI/badge.svg?branch=master)
 [![codecov](https://codecov.io/gh/RxSwiftCommunity/RxSwiftUtilities/branch/master/graph/badge.svg)](https://codecov.io/gh/RxSwiftCommunity/RxSwiftUtilities)
 
 ## About

README.md

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "RxSwiftUtilities"
-  s.version      = "2.1.0"
+  s.version      = "2.2.0"
   s.summary      = "Helpful classes and extensions for RxSwift"
   s.description  = <<-DESC
 Helpful classes and extensions for RxSwift which don't belong in RxSwift core.
@@ -16,6 +16,6 @@ Helpful classes and extensions for RxSwift which don't belong in RxSwift core.
   s.source       = { :git => "https://github.com/RxSwiftCommunity/RxSwiftUtilities.git", :tag => "#{s.version}" }
   s.source_files = 'Source/Common/*.swift'
   s.ios.source_files = 'Source/iOS/*.swift'
-  s.dependency   "RxSwift", "~> 5.0"
-  s.dependency   "RxCocoa", "~> 5.0"
+  s.dependency   "RxSwift", "~> 5.1"
+  s.dependency   "RxCocoa", "~> 5.1"
 end