Builds with Xcode 11 & Swift 5.1

freshOS · Oct 1, 2019 · 4e37d25 · 4e37d25
1 parent 43e73f6
commit 4e37d25
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 34 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,3 @@
-github "Alamofire/Alamofire" "4.8.2"
-github "freshOS/Arrow" "5.0.0"
-github "freshOS/then" "5.0.0"
+github "Alamofire/Alamofire" "4.9.0"
+github "freshOS/Arrow" "5.1.0"
+github "freshOS/then" "5.1.0"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "Alamofire/Alamofire" "4.8.2"
-github "freshOS/Arrow" "5.0.0"
-github "freshOS/then" "5.0.0"
+github "Alamofire/Alamofire" "4.9.0"
+github "freshOS/Arrow" "5.1.0"
+github "freshOS/then" "5.1.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
@@ -426,6 +426,7 @@ 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)  
 Swift 5.0 -> version [**5.0.0**](https://github.com/freshOS/ws/releases/tag/5.0.0)  
+Swift 5.1 -> version [**5.1.0**](https://github.com/freshOS/ws/releases/tag/5.1.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          = "5.0.0"
+    s.version          = "5.1.0"
     s.summary          = "Elegant JSON WebService for Swift ☁️"
     s.homepage         = "https://github.com/freshOS/ws"
     s.license          = { :type => "MIT", :file => "LICENSE" }
@@ -10,9 +10,9 @@ Pod::Spec.new do |s|
     s.ios.deployment_target = "9.0"
     s.source_files = "ws/*.{h,m,swift}"
     s.frameworks = "Foundation"
-    s.dependency 'Arrow', '~> 5.0.0'
-    s.dependency 'thenPromise', '~> 5.0.0'
-    s.dependency 'Alamofire', '~> 4.8.2'
+    s.dependency 'Arrow', '~> 5.1.0'
+    s.dependency 'thenPromise', '~> 5.1.0'
+    s.dependency 'Alamofire', '~> 4.9.0'
     s.description  = "Elegant JSON WebService for Swift - Stop writing boilerplate JSON webservice code and focus on your awesome App instead"
-    s.swift_versions = ['2', '3', '4', '4.1', '4.2', '5.0']
+    s.swift_versions = ['2', '3', '4', '4.1', '4.2', '5.0', '5.1']
 end
diff --git a/ws.xcodeproj/project.pbxproj b/ws.xcodeproj/project.pbxproj
@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		503461BF1DCE0F12002144C3 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5034619C1DCE0ED4002144C3 /* Alamofire.framework */; };
 		503461C01DCE0F16002144C3 /* Arrow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 503461AF1DCE0EDC002144C3 /* Arrow.framework */; };
-		503461C11DCE0F1E002144C3 /* then.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 503461B91DCE0EE2002144C3 /* then.framework */; };
+		503461C11DCE0F1E002144C3 /* Then.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 503461B91DCE0EE2002144C3 /* Then.framework */; };
 		50E9DBA21DCCB2F800E8A896 /* mappingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E9DBA11DCCB2F800E8A896 /* mappingTests.swift */; };
 		9924FCE51DD76B4100FFBB26 /* WSNetworkIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9924FCE41DD76B4100FFBB26 /* WSNetworkIndicator.swift */; };
 		9940F4221DD8A3CB00A02425 /* WSLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9940F4211DD8A3CB00A02425 /* WSLogger.swift */; };
