Fix Swift 4.1 crash (#31)

* Fix Swift 4.1 crash

* Version Bump

* Update .podspec.

* Update Code to handle multiple versions of swift

Author: initFabian

Cely Demo/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.2</string>
+	<string>2.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

Cely.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'Cely'
- s.version = '2.0.2'
+ s.version = '2.0.3'
  s.license = { :type => "MIT", :file => "LICENSE" }
  s.summary = 'Cely’s goal is to add a login system into your app in under 30 seconds!'
  s.homepage = 'https://chaione.com/'

Sources/Cely.swift

@@ -30,7 +30,13 @@ public struct Cely {
     /// - parameter withOptions:         Dictionary of options to pass into cely upon setup. Please refer to `CelyOptions` to view all options.
     public static func setup<T: CelyUser, U>(with window: UIWindow?, forModel: T, requiredProperties:[U] = [], withOptions options: [CelyOptions : Any?]? = [:]) where T.Property == U {
 
+        #if swift(>=4.1)
+        Cely.requiredProperties = requiredProperties.compactMap({"\($0.rawValue)"})
+        #else
         Cely.requiredProperties = requiredProperties.flatMap({"\($0.rawValue)"})
+        #endif
+
+
 
         Cely.loginCompletionBlock = options?[.loginCompletionBlock] as? CelyLoginCompletion
         store = options?[.storage] as? CelyStorageProtocol ?? store

Sources/Info-tvOS.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.2</string>
+	<string>2.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.2</string>
+	<string>2.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Tests/CelyStorageTests.swift

@@ -125,21 +125,37 @@ class StorageTests: XCTestCase {
     func testRemoveAllData() {
         testSavingData()
         var secureCount = store.secureStorage.count
-        var storageCount = dummyData.flatMap({ dummy -> Any? in
+        #if swift(>=4.1)
+        var storageCount = dummyData.compactMap({ dummy -> Any? in
             guard !dummy.storeSecurely, !dummy.persisted else { return nil }
             return store.get(dummy.key)
         }).count
+        #else
+        var storageCount = dummyData.flatMap({ dummy -> Any? in
+        guard !dummy.storeSecurely, !dummy.persisted else { return nil }
+        return store.get(dummy.key)
+        }).count
+        #endif
+
 
         XCTAssert(secureCount == 5, "Did not add all entries inside of 'secureStorage'")
         XCTAssert(storageCount == 5, "Did not add all entries inside of 'storage'")
 
         store.removeAllData()
 
         secureCount = store.secureStorage.count
-        storageCount = dummyData.flatMap({ dummy -> Any? in
+
+        #if swift(>=4.1)
+        storageCount = dummyData.compactMap({ dummy -> Any? in
             guard !dummy.storeSecurely, !dummy.persisted else { return nil }
             return store.get(dummy.key)
         }).count
+        #else
+        storageCount = dummyData.flatMap({ dummy -> Any? in
+        guard !dummy.storeSecurely, !dummy.persisted else { return nil }
+        return store.get(dummy.key)
+        }).count
+        #endif
 
         XCTAssert(secureCount == 0, "Did not remove all entries inside of 'secureStorage'")
         XCTAssert(storageCount == 1, "Did not remove all entries inside of 'storage'")

Tests/CelyTests.swift

@@ -45,7 +45,12 @@ class DummyStorage: CelyStorageProtocol {
 class CelyTests: XCTestCase {
     var _properties: [DummyUser.Property]!
     var raw_properties: [CelyProperty] {
+        #if swift(>=4.1)
+        return _properties.compactMap({"\($0.rawValue)"})
+        #else
         return _properties.flatMap({"\($0.rawValue)"})
+        #endif
+
     }
     var triggeredNotification: String!
     override func setUp() {
@@ -84,7 +89,12 @@ class CelyTests: XCTestCase {
 
 
     func testSetup() {
+        #if swift(>=4.1)
+        let testRequiredProperties: [String] = _properties.compactMap({"\($0.rawValue)"})
+        #else
         let testRequiredProperties: [String] = _properties.flatMap({"\($0.rawValue)"})
+        #endif
+
         XCTAssert(Cely.requiredProperties == testRequiredProperties, "Cely does not match the mock results")
     }
 

Tests/Info-tvOS.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.2</string>
+	<string>2.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UIRequiredDeviceCapabilities</key>

Tests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.2</string>
+	<string>2.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

fastlane/Fastfile

@@ -10,4 +10,6 @@ lane :version_bump do |options|
   version_number = get_version_number(xcodeproj: 'Cely.xcodeproj')
   puts version_number
   add_git_tag(tag: version_number)
+  # Dont forget to update version on podspec
+  # and run `pod trunk push Cely.podspec`
 end