update for Swift 5

.travis.yml

@@ -1,13 +1,13 @@
 language: objective-c
 sudo: required
-osx_image: xcode9.3
+osx_image: xcode10.2
 
 env:
   global:
-    - IOS_SDK="iphonesimulator11.3"
+    - IOS_SDK="iphonesimulator12.2"
     - FRAMEWORK="Flix"
   matrix:
-    - SDK="$IOS_SDK"      TEST=0  DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.3"
+    - SDK="$IOS_SDK"      TEST=0  DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=12.2"
 
 notifications:
   email: false

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ---
 
+## [3.0.0](https://github.com/DianQK/Flix/releases/tag/3.0.0)
+
+- Support Swift 5
+
 ## [1.1.0](https://github.com/DianQK/Flix/releases/tag/1.1.0)
 
 - Add CollectionViewMoveable

Example/Example/CalendarEvent/Location/SelectLocationViewController.swift

@@ -179,7 +179,7 @@ class SelectLocationViewController: UIViewController {
             .subscribe(onNext: { [weak self] (placemark) in
                 _ = self?.navigationController?.popViewController(animated: true)
                 var recentSelectedPlacemarks = Storage.recentSelectedPlacemarks.value
-                if let index = recentSelectedPlacemarks.index(where: { $0.identity == placemark.identity }) {
+                if let index = recentSelectedPlacemarks.firstIndex(where: { $0.identity == placemark.identity }) {
                     recentSelectedPlacemarks.remove(at: index)
                 }
                 recentSelectedPlacemarks.append(placemark)

Example/Example/DoNotDisturbSettingsViewController.swift

@@ -66,36 +66,36 @@ class DoNotDisturbSettingsViewController: CollectionViewController {
             }
         }
 
-        let radioProvider = RadioProvider(options: [SlienceMode.always, SlienceMode.whileLocked])
-        radioProvider.checkedOption.accept(SlienceMode.always)
-        providers.append(radioProvider)
-
-        let slienceCommentProvider = UniqueCommentTextProvider(
-            text: ""
-        )
-        radioProvider.checkedOption.asObservable()
-            .map { (option) -> String in
-                return option?.comment ?? ""
-            }
-            .bind(to: slienceCommentProvider.text)
-            .disposed(by: disposeBag)
-        providers.append(slienceCommentProvider)
-
-        let allowCallsFromTitleProvider = UniqueCommentTextProvider(
-            text: "PHONE"
-        )
-        providers.append(allowCallsFromTitleProvider)
-        let allowCallsFromProvider = UniqueTextProvider(
-            title: "Allow Calls From",
-            desc: "Everyone"
-        )
-        providers.append(allowCallsFromProvider)
-        let allowCallsFromCommentProvider = UniqueCommentTextProvider(
-            text: "When in Do Not Disturb, allow incoming calls from everyone."
-        )
-        providers.append(allowCallsFromCommentProvider)
-
-        self.collectionView.flix.animatable.build(providers)
+//        let radioProvider = RadioProvider(options: [SlienceMode.always, SlienceMode.whileLocked])
+//        radioProvider.checkedOption.accept(SlienceMode.always)
+//        providers.append(radioProvider)
+//        
+//        let slienceCommentProvider = UniqueCommentTextProvider(
+//            text: ""
+//        )
+//        radioProvider.checkedOption.asObservable()
+//            .map { (option) -> String in
+//                return option?.comment ?? ""
+//            }
+//            .bind(to: slienceCommentProvider.text)
+//            .disposed(by: disposeBag)
+//        providers.append(slienceCommentProvider)
+//        
+//        let allowCallsFromTitleProvider = UniqueCommentTextProvider(
+//            text: "PHONE"
+//        )
+//        providers.append(allowCallsFromTitleProvider)
+//        let allowCallsFromProvider = UniqueTextProvider(
+//            title: "Allow Calls From",
+//            desc: "Everyone"
+//        )
+//        providers.append(allowCallsFromProvider)
+//        let allowCallsFromCommentProvider = UniqueCommentTextProvider(
+//            text: "When in Do Not Disturb, allow incoming calls from everyone."
+//        )
+//        providers.append(allowCallsFromCommentProvider)
+//        
+//        self.collectionView.flix.animatable.build(providers)
     }
 
 }

Example/Example/MoveCollectionViewController.swift

@@ -72,6 +72,8 @@ class MoveCollectionViewController: CollectionViewController {
                     collectionView.endInteractiveMovement()
                 case .cancelled, .failed, .possible:
                     collectionView.cancelInteractiveMovement()
+                @unknown default:
+                    break;
                 }
             })
             .disposed(by: disposeBag)

Example/Providers/RadioProvider.swift

@@ -58,32 +58,39 @@ class RadioProvider<Option: Equatable & StringIdentifiableType>: AnimatableColle
     let options: [Option]
     let checkedOption = BehaviorRelay<Option?>(value: nil)
     let disposeBag = DisposeBag()
