Merge pull request #1 from awulf/master

Update to use Swift 4.2

Author: ricsantos

Example/Podfile

@@ -1,3 +1,4 @@
+platform :ios, '10.0'
 use_frameworks!
 
 target 'iStatusView_Example' do
@@ -9,8 +10,8 @@ target 'iStatusView_Example' do
     inherit! :search_paths
 
     pod 'Quick', '~> 1.2.0'
-    pod 'Nimble', '~> 7.0.2'
+    pod 'Nimble', '~> 8.0'
     pod 'FBSnapshotTestCase' , '~> 2.1.4'
-    pod 'Nimble-Snapshots' , '~> 6.3.0'
+    pod 'Nimble-Snapshots' , '~> 7.0'
   end
 end

Example/Podfile.lock

@@ -4,39 +4,55 @@ PODS:
   - FBSnapshotTestCase/Core (2.1.4)
   - FBSnapshotTestCase/SwiftSupport (2.1.4):
     - FBSnapshotTestCase/Core
-  - iStatusView (0.1.0)
-  - Nimble (7.0.3)
-  - Nimble-Snapshots (6.3.0):
-    - Nimble-Snapshots/Core (= 6.3.0)
-  - Nimble-Snapshots/Core (6.3.0):
-    - FBSnapshotTestCase (~> 2.0)
-    - Nimble (~> 7.0)
+  - iOSSnapshotTestCase (6.0.2):
+    - iOSSnapshotTestCase/SwiftSupport (= 6.0.2)
+  - iOSSnapshotTestCase/Core (6.0.2)
+  - iOSSnapshotTestCase/SwiftSupport (6.0.2):
+    - iOSSnapshotTestCase/Core
+  - iStatusView (0.3.1)
+  - Nimble (8.0.1)
+  - Nimble-Snapshots (7.0.0):
+    - Nimble-Snapshots/Core (= 7.0.0)
+  - Nimble-Snapshots/Core (7.0.0):
+    - iOSSnapshotTestCase (~> 6.0)
+    - Nimble (~> 8.0)
   - Quick (1.2.0)
-  - SnapKit (4.0.0)
+  - SnapKit (4.2.0)
   - SVProgressHUD (2.2.5)
 
 DEPENDENCIES:
   - FBSnapshotTestCase (~> 2.1.4)
   - iStatusView (from `../`)
-  - Nimble (~> 7.0.2)
-  - Nimble-Snapshots (~> 6.3.0)
+  - Nimble (~> 8.0)
+  - Nimble-Snapshots (~> 7.0)
   - Quick (~> 1.2.0)
   - SnapKit
   - SVProgressHUD
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - FBSnapshotTestCase
+    - iOSSnapshotTestCase
+    - Nimble
+    - Nimble-Snapshots
+    - Quick
+    - SnapKit
+    - SVProgressHUD
+
 EXTERNAL SOURCES:
   iStatusView:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
-  iStatusView: d1f42102af994e95695d0898eede58464aa1f1b5
-  Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
-  Nimble-Snapshots: f5459b5b091678dc942d03ec4741cacb58ba4a52
+  iOSSnapshotTestCase: 20083a7be9b8ef742610e16c79f15ad829441f29
+  iStatusView: 4b774171417a9636a8d2e3a0ada6575fec647d59
+  Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
+  Nimble-Snapshots: 2d6d712ceb2d1850d88f850fbd7c732618106022
   Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
-  SnapKit: a42d492c16e80209130a3379f73596c3454b7694
+  SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
 
-PODFILE CHECKSUM: 8bd0d7f41a3de3822c59388a6836b9ce9afa4d73
+PODFILE CHECKSUM: d5321adb1d9cb08c8c51a7a80181f20b1131ee59
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.6.0

Example/iStatusView.xcodeproj/project.pbxproj

@@ -168,7 +168,6 @@
 				607FACCD1AFB9204008FA782 /* Frameworks */,
 				607FACCE1AFB9204008FA782 /* Resources */,
 				B2FAA3C50A53725502D7467F /* [CP] Embed Pods Frameworks */,
