From 23256f947bf52da22dedbc6e871a00385e77d49b Mon Sep 17 00:00:00 2001 From: Constantin Lungu Date: Tue, 31 May 2016 12:40:30 +0300 Subject: [PATCH 1/2] Update Podfile to use cocoapods 1.0.0 --- Podfile | 4 +- Podfile.lock | 4 +- Salt Edge API Demo.xcodeproj/project.pbxproj | 48 ++++++++++---------- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/Podfile b/Podfile index 317ff10..f2e2a74 100644 --- a/Podfile +++ b/Podfile @@ -2,4 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '7.0' -pod 'SVProgressHUD' +target 'Salt Edge API Demo' do + pod 'SVProgressHUD' +end diff --git a/Podfile.lock b/Podfile.lock index 7c249c6..f68b9af 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -7,4 +7,6 @@ DEPENDENCIES: SPEC CHECKSUMS: SVProgressHUD: 748080e4f36e603f6c02aec292664239df5279c1 -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: f958ec08366a46f0b258d77891b111cbc2e8ae68 + +COCOAPODS: 1.0.0 diff --git a/Salt Edge API Demo.xcodeproj/project.pbxproj b/Salt Edge API Demo.xcodeproj/project.pbxproj index d75fd9b..700d133 100644 --- a/Salt Edge API Demo.xcodeproj/project.pbxproj +++ b/Salt Edge API Demo.xcodeproj/project.pbxproj @@ -62,8 +62,8 @@ 0AF898841986633E00F1A270 /* ConnectWebViewVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AF898831986633E00F1A270 /* ConnectWebViewVC.m */; }; 0AF898901986740200F1A270 /* TabBarVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AF8988F1986740200F1A270 /* TabBarVC.m */; }; 0AF898931986748C00F1A270 /* circle@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0AF898921986748C00F1A270 /* circle@2x.png */; }; + 57D00B115BB5E3AFA55044AD /* libPods-Salt Edge API Demo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9153D232815ABE07B2230E82 /* libPods-Salt Edge API Demo.a */; }; 5897167D19E6ACB3001E2AA9 /* SERequestHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5897167C19E6ACB3001E2AA9 /* SERequestHandler.m */; }; - B275BB778B184F04BB4FB069 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA121862E2A4454C95F78533 /* libPods.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -77,6 +77,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 0320F19E9683880BC75AE74C /* Pods-Salt Edge API Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Salt Edge API Demo.release.xcconfig"; path = "Pods/Target Support Files/Pods-Salt Edge API Demo/Pods-Salt Edge API Demo.release.xcconfig"; sourceTree = ""; }; 0A1BEB7419EBD0E5000C0D64 /* PickerTVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PickerTVC.h; sourceTree = ""; }; 0A1BEB7519EBD0E5000C0D64 /* PickerTVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PickerTVC.m; sourceTree = ""; }; 0A1DC3C51C62263D00001CD1 /* SELoginAttempt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SELoginAttempt.h; sourceTree = ""; }; @@ -174,11 +175,10 @@ 0AF8988E1986740200F1A270 /* TabBarVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TabBarVC.h; sourceTree = ""; }; 0AF8988F1986740200F1A270 /* TabBarVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TabBarVC.m; sourceTree = ""; }; 0AF898921986748C00F1A270 /* circle@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "circle@2x.png"; sourceTree = ""; }; - 2C0784B772D58925FF30C31D /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; 5897167B19E6ACB3001E2AA9 /* SERequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SERequestHandler.h; sourceTree = ""; }; 5897167C19E6ACB3001E2AA9 /* SERequestHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SERequestHandler.m; sourceTree = ""; }; - AF22E7D9C5005FC665DAEF23 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; - FA121862E2A4454C95F78533 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 883CD7F0496123DB214D94AE /* Pods-Salt Edge API Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Salt Edge API Demo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Salt Edge API Demo/Pods-Salt Edge API Demo.debug.xcconfig"; sourceTree = ""; }; + 9153D232815ABE07B2230E82 /* libPods-Salt Edge API Demo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Salt Edge API Demo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -189,7 +189,7 @@ 0AAB6CE719827AAA009DCDD5 /* CoreGraphics.framework in Frameworks */, 0AAB6CE919827AAA009DCDD5 /* UIKit.framework in Frameworks */, 0AAB6CE519827AAA009DCDD5 /* Foundation.framework in Frameworks */, - B275BB778B184F04BB4FB069 /* libPods.a in Frameworks */, + 57D00B115BB5E3AFA55044AD /* libPods-Salt Edge API Demo.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -317,7 +317,7 @@ 0AAB6D0919827AAA009DCDD5 /* Salt Edge API DemoTests */, 0AAB6CE319827AAA009DCDD5 /* Frameworks */, 0AAB6CE219827AAA009DCDD5 /* Products */, - 7267ADA62BAF7A4997D6B3CD /* Pods */, + 79E64BFE5E90D9CACB881130 /* Pods */, ); sourceTree = ""; }; @@ -337,7 +337,7 @@ 0AAB6CE619827AAA009DCDD5 /* CoreGraphics.framework */, 0AAB6CE819827AAA009DCDD5 /* UIKit.framework */, 0AAB6D0319827AAA009DCDD5 /* XCTest.framework */, - FA121862E2A4454C95F78533 /* libPods.a */, + 9153D232815ABE07B2230E82 /* libPods-Salt Edge API Demo.a */, ); name = Frameworks; sourceTree = ""; @@ -473,11 +473,11 @@ path = Assets; sourceTree = ""; }; - 7267ADA62BAF7A4997D6B3CD /* Pods */ = { + 79E64BFE5E90D9CACB881130 /* Pods */ = { isa = PBXGroup; children = ( - 2C0784B772D58925FF30C31D /* Pods.debug.xcconfig */, - AF22E7D9C5005FC665DAEF23 /* Pods.release.xcconfig */, + 883CD7F0496123DB214D94AE /* Pods-Salt Edge API Demo.debug.xcconfig */, + 0320F19E9683880BC75AE74C /* Pods-Salt Edge API Demo.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -489,12 +489,12 @@ isa = PBXNativeTarget; buildConfigurationList = 0AAB6D1319827AAB009DCDD5 /* Build configuration list for PBXNativeTarget "Salt Edge API Demo" */; buildPhases = ( - 4A0A744088A14DD0B0105B17 /* Check Pods Manifest.lock */, + 12C98EA7F6E111C58281D643 /* 📦 Check Pods Manifest.lock */, 0AAB6CDD19827AAA009DCDD5 /* Sources */, 0AAB6CDE19827AAA009DCDD5 /* Frameworks */, 0AAB6CDF19827AAA009DCDD5 /* Resources */, - B8C0E2A55FBA411BBC9D1257 /* Copy Pods Resources */, - B30C236A00758D4D50D5DAFF /* Embed Pods Frameworks */, + 6A717EB141BBB3ADDEB756EE /* 📦 Embed Pods Frameworks */, + 2E7EEC1C28E78948889BC5F4 /* 📦 Copy Pods Resources */, ); buildRules = ( ); @@ -581,14 +581,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 4A0A744088A14DD0B0105B17 /* Check Pods Manifest.lock */ = { + 12C98EA7F6E111C58281D643 /* 📦 Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "📦 Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -596,34 +596,34 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - B30C236A00758D4D50D5DAFF /* Embed Pods Frameworks */ = { + 2E7EEC1C28E78948889BC5F4 /* 📦 Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "📦 Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Salt Edge API Demo/Pods-Salt Edge API Demo-resources.sh\"\n"; showEnvVarsInLog = 0; }; - B8C0E2A55FBA411BBC9D1257 /* Copy Pods Resources */ = { + 6A717EB141BBB3ADDEB756EE /* 📦 Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "📦 Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Salt Edge API Demo/Pods-Salt Edge API Demo-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -790,7 +790,7 @@ }; 0AAB6D1419827AAB009DCDD5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2C0784B772D58925FF30C31D /* Pods.debug.xcconfig */; + baseConfigurationReference = 883CD7F0496123DB214D94AE /* Pods-Salt Edge API Demo.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -803,13 +803,14 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.saltedge.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + VALID_ARCHS = "arm64 armv7 armv7s i386"; WRAPPER_EXTENSION = app; }; name = Debug; }; 0AAB6D1519827AAB009DCDD5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AF22E7D9C5005FC665DAEF23 /* Pods.release.xcconfig */; + baseConfigurationReference = 0320F19E9683880BC75AE74C /* Pods-Salt Edge API Demo.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -821,6 +822,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.saltedge.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + VALID_ARCHS = "arm64 armv7 armv7s i386"; WRAPPER_EXTENSION = app; }; name = Release; From f4706160478b0388da24e8467da260e635ea924c Mon Sep 17 00:00:00 2001 From: Constantin Lungu Date: Tue, 31 May 2016 12:41:29 +0300 Subject: [PATCH 2/2] Setting window's rootViewController after a failed client request as well --- Salt Edge API Demo/AppDelegate.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Salt Edge API Demo/AppDelegate.m b/Salt Edge API Demo/AppDelegate.m index 04c8e7c..04dbe2a 100644 --- a/Salt Edge API Demo/AppDelegate.m +++ b/Salt Edge API Demo/AppDelegate.m @@ -68,6 +68,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( [SEAPIRequestManager linkCustomerSecret:customerSecret]; setWindowRootViewController(); } failure:^(SEError* error) { + setWindowRootViewController(); + [SVProgressHUD show]; [SVProgressHUD showErrorWithStatus:error.errorMessage]; }]; } else {