@@ -172,7 +172,7 @@
 			files = (
 				503461BF1DCE0F12002144C3 /* Alamofire.framework in Frameworks */,
 				503461C01DCE0F16002144C3 /* Arrow.framework in Frameworks */,
-				503461C11DCE0F1E002144C3 /* then.framework in Frameworks */,
+				503461C11DCE0F1E002144C3 /* Then.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -213,10 +213,10 @@
 		503461B31DCE0EE2002144C3 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				503461B91DCE0EE2002144C3 /* then.framework */,
-				503461BB1DCE0EE2002144C3 /* thenTests.xctest */,
-				503461BD1DCE0EE2002144C3 /* then.framework */,
-				999728101F78F5E700CB220F /* then.framework */,
+				503461B91DCE0EE2002144C3 /* Then.framework */,
+				503461BB1DCE0EE2002144C3 /* ThenTests.xctest */,
+				503461BD1DCE0EE2002144C3 /* Then.framework */,
+				999728101F78F5E700CB220F /* Then.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -457,31 +457,31 @@
 			remoteRef = 503461B01DCE0EDC002144C3 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		503461B91DCE0EE2002144C3 /* then.framework */ = {
+		503461B91DCE0EE2002144C3 /* Then.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
-			path = then.framework;
+			path = Then.framework;
 			remoteRef = 503461B81DCE0EE2002144C3 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		503461BB1DCE0EE2002144C3 /* thenTests.xctest */ = {
+		503461BB1DCE0EE2002144C3 /* ThenTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = thenTests.xctest;
+			path = ThenTests.xctest;
 			remoteRef = 503461BA1DCE0EE2002144C3 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		503461BD1DCE0EE2002144C3 /* then.framework */ = {
+		503461BD1DCE0EE2002144C3 /* Then.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
-			path = then.framework;
+			path = Then.framework;
 			remoteRef = 503461BC1DCE0EE2002144C3 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		999728101F78F5E700CB220F /* then.framework */ = {
+		999728101F78F5E700CB220F /* Then.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
-			path = then.framework;
+			path = Then.framework;
 			remoteRef = 9997280F1F78F5E700CB220F /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -677,6 +677,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 5.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.freshOS.ws;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -698,6 +699,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 5.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.freshOS.ws;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

diff --git a/ws/Info.plist b/ws/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ws/WS+TypedCalls.swift b/ws/WS+TypedCalls.swift
@@ -8,7 +8,7 @@
 
 import Arrow
 import Foundation
-import then
+import Then
 
 extension WS {
 

diff --git a/ws/WS.swift b/ws/WS.swift
@@ -9,7 +9,7 @@
 import Alamofire
 import Arrow
 import Foundation
-import then
+import Then
 
 open class WS {
 

diff --git a/ws/WSRequest.swift b/ws/WSRequest.swift
@@ -9,7 +9,7 @@
 import Alamofire
 import Arrow
 import Foundation
-import then
+import Then
 
 open class WSRequest {
 

diff --git a/wsTests/mappingTests.swift b/wsTests/mappingTests.swift
@@ -7,7 +7,7 @@
 //
 
 import Arrow
-import then
+import Then
 @testable import ws
 import XCTest
 

diff --git a/wsTests/wsTests.swift b/wsTests/wsTests.swift
@@ -8,7 +8,7 @@
 
 import Alamofire
 import Arrow
-import then
+import Then
 @testable import ws
 import XCTest
+1 −0		.travis.yml
+2 −1		Alamofire.podspec
+7 −10		Alamofire.xcodeproj/project.pbxproj
+22 −4		CHANGELOG.md
+1 −1		Documentation/AdvancedUsage.md
+2 −1		Example/iOS Example.xcodeproj/project.pbxproj
+10 −7		Example/iOS Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme
+22 −22		Gemfile.lock
+2 −2		Package.swift
+41 −0		[email protected]
+4 −5		README.md
+1 −1		Source/Info-tvOS.plist
+1 −1		Source/Info.plist
+3 −0		Source/NetworkReachabilityManager.swift
+13 −2		Source/Request.swift
+8 −2		Source/Validation.swift
+1 −1		Tests/BaseTestCase.swift
+34 −0		Tests/DownloadTests.swift
+26 −0		Tests/NetworkReachabilityManagerTests.swift
+1 −1		Tests/SessionManagerTests.swift
+4 −0		.github/FUNDING.yml
+0 −1		.swift-version
+ −		Arrow.framework.zip
+2 −1		Arrow.podspec
+2 −0		Arrow.xcodeproj/project.pbxproj
+1 −0		README.md
+1 −1		Source/Info.plist
+4 −0		.github/FUNDING.yml
+27 −1		Package.swift
+12 −3		README.md
+1 −1		Source/Info.plist
+59 −53		Then.xcodeproj/project.pbxproj
+1 −1		Then.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+0 −0		Then.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+0 −0		Then.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+17 −21		Then.xcodeproj/xcshareddata/xcschemes/then.xcscheme
+3 −7		Then.xcodeproj/xcshareddata/xcschemes/thenMacOS.xcscheme
+3 −7		Then.xcodeproj/xcshareddata/xcschemes/thenTvOS.xcscheme
+1 −1		ThenMacOS/Info.plist
+0 −0		ThenMacOS/thenMacOS.h
+1 −1		ThenTests/AsyncAwaitTests.swift
+1 −1		ThenTests/BridgeErrorTests.swift
+1 −1		ThenTests/ChainTests.swift
+1 −1		ThenTests/DelayTests.swift
+1 −1		ThenTests/FinallyTests.swift
+1 −1		ThenTests/Helpers.swift
+0 −0		ThenTests/Info.plist
+1 −1		ThenTests/MemoryTests.swift
+1 −1		ThenTests/NoMatterWhatTests.swift
+1 −1		ThenTests/OnErrorTests.swift
+1 −1		ThenTests/ProgressTests.swift
+1 −1		ThenTests/RaceTests.swift
+1 −1		ThenTests/RecoverTests.swift
+1 −1		ThenTests/RegisterThenTests.swift
+1 −1		ThenTests/RetryTests.swift
+1 −1		ThenTests/ThenTests.swift
+1 −1		ThenTests/TimeoutTests.swift
+1 −1		ThenTests/UnwrapTests.swift
+1 −1		ThenTests/ValidateTests.swift
+1 −1		ThenTests/WhenAllTests.swift
+1 −1		ThenTests/ZipTests.swift
+1 −1		ThenTvOS/Info.plist
+0 −0		ThenTvOS/thenTvOS.h
+ −		then.framework.zip
+2 −2		thenPromise.podspec