-				CF6E7EA8D43993BFF1706CA5 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -188,7 +187,6 @@
 				607FACE21AFB9204008FA782 /* Frameworks */,
 				607FACE31AFB9204008FA782 /* Resources */,
 				0911146313D8719257467FBD /* [CP] Embed Pods Frameworks */,
-				3DF63B6BCBCF20752BE54A6C /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -226,6 +224,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -266,11 +265,12 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-iStatusView_Tests/Pods-iStatusView_Tests-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-iStatusView_Tests/Pods-iStatusView_Tests-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/FBSnapshotTestCase/FBSnapshotTestCase.framework",
 				"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
 				"${BUILT_PRODUCTS_DIR}/Nimble-Snapshots/Nimble_Snapshots.framework",
 				"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
+				"${BUILT_PRODUCTS_DIR}/iOSSnapshotTestCase/FBSnapshotTestCase.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -281,22 +281,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iStatusView_Tests/Pods-iStatusView_Tests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		3DF63B6BCBCF20752BE54A6C /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iStatusView_Tests/Pods-iStatusView_Tests-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iStatusView_Tests/Pods-iStatusView_Tests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		AD5B29C84E061DD12A1D664A /* [CP] Check Pods Manifest.lock */ = {
@@ -323,7 +308,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-iStatusView_Example/Pods-iStatusView_Example-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-iStatusView_Example/Pods-iStatusView_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework",
 				"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
 				"${BUILT_PRODUCTS_DIR}/iStatusView/iStatusView.framework",
@@ -336,22 +321,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iStatusView_Example/Pods-iStatusView_Example-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		CF6E7EA8D43993BFF1706CA5 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iStatusView_Example/Pods-iStatusView_Example-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iStatusView_Example/Pods-iStatusView_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		D825647C03C5D1EA3AED744D /* [CP] Check Pods Manifest.lock */ = {
@@ -529,7 +499,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -545,7 +515,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

Example/iStatusView/AppDelegate.swift

@@ -14,7 +14,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 {
         // Override point for customization after application launch.
         let window = UIWindow.init(frame: UIScreen.main.bounds)
         self.window = window

Example/iStatusView/ViewController.swift

@@ -148,7 +148,7 @@ class ViewController: UIViewController {
         button.setTitleColor(UIColor.black, for: .normal)
         button.layer.cornerRadius = 4.0
         button.layer.borderWidth = 1.0
-        button.contentEdgeInsets = UIEdgeInsetsMake(5, 10, 5, 10)
+        button.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10)
         button.backgroundColor = UIColor.white
         button.addTarget(self, action: #selector(statusViewButtonPressed), for: .touchUpInside)
         self.view.addSubview(button)

iStatusView.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'iStatusView'
-  s.version          = '0.3.0'
+  s.version          = '0.3.1'
   s.summary          = 'iStatusView is a convenient way to show loading and message status in a view.'
 
 # This description is used to generate tags and improve search results.
@@ -31,7 +31,7 @@ When an error has occured, the message can be displayed, and a rety button can b
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
 
   s.ios.deployment_target = '9.3'
-  s.swift_version = '4.1'
+  s.swift_version = '4.2'
 
   s.source_files = 'iStatusView/Classes/**/*'
 

iStatusView/Classes/StatusView.swift

@@ -281,7 +281,7 @@ extension StatusViewError: LocalizedError {
         self.state = state
 
         if !self.isHidden {
-            self.superview?.bringSubview(toFront: self)
+            self.superview?.bringSubviewToFront(self)
         }
 
         var visibleViews = [UIView]()
@@ -379,7 +379,7 @@ extension StatusViewError: LocalizedError {
         }
 
         if initial == false || animate == false {
-            UIView.animate(withDuration: 0.32, delay: 0.0, options:UIViewAnimationOptions.curveEaseOut, animations: {
+            UIView.animate(withDuration: 0.32, delay: 0.0, options:UIView.AnimationOptions.curveEaseOut, animations: {
                 // Don't animate contents if showing/hiding
                 if !wasHidden {
                     self.layoutIfNeeded()