Skip to content

Commit 7d8d96e

Browse files
wessmithwessmith
committed
update cocoapods
1 parent 64cb328 commit 7d8d96e

File tree

6 files changed

+59
-19
lines changed

6 files changed

+59
-19
lines changed

‎DeepLinkKit.xcodeproj/project.pbxproj‎

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@
830830
attributes = {
831831
CLASSPREFIX = DPL;
832832
LastSwiftUpdateCheck = 0700;
833-
LastUpgradeCheck = 0900;
833+
LastUpgradeCheck = 1010;
834834
ORGANIZATIONNAME = "Button, Inc.";
835835
TargetAttributes = {
836836
6003F5AD195388D20070C39A = {
@@ -917,13 +917,16 @@
917917
files = (
918918
);
919919
inputPaths = (
920+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
921+
"${PODS_ROOT}/Manifest.lock",
920922
);
921923
name = "[CP] Check Pods Manifest.lock";
922924
outputPaths = (
925+
"$(DERIVED_FILE_DIR)/Pods-ReceiverDemoSwift-checkManifestLockResult.txt",
923926
);
924927
runOnlyForDeploymentPostprocessing = 0;
925928
shellPath = /bin/sh;
926-
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";
929+
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";
927930
showEnvVarsInLog = 0;
928931
};
929932
169E441B24A0182ECBEA02B1 /* [CP] Embed Pods Frameworks */ = {
@@ -932,9 +935,20 @@
932935
files = (
933936
);
934937
inputPaths = (
938+
"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh",
939+
"${BUILT_PRODUCTS_DIR}/DeepLinkKit/DeepLinkKit.framework",
940+
"${BUILT_PRODUCTS_DIR}/Expecta/Expecta.framework",
941+
"${BUILT_PRODUCTS_DIR}/KIF/KIF.framework",
942+
"${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework",
943+
"${BUILT_PRODUCTS_DIR}/Specta/Specta.framework",
935944
);
936945
name = "[CP] Embed Pods Frameworks";
937946
outputPaths = (
947+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DeepLinkKit.framework",
948+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Expecta.framework",
949+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KIF.framework",
950+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework",
951+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Specta.framework",
938952
);
939953
runOnlyForDeploymentPostprocessing = 0;
940954
shellPath = /bin/sh;
@@ -947,9 +961,12 @@
947961
files = (
948962
);
949963
inputPaths = (
964+
"${SRCROOT}/Pods/Target Support Files/Pods-ReceiverDemo/Pods-ReceiverDemo-frameworks.sh",
965+
"${BUILT_PRODUCTS_DIR}/DeepLinkKit/DeepLinkKit.framework",
950966
);
951967
name = "[CP] Embed Pods Frameworks";
952968
outputPaths = (
969+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DeepLinkKit.framework",
953970
);
954971
runOnlyForDeploymentPostprocessing = 0;
955972
shellPath = /bin/sh;
@@ -977,13 +994,16 @@
977994
files = (
978995
);
979996
inputPaths = (
997+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
998+
"${PODS_ROOT}/Manifest.lock",
980999
);
9811000
name = "[CP] Check Pods Manifest.lock";
9821001
outputPaths = (
1002+
"$(DERIVED_FILE_DIR)/Pods-SenderDemo-checkManifestLockResult.txt",
9831003
);
9841004
runOnlyForDeploymentPostprocessing = 0;
9851005
shellPath = /bin/sh;
986-
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";
1006+
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";
9871007
showEnvVarsInLog = 0;
9881008
};
9891009
78E4A2B7A96651F3AE873F35 /* [CP] Check Pods Manifest.lock */ = {
@@ -992,13 +1012,16 @@
9921012
files = (
9931013
);
9941014
inputPaths = (
1015+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
1016+
"${PODS_ROOT}/Manifest.lock",
9951017
);
9961018
name = "[CP] Check Pods Manifest.lock";
9971019
outputPaths = (
1020+
"$(DERIVED_FILE_DIR)/Pods-ReceiverDemo-checkManifestLockResult.txt",
9981021
);
9991022
runOnlyForDeploymentPostprocessing = 0;
10001023
shellPath = /bin/sh;
1001-
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";
1024+
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";
10021025
showEnvVarsInLog = 0;
10031026
};
10041027
92CBDC92946CE1B22732C030 /* [CP] Copy Pods Resources */ = {
@@ -1022,9 +1045,12 @@
10221045
files = (
10231046
);
10241047
inputPaths = (
1048+
"${SRCROOT}/Pods/Target Support Files/Pods-SenderDemo/Pods-SenderDemo-frameworks.sh",
1049+
"${BUILT_PRODUCTS_DIR}/DeepLinkKit/DeepLinkKit.framework",
10251050
);
10261051
name = "[CP] Embed Pods Frameworks";
10271052
outputPaths = (
1053+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DeepLinkKit.framework",
10281054
);
10291055
runOnlyForDeploymentPostprocessing = 0;
10301056
shellPath = /bin/sh;
@@ -1052,13 +1078,16 @@
10521078
files = (
10531079
);
10541080
inputPaths = (
1081+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
1082+
"${PODS_ROOT}/Manifest.lock",
10551083
);
10561084
name = "[CP] Check Pods Manifest.lock";
10571085
outputPaths = (
1086+
"$(DERIVED_FILE_DIR)/Pods-Tests-checkManifestLockResult.txt",
10581087
);
10591088
runOnlyForDeploymentPostprocessing = 0;
10601089
shellPath = /bin/sh;
1061-
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";
1090+
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";
10621091
showEnvVarsInLog = 0;
10631092
};
10641093
D0318767A555E3ECB0E5307A /* [CP] Copy Pods Resources */ = {
@@ -1096,9 +1125,12 @@
10961125
files = (
10971126
);
10981127
inputPaths = (
1128+
"${SRCROOT}/Pods/Target Support Files/Pods-ReceiverDemoSwift/Pods-ReceiverDemoSwift-frameworks.sh",
1129+
"${BUILT_PRODUCTS_DIR}/DeepLinkKit/DeepLinkKit.framework",
10991130
);
11001131
name = "[CP] Embed Pods Frameworks";
11011132
outputPaths = (
1133+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DeepLinkKit.framework",
11021134
);
11031135
runOnlyForDeploymentPostprocessing = 0;
11041136
shellPath = /bin/sh;
@@ -1248,12 +1280,14 @@
12481280
CLANG_WARN_BOOL_CONVERSION = YES;
12491281
CLANG_WARN_COMMA = YES;
12501282
CLANG_WARN_CONSTANT_CONVERSION = YES;
1283+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
12511284
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
12521285
CLANG_WARN_EMPTY_BODY = YES;
12531286
CLANG_WARN_ENUM_CONVERSION = YES;
12541287
CLANG_WARN_INFINITE_RECURSION = YES;
12551288
CLANG_WARN_INT_CONVERSION = YES;
12561289
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1290+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
12571291
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
12581292
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
12591293
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1300,12 +1334,14 @@
13001334
CLANG_WARN_BOOL_CONVERSION = YES;
13011335
CLANG_WARN_COMMA = YES;
13021336
CLANG_WARN_CONSTANT_CONVERSION = YES;
1337+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
13031338
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
13041339
CLANG_WARN_EMPTY_BODY = YES;
13051340
CLANG_WARN_ENUM_CONVERSION = YES;
13061341
CLANG_WARN_INFINITE_RECURSION = YES;
13071342
CLANG_WARN_INT_CONVERSION = YES;
13081343
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1344+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
13091345
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
13101346
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
13111347
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1582,12 +1618,14 @@
15821618
CLANG_WARN_BOOL_CONVERSION = YES;
15831619
CLANG_WARN_COMMA = YES;
15841620
CLANG_WARN_CONSTANT_CONVERSION = YES;
1621+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
15851622
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
15861623
CLANG_WARN_EMPTY_BODY = YES;
15871624
CLANG_WARN_ENUM_CONVERSION = YES;
15881625
CLANG_WARN_INFINITE_RECURSION = YES;
15891626
CLANG_WARN_INT_CONVERSION = YES;
15901627
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1628+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
15911629
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
15921630
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
15931631
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

‎DeepLinkKit.xcodeproj/xcshareddata/xcschemes/DeepLinkKit.xcscheme‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -37,7 +36,6 @@
3736
buildConfiguration = "Debug"
3837
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3938
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4139
launchStyle = "0"
4240
useCustomWorkingDirectory = "NO"
4341
ignoresPersistentStateOnLaunch = "NO"

‎DeepLinkKit.xcodeproj/xcshareddata/xcschemes/ReceiverDemo.xcscheme‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
2626
buildConfiguration = "Test"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
30-
shouldUseLaunchSchemeArgsEnv = "YES"
31-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3231
<Testables>
3332
<TestableReference
3433
skipped = "NO">
@@ -57,7 +56,6 @@
5756
buildConfiguration = "Debug"
5857
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5958
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60-
language = ""
6159
launchStyle = "0"
6260
useCustomWorkingDirectory = "NO"
6361
ignoresPersistentStateOnLaunch = "NO"

‎DeepLinkKit.xcodeproj/xcshareddata/xcschemes/SenderDemo.xcscheme‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
4040
buildConfiguration = "Test"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
language = ""
4443
shouldUseLaunchSchemeArgsEnv = "YES">
4544
<Testables>
4645
<TestableReference
@@ -70,7 +69,6 @@
7069
buildConfiguration = "Debug"
7170
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7271
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73-
language = ""
7472
launchStyle = "0"
7573
useCustomWorkingDirectory = "NO"
7674
ignoresPersistentStateOnLaunch = "NO"

‎DeepLinkKit.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>

‎Podfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ DEPENDENCIES:
1616

1717
EXTERNAL SOURCES:
1818
DeepLinkKit:
19-
:path: "."
19+
:path: .
2020

2121
SPEC CHECKSUMS:
22-
DeepLinkKit: 98a26f2c5cf4c86b97c1170cdf3737ae49a3a50c
22+
DeepLinkKit: ff762f55eff71773451b8e77b196d0622390ac1f
2323
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
2424
KIF: bd770edd8ce49bc7308501e4871e58a02d137be3
2525
OCMock: 35ae71d6a8fcc1b59434d561d1520b9dd4f15765
2626
Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
2727

2828
PODFILE CHECKSUM: c390f027c860b497aa35e691b8e585f706ac36a5
2929

30-
COCOAPODS: 1.2.1
30+
COCOAPODS: 1.4.0

0 commit comments

Comments
 (0)