Merge pull request #2 from gligorkot/swift-5

updating Moya to 13.x.x and Swift 5 migration
gligorkot · Apr 29, 2019 · 1a4b1d6 · 1a4b1d6
2 parents 1ed7013 + 0000604
commit 1a4b1d6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/Classes/Core/Networking.swift b/Classes/Core/Networking.swift
@@ -16,7 +16,7 @@ public struct Networking<API: TargetType & APIType>: NetworkingProtocol {
 // MARK: - static methods
 public extension Networking {
 
-    public static func newNetworking() -> Networking {
+    static func newNetworking() -> Networking {
         return Networking(provider: newProvider(plugins))
     }
 

diff --git a/GKNetworkingKit.podspec b/GKNetworkingKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name                  = 'GKNetworkingKit'
-  s.version               = '1.2.0'
+  s.version               = '1.3.0'
   s.summary               = 'GKNetworkingKit framework.'
   s.description           = <<-DESC
                             * GKNetworkingKit framework
@@ -15,9 +15,9 @@ Pod::Spec.new do |s|
   s.source                = { :git => 'https://github.com/gligorkot/GKNetworkingKit.git', :tag => s.version.to_s }
 
   s.source_files          = 'Classes/**', 'Classes/**/*.{swift}'
-  s.pod_target_xcconfig   = { 'SWIFT_VERSION' => '4.2' }
+  s.pod_target_xcconfig   = { 'SWIFT_VERSION' => '5.0' }
 
-  s.dependency 'Moya', '~> 12.0.x'
+  s.dependency 'Moya', '~> 13.0.x'
   s.dependency 'GKBaseKit', '~> 1.0.x'
   s.requires_arc          = true
 

diff --git a/GKNetworkingKitExample/GKNetworkingKitExample.xcodeproj/project.pbxproj b/GKNetworkingKitExample/GKNetworkingKitExample.xcodeproj/project.pbxproj
@@ -182,11 +182,12 @@
 				TargetAttributes = {
 					86AB98B82060A5E7000E558F = {
 						CreatedOnToolsVersion = 9.2;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					86AB98EB2060A714000E558F = {
 						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 86AB98B82060A5E7000E558F;
 					};
@@ -262,7 +263,7 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-GKNetworkingKitExample/Pods-GKNetworkingKitExample-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-GKNetworkingKitExample/Pods-GKNetworkingKitExample-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
 				"${BUILT_PRODUCTS_DIR}/GKBaseKit/GKBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/GKNetworkingKit/GKNetworkingKit.framework",
@@ -281,7 +282,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GKNetworkingKitExample/Pods-GKNetworkingKitExample-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GKNetworkingKitExample/Pods-GKNetworkingKitExample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		936411375A4346C6CAE9884D /* [CP] Check Pods Manifest.lock */ = {
@@ -314,7 +315,7 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-GKNetworkingKitExample-GKNetworkingKitTests/Pods-GKNetworkingKitExample-GKNetworkingKitTests-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-GKNetworkingKitExample-GKNetworkingKitTests/Pods-GKNetworkingKitExample-GKNetworkingKitTests-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
 				"${BUILT_PRODUCTS_DIR}/GKBaseKit/GKBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/GKNetworkingKit/GKNetworkingKit.framework",
@@ -335,7 +336,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GKNetworkingKitExample-GKNetworkingKitTests/Pods-GKNetworkingKitExample-GKNetworkingKitTests-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GKNetworkingKitExample-GKNetworkingKitTests/Pods-GKNetworkingKitExample-GKNetworkingKitTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -510,7 +511,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = nz.co.gligor.GKNetworkingKitExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -526,7 +527,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = nz.co.gligor.GKNetworkingKitExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -540,7 +541,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = nz.co.gligor.NetworkingKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GKNetworkingKitExample.app/GKNetworkingKitExample";
 			};
@@ -555,7 +556,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = nz.co.gligor.NetworkingKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GKNetworkingKitExample.app/GKNetworkingKitExample";
 			};

diff --git a/...e/GKNetworkingKitExample.xcodeproj/xcshareddata/xcschemes/GKNetworkingKitExample.xcscheme b/...e/GKNetworkingKitExample.xcodeproj/xcshareddata/xcschemes/GKNetworkingKitExample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...ple/GKNetworkingKitExample.xcodeproj/xcshareddata/xcschemes/GKNetworkingKitTests.xcscheme b/...ple/GKNetworkingKitExample.xcodeproj/xcshareddata/xcschemes/GKNetworkingKitTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"