Skip to content
This repository was archived by the owner on Feb 4, 2020. It is now read-only.

Commit d168f4c

Browse files
hct-uxhct-ux
authored
Swift 4.2 (#1)
* updated to swift 4.2 * updated to live pca pod for swift 4.2
1 parent 7f2b0a7 commit d168f4c

File tree

70 files changed

+2419
-2816
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+2419
-2816
lines changed

‎CapturePlusControl 1.xcodeproj/project.pbxproj

+15-19
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
6950EB111DE4D4D1003984CA /* Frameworks */,
101101
6950EB121DE4D4D1003984CA /* Resources */,
102102
682A71FE3EAED123E50077D8 /* [CP] Embed Pods Frameworks */,
103-
492088CE4AC4C603D745AE01 /* [CP] Copy Pods Resources */,
104103
);
105104
buildRules = (
106105
);
@@ -160,30 +159,24 @@
160159
/* End PBXResourcesBuildPhase section */
161160

162161
/* Begin PBXShellScriptBuildPhase section */
163-
492088CE4AC4C603D745AE01 /* [CP] Copy Pods Resources */ = {
164-
isa = PBXShellScriptBuildPhase;
165-
buildActionMask = 2147483647;
166-
files = (
167-
);
168-
inputPaths = (
169-
);
170-
name = "[CP] Copy Pods Resources";
171-
outputPaths = (
172-
);
173-
runOnlyForDeploymentPostprocessing = 0;
174-
shellPath = /bin/sh;
175-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CapturePlusControl 1/Pods-CapturePlusControl 1-resources.sh\"\n";
176-
showEnvVarsInLog = 0;
177-
};
178162
682A71FE3EAED123E50077D8 /* [CP] Embed Pods Frameworks */ = {
179163
isa = PBXShellScriptBuildPhase;
180164
buildActionMask = 2147483647;
181165
files = (
182166
);
183167
inputPaths = (
168+
"${SRCROOT}/Pods/Target Support Files/Pods-CapturePlusControl 1/Pods-CapturePlusControl 1-frameworks.sh",
169+
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
170+
"${BUILT_PRODUCTS_DIR}/AlamofireObjectMapper/AlamofireObjectMapper.framework",
171+
"${BUILT_PRODUCTS_DIR}/ObjectMapper/ObjectMapper.framework",
172+
"${BUILT_PRODUCTS_DIR}/PCAiOSLib/PCAiOSLib.framework",
184173
);
185174
name = "[CP] Embed Pods Frameworks";
186175
outputPaths = (
176+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
177+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AlamofireObjectMapper.framework",
178+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectMapper.framework",
179+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PCAiOSLib.framework",
187180
);
188181
runOnlyForDeploymentPostprocessing = 0;
189182
shellPath = /bin/sh;
@@ -196,13 +189,16 @@
196189
files = (
197190
);
198191
inputPaths = (
192+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
193+
"${PODS_ROOT}/Manifest.lock",
199194
);
200195
name = "[CP] Check Pods Manifest.lock";
201196
outputPaths = (
197+
"$(DERIVED_FILE_DIR)/Pods-CapturePlusControl 1-checkManifestLockResult.txt",
202198
);
203199
runOnlyForDeploymentPostprocessing = 0;
204200
shellPath = /bin/sh;
205-
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";
201+
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";
206202
showEnvVarsInLog = 0;
207203
};
208204
/* End PBXShellScriptBuildPhase section */
@@ -343,7 +339,7 @@
343339
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
344340
PRODUCT_BUNDLE_IDENTIFIER = "HTD.CapturePlusControl-1";
345341
PRODUCT_NAME = "$(TARGET_NAME)";
346-
SWIFT_VERSION = 3.0;
342+
SWIFT_VERSION = 4.2;
347343
};
348344
name = Debug;
349345
};
@@ -358,7 +354,7 @@
358354
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
359355
PRODUCT_BUNDLE_IDENTIFIER = "HTD.CapturePlusControl-1";
360356
PRODUCT_NAME = "$(TARGET_NAME)";
361-
SWIFT_VERSION = 3.0;
357+
SWIFT_VERSION = 4.2;
362358
};
363359
name = Release;
364360
};

‎CapturePlusControl 1.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+8
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>

‎CapturePlusControl 1/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
77
var window: UIWindow?
88

99

10-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
10+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1111
// Override point for customization after application launch.
1212

1313

‎Podfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ target 'CapturePlusControl 1' do
66
use_frameworks!
77

88
# Pods for CapturePlusControl 1
9-
pod 'Alamofire', '~> 4.2.0'
10-
pod 'AlamofireObjectMapper', '~> 4.0'
11-
pod 'PCAiOSLib', '~> 1.0'
9+
pod 'Alamofire', '~> 4.8.1'
10+
pod 'AlamofireObjectMapper', '~> 5.2.0'
11+
pod 'PCAiOSLib', '~> 1.1.2'
1212

1313
end

‎Podfile.lock

+24-17
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,31 @@
11
PODS:
2-
- Alamofire (4.2.0)
3-
- AlamofireObjectMapper (4.1.0):
4-
- Alamofire (~> 4.1)
5-
- ObjectMapper (~> 2.0)
6-
- ObjectMapper (2.2.7)
7-
- PCAiOSLib (1.0.1):
8-
- Alamofire (~> 4.2.0)
9-
- AlamofireObjectMapper (~> 4.0)
2+
- Alamofire (4.8.1)
3+
- AlamofireObjectMapper (5.2.0):
4+
- Alamofire (~> 4.7)
5+
- ObjectMapper (~> 3.4)
6+
- ObjectMapper (3.4.2)
7+
- PCAiOSLib (1.1.2):
8+
- Alamofire (~> 4.8.1)
9+
- AlamofireObjectMapper (~> 5.2.0)
1010

1111
DEPENDENCIES:
12-
- Alamofire (~> 4.2.0)
13-
- AlamofireObjectMapper (~> 4.0)
14-
- PCAiOSLib (~> 1.0)
12+
- Alamofire (~> 4.8.1)
13+
- AlamofireObjectMapper (~> 5.2.0)
14+
- PCAiOSLib (~> 1.1.2)
15+
16+
SPEC REPOS:
17+
https://github.com/cocoapods/specs.git:
18+
- Alamofire
19+
- AlamofireObjectMapper
20+
- ObjectMapper
21+
- PCAiOSLib
1522

1623
SPEC CHECKSUMS:
17-
Alamofire: aa2e09d871c9160ac53c90e83c68064a94e3dfbe
18-
AlamofireObjectMapper: 435adc82f5b367679bd9e71c4974a54efd0b2521
19-
ObjectMapper: 65abcfd9a61cf7396cbd14a4fb22fddfcc46577e
20-
PCAiOSLib: 2d5f7db0f3895ec46a7895f7176d8d826b5e45e7
24+
Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11
25+
AlamofireObjectMapper: 92b6ce2423a9d159e686f6a1d514a009bf903ddc
26+
ObjectMapper: 0d4402610f4e468903ae64629eec4784531e5c51
27+
PCAiOSLib: 22b278e0ede19ca9a59face86fa592cbc0fc0729
2128

22-
PODFILE CHECKSUM: 6ce12c81b8fb135a738f6fb8b50daab5a2d74f6d
29+
PODFILE CHECKSUM: 9dfde99bf79154545d0443487c37d3b4592d1aed
2330

24-
COCOAPODS: 1.2.1
31+
COCOAPODS: 1.5.3

‎Pods/Alamofire/LICENSE

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)