Merge pull request #5 from PH9/fix-xcode-10

Update dependencies to avoid conflict with xcode10
amitshekhariitbhu · Dec 27, 2018 · 5dde177 · 5dde177
2 parents 48f1400 + 425ad79
commit 5dde177
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/Podfile b/Podfile
@@ -6,8 +6,8 @@ target 'iOS-Viper-Architecture' do
   use_frameworks!
 
   # Pods for iOS-Viper-Architecture
-  pod 'Alamofire', '~> 4.5.0'
-  pod 'AlamofireObjectMapper', '~> 5.0'
+  pod 'Alamofire', '~> 4.7.3'
+  pod 'AlamofireObjectMapper', '~> 5.2'
   pod 'AlamofireImage', '~> 3.3'
   pod 'PKHUD', '~> 5.0'
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,26 +1,34 @@
 PODS:
-  - Alamofire (4.5.1)
+  - Alamofire (4.7.3)
   - AlamofireImage (3.3.0):
     - Alamofire (~> 4.5)
-  - AlamofireObjectMapper (5.0.0):
-    - Alamofire (~> 4.1)
-    - ObjectMapper (~> 3.0)
-  - ObjectMapper (3.0.0)
+  - AlamofireObjectMapper (5.2.0):
+    - Alamofire (~> 4.7)
+    - ObjectMapper (~> 3.4)
+  - ObjectMapper (3.4.2)
   - PKHUD (5.0.0)
 
 DEPENDENCIES:
-  - Alamofire (~> 4.5.0)
+  - Alamofire (~> 4.7.3)
   - AlamofireImage (~> 3.3)
-  - AlamofireObjectMapper (~> 5.0)
+  - AlamofireObjectMapper (~> 5.2)
   - PKHUD (~> 5.0)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+    - AlamofireImage
+    - AlamofireObjectMapper
+    - ObjectMapper
+    - PKHUD
+
 SPEC CHECKSUMS:
-  Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a
+  Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
   AlamofireImage: 2e784dc5d00f04903a52c1d169181469c805c3df
-  AlamofireObjectMapper: 5fafc816351cbbc0d486611aaeba7461c0cbad49
-  ObjectMapper: 92230db59bf8f341a5c3a3cf0b9fbdde3cf0d87f
+  AlamofireObjectMapper: 92b6ce2423a9d159e686f6a1d514a009bf903ddc
+  ObjectMapper: 0d4402610f4e468903ae64629eec4784531e5c51
   PKHUD: 3c001512c6e002091184197a8de7a20420786e3b
 
-PODFILE CHECKSUM: c4f9e4a345c63ffd205b0b5e4698d03b6fb1bf15
+PODFILE CHECKSUM: d8ca416b2b4ba87ae02b7128a92bd41c83961bfa
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3
diff --git a/iOS-Viper-Architecture.xcodeproj/project.pbxproj b/iOS-Viper-Architecture.xcodeproj/project.pbxproj
@@ -285,7 +285,6 @@
 				1501C1F61E588B550013EA25 /* Frameworks */,
 				1501C1F71E588B550013EA25 /* Resources */,
 				4590E199A6FCAA9C47BEC660 /* [CP] Embed Pods Frameworks */,
-				D0D24D5A2F0B5DEAC785DB63 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -389,21 +388,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D0D24D5A2F0B5DEAC785DB63 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS-Viper-Architecture/Pods-iOS-Viper-Architecture-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

diff --git a/iOS-Viper-Architecture.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/iOS-Viper-Architecture.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>