Skip to content

Commit db70785

Browse files
author
elenipapanik
committed
Update Swift version of example project.
1 parent e06b92b commit db70785

39 files changed

+1195
-2415
lines changed

‎Example/ErrorHandler.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@
211211
607FACCD1AFB9204008FA782 /* Frameworks */,
212212
607FACCE1AFB9204008FA782 /* Resources */,
213213
2E6C9CF26E4D8744A69E90A0 /* [CP] Embed Pods Frameworks */,
214-
96DA4DE67D2EE397A96C3A22 /* [CP] Copy Pods Resources */,
215214
);
216215
buildRules = (
217216
);
@@ -230,8 +229,6 @@
230229
607FACE11AFB9204008FA782 /* Sources */,
231230
607FACE21AFB9204008FA782 /* Frameworks */,
232231
607FACE31AFB9204008FA782 /* Resources */,
233-
13F9B63393EDD8552051A38E /* [CP] Embed Pods Frameworks */,
234-
6C80FB0CAC7D3385516277C8 /* [CP] Copy Pods Resources */,
235232
);
236233
buildRules = (
237234
);
@@ -269,6 +266,7 @@
269266
developmentRegion = English;
270267
hasScannedForEncodings = 0;
271268
knownRegions = (
269+
English,
272270
en,
273271
Base,
274272
);
@@ -304,28 +302,13 @@
304302
/* End PBXResourcesBuildPhase section */
305303

306304
/* Begin PBXShellScriptBuildPhase section */
307-
13F9B63393EDD8552051A38E /* [CP] Embed Pods Frameworks */ = {
308-
isa = PBXShellScriptBuildPhase;
309-
buildActionMask = 2147483647;
310-
files = (
311-
);
312-
inputPaths = (
313-
);
314-
name = "[CP] Embed Pods Frameworks";
315-
outputPaths = (
316-
);
317-
runOnlyForDeploymentPostprocessing = 0;
318-
shellPath = /bin/sh;
319-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ErrorHandler_Tests/Pods-ErrorHandler_Tests-frameworks.sh\"\n";
320-
showEnvVarsInLog = 0;
321-
};
322305
2E6C9CF26E4D8744A69E90A0 /* [CP] Embed Pods Frameworks */ = {
323306
isa = PBXShellScriptBuildPhase;
324307
buildActionMask = 2147483647;
325308
files = (
326309
);
327310
inputPaths = (
328-
"${SRCROOT}/Pods/Target Support Files/Pods-ErrorHandler_Example/Pods-ErrorHandler_Example-frameworks.sh",
311+
"${PODS_ROOT}/Target Support Files/Pods-ErrorHandler_Example/Pods-ErrorHandler_Example-frameworks.sh",
329312
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
330313
"${BUILT_PRODUCTS_DIR}/ErrorHandler/ErrorHandler.framework",
331314
);
@@ -336,7 +319,7 @@
336319
);
337320
runOnlyForDeploymentPostprocessing = 0;
338321
shellPath = /bin/sh;
339-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ErrorHandler_Example/Pods-ErrorHandler_Example-frameworks.sh\"\n";
322+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ErrorHandler_Example/Pods-ErrorHandler_Example-frameworks.sh\"\n";
340323
showEnvVarsInLog = 0;
341324
};
342325
607AD330DB2AEF6F4F0E962D /* [CP] Check Pods Manifest.lock */ = {
@@ -357,21 +340,6 @@
357340
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";
358341
showEnvVarsInLog = 0;
359342
};
360-
6C80FB0CAC7D3385516277C8 /* [CP] Copy Pods Resources */ = {
361-
isa = PBXShellScriptBuildPhase;
362-
buildActionMask = 2147483647;
363-
files = (
364-
);
365-
inputPaths = (
366-
);
367-
name = "[CP] Copy Pods Resources";
368-
outputPaths = (
369-
);
370-
runOnlyForDeploymentPostprocessing = 0;
371-
shellPath = /bin/sh;
372-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ErrorHandler_Tests/Pods-ErrorHandler_Tests-resources.sh\"\n";
373-
showEnvVarsInLog = 0;
374-
};
375343
8A50FDA83029BB1AE32A286E /* [CP] Check Pods Manifest.lock */ = {
376344
isa = PBXShellScriptBuildPhase;
377345
buildActionMask = 2147483647;
@@ -390,21 +358,6 @@
390358
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";
391359
showEnvVarsInLog = 0;
392360
};
393-
96DA4DE67D2EE397A96C3A22 /* [CP] Copy Pods Resources */ = {
394-
isa = PBXShellScriptBuildPhase;
395-
buildActionMask = 2147483647;
396-
files = (
397-
);
398-
inputPaths = (
399-
);
400-
name = "[CP] Copy Pods Resources";
401-
outputPaths = (
402-
);
403-
runOnlyForDeploymentPostprocessing = 0;
404-
shellPath = /bin/sh;
405-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ErrorHandler_Example/Pods-ErrorHandler_Example-resources.sh\"\n";
406-
showEnvVarsInLog = 0;
407-
};
408361
/* End PBXShellScriptBuildPhase section */
409362

