Updated project to Alamofire 5 and Swift 5 only (#48)

* Updated Alamofire submodule to AF5b4 through Cartfile and podspec

* Updated project to compile against Swift 5 only

Author: cnoon

.swift-version

@@ -11,7 +11,9 @@ Pod::Spec.new do |s|
   s.source = { :git => 'https://github.com/Alamofire/AlamofireNetworkActivityIndicator.git', :tag => s.version }
   s.source_files = 'Source/*.swift'
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '10.0'
 
-  s.dependency 'Alamofire', '~> 4.8'
+  s.swift_version = '5.0'
+
+  s.dependency 'Alamofire', '~> 5.0.0-beta.4'
 end

AlamofireNetworkActivityIndicator.podspec

@@ -299,6 +299,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 4CB9282F1C66E1A600CE5F08;
@@ -501,19 +502,19 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
@@ -560,19 +561,19 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};

AlamofireNetworkActivityIndicator.xcodeproj/project.pbxproj

@@ -1 +1 @@
-github "Alamofire/Alamofire" ~> 4.8
+github "Alamofire/Alamofire" ~> 5.0.0-beta.4

Cartfile

@@ -1 +1 @@
-github "Alamofire/Alamofire" "4.8.2"
+github "Alamofire/Alamofire" "5.0.0-beta.4"

Cartfile.resolved

@@ -178,21 +178,21 @@ public class NetworkActivityIndicatorManager {
         notificationCenter.addObserver(
             self,
             selector: #selector(NetworkActivityIndicatorManager.networkRequestDidStart),
-            name: Notification.Name.Task.DidResume,
+            name: Request.didResume,
             object: nil
         )
 
         notificationCenter.addObserver(
             self,
             selector: #selector(NetworkActivityIndicatorManager.networkRequestDidComplete),
-            name: Notification.Name.Task.DidSuspend,
+            name: Request.didSuspend,
             object: nil
         )
 
         notificationCenter.addObserver(
             self,
             selector: #selector(NetworkActivityIndicatorManager.networkRequestDidComplete),
-            name: Notification.Name.Task.DidComplete,
+            name: Request.didFinish,
             object: nil
         )
     }
@@ -223,13 +223,8 @@ public class NetworkActivityIndicatorManager {
         )
 
         DispatchQueue.main.async {
-            #if swift(>=4.2)
             RunLoop.main.add(timer, forMode: .common)
             RunLoop.main.add(timer, forMode: .tracking)
-            #else
-            RunLoop.main.add(timer, forMode: .commonModes)
-            RunLoop.main.add(timer, forMode: .UITrackingRunLoopMode)
-            #endif
         }
 
         startDelayTimer = timer
@@ -245,13 +240,8 @@ public class NetworkActivityIndicatorManager {
         )
 
         DispatchQueue.main.async {
-            #if swift(>=4.2)
             RunLoop.main.add(timer, forMode: .common)
             RunLoop.main.add(timer, forMode: .tracking)
-            #else
-            RunLoop.main.add(timer, forMode: .commonModes)
-            RunLoop.main.add(timer, forMode: .UITrackingRunLoopMode)
-            #endif
         }
 
         completionDelayTimer = timer

Carthage/Checkouts/Alamofire

@@ -231,7 +231,7 @@ class NetworkActivityIndicatorManagerTestCase: XCTestCase {
         }
 
         // When
-        let _ = Alamofire.request("https://httpbin.org/delay/1")
+        let _ = AF.request("https://httpbin.org/delay/1")
         waitForExpectations(timeout: timeout, handler: nil)
 
         // Then
@@ -259,7 +259,7 @@ class NetworkActivityIndicatorManagerTestCase: XCTestCase {
         }
 
         // When
-        let _ = Alamofire.request("https://httpbin.org/status/404")
+        let _ = AF.request("https://httpbin.org/status/404")
         waitForExpectations(timeout: timeout, handler: nil)
 
         // Then
@@ -287,7 +287,7 @@ class NetworkActivityIndicatorManagerTestCase: XCTestCase {
         }
 
         // When
-        let _ = Alamofire.request("https://httpbin.org/delay/1")
+        let _ = AF.request("https://httpbin.org/delay/1")
         waitForExpectations(timeout: timeout, handler: nil)
 
         // Then
@@ -315,9 +315,9 @@ class NetworkActivityIndicatorManagerTestCase: XCTestCase {
         }
 
         // When
-        let _ = Alamofire.request("https://httpbin.org/delay/1")
-        let _ = Alamofire.request("https://httpbin.org/delay/1")
-        let _ = Alamofire.request("https://httpbin.org/delay/1")
+        let _ = AF.request("https://httpbin.org/delay/1")
+        let _ = AF.request("https://httpbin.org/delay/1")
+        let _ = AF.request("https://httpbin.org/delay/1")
 
         waitForExpectations(timeout: timeout, handler: nil)