Migrates to Xcode 10 & Swift4.2

freshOS · Sep 19, 2018 · ff256d9 · ff256d9
1 parent e2b091d
commit ff256d9
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 26 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,3 @@
-github "Alamofire/Alamofire" "4.7.1"
-github "freshOS/Arrow" "4.1.0"
-github "freshOS/then" "4.0.0"
+github "Alamofire/Alamofire" "4.7.3"
+github "freshOS/Arrow" "4.2.0"
+github "freshOS/then" "4.2.0"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "Alamofire/Alamofire" "4.7.1"
-github "freshOS/Arrow" "4.1.0"
-github "freshOS/then" "4.0.0"
+github "Alamofire/Alamofire" "4.7.3"
+github "freshOS/Arrow" "4.2.0"
+github "freshOS/then" "4.2.0"
diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire
diff --git a/Carthage/Checkouts/Arrow b/Carthage/Checkouts/Arrow
diff --git a/Carthage/Checkouts/then b/Carthage/Checkouts/then
diff --git a/README.md b/README.md
@@ -420,11 +420,11 @@ use_frameworks!
 ```
 
 ## Swift Version
-Swift 2 -> version [**1.3.0**](https://github.com/freshOS/ws/releases/tag/1.3.0) 
-Swift 3 -> version [**2.0.4**](https://github.com/freshOS/ws/releases/tag/2.0.4)
-Swift 4 -> version [**3.0.0**](https://github.com/freshOS/ws/releases/tag/3.0.0)
-Swift 4.1 -> version [**3.0.0**](https://github.com/freshOS/ws/releases/tag/3.0.0)
-Swift 4.1 -> version [**3.1.0**](https://github.com/freshOS/ws/releases/tag/3.1.0)
+Swift 2 -> version [**1.3.0**](https://github.com/freshOS/ws/releases/tag/1.3.0)  
+Swift 3 -> version [**2.0.4**](https://github.com/freshOS/ws/releases/tag/2.0.4)  
+Swift 4 -> version [**3.0.0**](https://github.com/freshOS/ws/releases/tag/3.0.0)  
+Swift 4.1 -> version  [**3.1.0**](https://github.com/freshOS/ws/releases/tag/3.1.0)  
+Swift 4.2 -> version [**3.2.0**](https://github.com/freshOS/ws/releases/tag/3.2.0)  
 
 ### Backers
 Like the project? Offer coffee or support us with a monthly donation and help us continue our activities :)

diff --git a/ws.framework.zip b/ws.framework.zip
diff --git a/ws.podspec b/ws.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = "ws"
-    s.version          = "3.1.0"
+    s.version          = "3.2.0"
     s.summary          = "Elegant JSON WebService for Swift ☁️"
     s.homepage         = "https://github.com/freshOS/ws"
     s.license          = { :type => "MIT", :file => "LICENSE" }
@@ -10,8 +10,8 @@ Pod::Spec.new do |s|
     s.ios.deployment_target = "9.0"
     s.source_files = "ws/*.{h,m,swift}"
     s.frameworks = "Foundation"
-    s.dependency 'Arrow', '~> 3.0.5'
-    s.dependency 'thenPromise', '~> 4.0.0'
-    s.dependency 'Alamofire', '~> 4.5.1'
+    s.dependency 'Arrow', '~> 4.2.0'
+    s.dependency 'thenPromise', '~> 4.2.0'
+    s.dependency 'Alamofire', '~> 4.7.3'
     s.description  = "Elegant JSON WebService for Swift - Stop writing boilerplate JSON webservice code and focus on your awesome App instead"
 end
diff --git a/ws.xcodeproj/project.pbxproj b/ws.xcodeproj/project.pbxproj
@@ -602,6 +602,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -652,6 +653,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -676,7 +678,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -697,7 +699,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -709,7 +711,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.s4cha.ws.wsTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -722,7 +724,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.s4cha.ws.wsTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/ws/Info.plist b/ws/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.0</string>
+	<string>3.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ws/WSNetworkIndicator.swift b/ws/WSNetworkIndicator.swift
@@ -24,14 +24,14 @@ class WSNetworkIndicator: NSObject {
         runningRequests += 1
         // For some unowned reason using scheduledTimer does not work in this case.
         let timer = Timer(timeInterval: 1, target: self, selector: #selector(tick), userInfo: nil, repeats: false)
-        RunLoop.main.add(timer, forMode: RunLoopMode.commonModes)
+        RunLoop.main.add(timer, forMode: RunLoop.Mode.common)
     }
 
     func stopRequest() {
         runningRequests -= 1
         // For some unowned reason using scheduledTimer does not work in this case.
         let timer = Timer(timeInterval: 0.2, target: self, selector: #selector(tick), userInfo: nil, repeats: false)
-        RunLoop.main.add(timer, forMode: RunLoopMode.commonModes)
+        RunLoop.main.add(timer, forMode: RunLoop.Mode.common)
     }
 
     @objc

diff --git a/wsTests/wsTests.swift b/wsTests/wsTests.swift
@@ -103,7 +103,7 @@ class WSTests: XCTestCase {
 
         let imgPath = Bundle(for: type(of: self)).path(forResource: "1px", ofType: "jpg")
         let img = UIImage(contentsOfFile: imgPath!)
-        let data = UIImageJPEGRepresentation(img!, 1.0)!
+        let data = img!.jpegData(compressionQuality: 1.0)!
 
         wsFileIO.postMultipart("", name: "file", data: data, fileName: "file", mimeType: "image/jpeg").then { _ in
             exp.fulfill()
+1 −1		.swift-version
+ −		Arrow.framework.zip
+1 −1		Arrow.podspec
+9 −9		Arrow.xcodeproj/project.pbxproj
+1 −1		Arrow.xcodeproj/xcshareddata/xcschemes/Arrow.xcscheme
+32 −0		ArrowTests/CustomModelTests.swift
+1 −0		README.md
+1 −1		Source/Info.plist
+11 −6		Source/JSON.swift
+1 −1		.swift-version
+0 −1		Example/testThen/Cartfile
+0 −1		Example/testThen/Cartfile.resolved
+0 −319		Example/testThen/testThen.xcodeproj/project.pbxproj
+0 −7		Example/testThen/testThen.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+0 −20		Example/testThen/testThen/AppDelegate.swift
+0 −38		Example/testThen/testThen/Assets.xcassets/AppIcon.appiconset/Contents.json
+0 −27		Example/testThen/testThen/Base.lproj/LaunchScreen.storyboard
+0 −25		Example/testThen/testThen/Base.lproj/Main.storyboard
+0 −40		Example/testThen/testThen/Info.plist
+0 −37		Example/testThen/testThen/ViewController.swift
+15 −1		README.md
+39 −0		Source/Await+Operators.swift
+1 −1		Source/Await.swift
+1 −1		Source/Info.plist
+7 −5		Source/Promise+Finally.swift
+6 −2		Source/Promise+Helpers.swift
+35 −29		Source/Promise+Then.swift
+167 −106		Source/Promise.swift
+28 −0		Source/PromiseBlocks.swift
+4 −8		Source/VoidPromise.swift
+92 −27		Source/WhenAll.swift
+ −		then.framework.zip
+18 −8		then.xcodeproj/project.pbxproj
+1 −1		thenMacOS/Info.plist
+1 −1		thenPromise.podspec
+151 −0		thenTests/AsyncAwaitTests.swift
+18 −2		thenTests/Helpers.swift
+26 −0		thenTests/MemoryTests.swift
+1 −1		thenTests/ProgressTests.swift
+55 −0		thenTests/WhenAllTests.swift
+1 −1		thenTvOS/Info.plist