diff --git a/Cartfile b/Cartfile index a2a6df3..5f8455f 100644 --- 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 index a2a6df3..5f8455f 100644 --- 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 index 1032399..61a780f 160000 --- a/Carthage/Checkouts/Alamofire +++ b/Carthage/Checkouts/Alamofire @@ -1 +1 @@ -Subproject commit 10323991876208d196c6d1bf91beeb2ec4383b27 +Subproject commit 61a780f3b58ee0d2bb76fdb7b89dbc9751d521d7 diff --git a/Carthage/Checkouts/Arrow b/Carthage/Checkouts/Arrow index 9f9ef35..8aa14d8 160000 --- a/Carthage/Checkouts/Arrow +++ b/Carthage/Checkouts/Arrow @@ -1 +1 @@ -Subproject commit 9f9ef355a1509c0a9effa8b1dbfadb4af2ea865f +Subproject commit 8aa14d8e15ea33b61d7f3f2e939fc89650aafc90 diff --git a/Carthage/Checkouts/then b/Carthage/Checkouts/then index 2ac43cf..7e1cfa4 160000 --- a/Carthage/Checkouts/then +++ b/Carthage/Checkouts/then @@ -1 +1 @@ -Subproject commit 2ac43cf70bdbade06c4b9b092bce85de5eadea0d +Subproject commit 7e1cfa46370f02d8474e8733001161e652744bdb diff --git a/README.md b/README.md index 0bd4680..936ddff 100644 --- 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 index bbf44ae..ac7575b 100644 Binary files a/ws.framework.zip and b/ws.framework.zip differ diff --git a/ws.podspec b/ws.podspec index 4a10555..41bf9e1 100644 --- 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 index 9442fa5..0d15fd5 100644 --- 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 index 543e5f9..340121d 100644 --- a/ws/Info.plist +++ b/ws/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.1.0 + 3.2.0 CFBundleSignature ???? CFBundleVersion diff --git a/ws/WSNetworkIndicator.swift b/ws/WSNetworkIndicator.swift index ea68536..2ee8848 100644 --- 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 index 3d1edaa..8f7eb7e 100644 --- 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()