410363
/* Begin PBXSourcesBuildPhase section */
@@ -507,6 +460,7 @@
507460
ONLY_ACTIVE_ARCH = YES;
508461
SDKROOT = iphoneos;
509462
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
463+
SWIFT_VERSION = 5.0;
510464
};
511465
name = Debug;
512466
};
@@ -546,6 +500,7 @@
546500
MTL_ENABLE_DEBUG_INFO = NO;
547501
SDKROOT = iphoneos;
548502
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
503+
SWIFT_VERSION = 5.0;
549504
VALIDATE_PRODUCT = YES;
550505
};
551506
name = Release;
@@ -560,7 +515,6 @@
560515
MODULE_NAME = ExampleApp;
561516
PRODUCT_BUNDLE_IDENTIFIER = "com.workable.demo.ErrorHandler-Example";
562517
PRODUCT_NAME = "$(TARGET_NAME)";
563-
SWIFT_VERSION = 3.0;
564518
};
565519
name = Debug;
566520
};
@@ -574,7 +528,6 @@
574528
MODULE_NAME = ExampleApp;
575529
PRODUCT_BUNDLE_IDENTIFIER = "com.workable.demo.ErrorHandler-Example";
576530
PRODUCT_NAME = "$(TARGET_NAME)";
577-
SWIFT_VERSION = 3.0;
578531
};
579532
name = Release;
580533
};
@@ -594,7 +547,6 @@
594547
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
595548
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
596549
PRODUCT_NAME = "$(TARGET_NAME)";
597-
SWIFT_VERSION = 3.0;
598550
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ErrorHandler_Example.app/ErrorHandler_Example";
599551
};
600552
name = Debug;
@@ -611,7 +563,6 @@
611563
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
612564
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
613565
PRODUCT_NAME = "$(TARGET_NAME)";
614-
SWIFT_VERSION = 3.0;
615566
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ErrorHandler_Example.app/ErrorHandler_Example";
616567
};
617568
name = Release;

‎Example/ErrorHandler.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Example/ErrorHandler/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
17+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}

‎Example/Podfile.lock‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
PODS:
2-
- Alamofire (4.5.0)
3-
- ErrorHandler (0.8.0):
4-
- ErrorHandler/Core (= 0.8.0)
5-
- ErrorHandler/Alamofire (0.8.0):
2+
- Alamofire (4.9.1)
3+
- ErrorHandler (0.8.1):
4+
- ErrorHandler/Core (= 0.8.1)
5+
- ErrorHandler/Alamofire (0.8.1):
66
- Alamofire (~> 4.1)
77
- ErrorHandler/Core
8-
- ErrorHandler/Core (0.8.0)
8+
- ErrorHandler/Core (0.8.1)
99

1010
DEPENDENCIES:
1111
- ErrorHandler (from `../`)
1212
- ErrorHandler/Alamofire (from `../`)
1313

14+
SPEC REPOS:
15+
https://github.com/CocoaPods/Specs.git:
16+
- Alamofire
17+
1418
EXTERNAL SOURCES:
1519
ErrorHandler:
16-
:path: ../
20+
:path: "../"
1721

1822
SPEC CHECKSUMS:
19-
Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
20-
ErrorHandler: f64a00c0e62273054526c2d102496db244b2efa3
23+
Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
24+
ErrorHandler: 7bff711b2dcb68a033ba6501a3d3fbb7c982fe11
2125

2226
PODFILE CHECKSUM: 8e328fdbad084717f3c5a8e2ce8f3f3671d29c67
2327

24-
COCOAPODS: 1.3.1
28+
COCOAPODS: 1.8.3

‎Example/Pods/Alamofire/LICENSE‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)