-    
+//
     typealias Cell = RadioCollectionViewCell
     typealias Value = Option
-    
+
     init(options: [Option]) {
         self.options = options
     }
-    
+
     func configureCell(_ collectionView: UICollectionView, cell: RadioCollectionViewCell, indexPath: IndexPath, value: Option) {
         cell.titleLabel.text = String(describing: value)
         checkedOption.asObservable()
             .map { $0 == value }
             .bind(to: cell.isChecked)
             .disposed(by: cell.reuseBag)
     }
-    
-    func itemSelected(_ collectionView: UICollectionView, indexPath: IndexPath, value: Value) {
+
+    func itemSelected(_ collectionView: UICollectionView, indexPath: IndexPath, value: Option) {
         collectionView.deselectItem(at: indexPath, animated: true)
         checkedOption.accept(value)
     }
-    
-    func createValues() -> Observable<[Value]> {
+
+    func createValues() -> Observable<[Option]> {
         return Observable.just(options)
     }
-
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath, value: Value) -> CGSize? {
+
+    // workaround: Segmentation fault: 11 While emitting IR SIL function "@$s7Example13RadioProviderCyqd__G4Flix033AnimatableCollectionViewMultiNodeC0AaeFP06createE5Nodes7RxSwift10ObservableCySayAE012IdentifiableI0VGGyFTW". for 'createAnimatableNodes()' (in module 'Flix')
+    func createAnimatableNodes() -> Observable<[IdentifiableNode]> {
+        let providerIdentity = self._flix_identity
+        return createValues()
+            .map { $0.map { IdentifiableNode(providerIdentity: providerIdentity, valueNode: $0) } }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath, value: Option) -> CGSize? {
         return CGSize(width: collectionView.bounds.width, height: 44)
     }
 

Flix.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Flix'
-  s.version          = '2.0.0'
+  s.version          = '3.0.0'
   s.summary          = 'iOS form builder in Swift'
   s.homepage         = 'https://github.com/DianQK/Flix'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
@@ -11,11 +11,11 @@ Pod::Spec.new do |s|
   s.frameworks       = 'UIKit', 'Foundation'
   s.requires_arc     = true
 
-  s.dependency 'RxSwift', '~> 4.3'
-  s.dependency 'RxCocoa', '~> 4.3'
+  s.dependency 'RxSwift', '~> 4.4'
+  s.dependency 'RxCocoa', '~> 4.4'
   s.dependency 'RxDataSources', '~> 3.1'
 
   s.ios.deployment_target = '9.0'
 
-  s.swift_version = '4.2'
+  s.swift_version = '5.0'
 end

Flix.xcodeproj/project.pbxproj

@@ -700,7 +700,6 @@
 				9157D7B62080536F008E22D8 /* Sources */,
 				9157D7B72080536F008E22D8 /* Frameworks */,
 				9157D7B82080536F008E22D8 /* Resources */,
-				2D6F2563A5C5FBCC2D8CF630 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -786,30 +785,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		2D6F2563A5C5FBCC2D8CF630 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-FlixTests/Pods-FlixTests-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/Differentiator/Differentiator.framework",
-				"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
-				"${BUILT_PRODUCTS_DIR}/RxDataSources/RxDataSources.framework",
-				"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Differentiator.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxDataSources.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FlixTests/Pods-FlixTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		71E0C36382680B661BDAA87F /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -834,8 +809,9 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Differentiator/Differentiator.framework",
+				"${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework",
 				"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
 				"${BUILT_PRODUCTS_DIR}/RxDataSources/RxDataSources.framework",
 				"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
@@ -844,14 +820,15 @@
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Differentiator.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxDataSources.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxKeyboard.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		E53098C1DFCC24D09F9B7948 /* [CP] Check Pods Manifest.lock */ = {
@@ -1107,6 +1084,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1161,6 +1139,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1187,7 +1166,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1211,7 +1190,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1231,7 +1210,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.dianqk.FlixExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1251,7 +1230,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.dianqk.FlixExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1268,7 +1247,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.dianqk.FlixTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1285,7 +1264,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.dianqk.FlixTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

Flix.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
-   version = "1.7">
+   LastUpgradeVersion = "1020"
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">

Flix.xcodeproj/xcshareddata/xcschemes/Flix.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

Flix/UniqueCustomProvider/UniqueCustomCollectionViewProvider.swift

@@ -63,7 +63,7 @@ open class SingleCollectionViewProvider<Cell: UICollectionViewCell>: CustomProvi
         self.customIdentity = ""
     }
 
-    open func onCreate(_ collectionView: UICollectionView, cell: Cell, indexPath: IndexPath) {
+    open func onCreate(_ collectionView: UICollectionView, cell: UICollectionViewCell, indexPath: IndexPath) {
         self.onGetCell(cell)
         cell.selectedBackgroundView = self.selectedBackgroundView
         cell.backgroundView = self.backgroundView

Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "cocoapods", '~> 1.7.0.beta'