Skip to content

Commit 018c548

Browse files
wessmithwessmith
committed
Merge pull request #72 from usebutton/wes/update_xcode7_pods
Update project for Xcode 7 and update CocoaPods version
2 parents 63fd96c + 7735a9c commit 018c548

File tree

12 files changed

+182
-63
lines changed

12 files changed

+182
-63
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ profile
1818
DerivedData
1919
*.hmap
2020
*.ipa
21+
*.gcda
22+
*.gcno
2123

2224
# Bundler
2325
.bundle

‎DeepLinkKit.xcodeproj/project.pbxproj‎

Lines changed: 104 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
1717
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
1818
62335E031B57007F00E3818C /* DPLReceiverSwiftAppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62335DFB1B57007F00E3818C /* DPLReceiverSwiftAppDelegate.swift */; };
19-
62335E071B57007F00E3818C /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 62335E011B57007F00E3818C /* Info.plist */; };
2019
62335E091B5700AF00E3818C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
2120
62335E0A1B5700B400E3818C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
2221
62335E0B1B5700BC00E3818C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
@@ -131,6 +130,7 @@
131130
DE3E61091A3B4485008D6DFC /* NSString+DPLJSON.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+DPLJSON.m"; sourceTree = "<group>"; };
132131
DE3E610D1A3B4492008D6DFC /* NSString_DPLJSONSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSString_DPLJSONSpec.m; sourceTree = "<group>"; };
133132
DE4128901A8BBE500089DAA2 /* AppLinks.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppLinks.h; sourceTree = "<group>"; };
133+
DE56F9AD1BD6B0B70090BF8C /* specta-focus-check.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = "specta-focus-check.sh"; path = "BuildScripts/specta-focus-check.sh"; sourceTree = "<group>"; };
134134
DE87B1EC1A5DEFD400204A35 /* DPLProductRouteHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPLProductRouteHandler.h; sourceTree = "<group>"; };
135135
DE87B1ED1A5DEFD400204A35 /* DPLProductRouteHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPLProductRouteHandler.m; sourceTree = "<group>"; };
136136
DE87B1EF1A5DF49F00204A35 /* DPLProduct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPLProduct.h; sourceTree = "<group>"; };
@@ -483,6 +483,14 @@
483483
path = Categories;
484484
sourceTree = "<group>";
485485
};
486+
DE56F9AC1BD6B04E0090BF8C /* BuildScripts */ = {
487+
isa = PBXGroup;
488+
children = (
489+
DE56F9AD1BD6B0B70090BF8C /* specta-focus-check.sh */,
490+
);
491+
name = BuildScripts;
492+
sourceTree = "<group>";
493+
};
486494
DE5DD32C19E0643F007FD439 /* DeepLinkKit */ = {
487495
isa = PBXGroup;
488496
children = (
@@ -566,6 +574,7 @@
566574
DEAD328119E079D3003C8D65 /* Tests */ = {
567575
isa = PBXGroup;
568576
children = (
577+
DE56F9AC1BD6B04E0090BF8C /* BuildScripts */,
569578
2F4988DC1AE71A930069EF2B /* IntegrationTests */,
570579
DEEBD4A61AAB7928000BCA84 /* Fixtures */,
571580
4D4F41291B02A95800B710DB /* Regex */,
@@ -663,6 +672,7 @@
663672
6003F587195388D20070C39A /* Frameworks */,
664673
6003F588195388D20070C39A /* Resources */,
665674
213419298EA5AA6429BEFD28 /* Copy Pods Resources */,
675+
4025AE564DBFB183CA53A923 /* Embed Pods Frameworks */,
666676
);
667677
buildRules = (
668678
);
@@ -682,6 +692,8 @@
682692
6003F5AB195388D20070C39A /* Frameworks */,
683693
6003F5AC195388D20070C39A /* Resources */,
684694
0D3359342B62D92CA67C2E04 /* Copy Pods Resources */,
695+
A891777DE50BB01821DC55E8 /* Embed Pods Frameworks */,
696+
DE56F9AB1BD6B0140090BF8C /* Specta Focus Check */,
685697
);
686698
buildRules = (
687699
);
@@ -702,6 +714,7 @@
702714
62335DD31B57003300E3818C /* Frameworks */,
703715
62335DD41B57003300E3818C /* Resources */,
704716
9AC6E46B330C620FAB6621E4 /* Copy Pods Resources */,
717+
F7AECAC5E12B21557769080B /* Embed Pods Frameworks */,
705718
);
706719
buildRules = (
707720
);
@@ -721,6 +734,7 @@
721734
DEDB148A1A3F944D00A837F8 /* Frameworks */,
722735
DEDB148B1A3F944D00A837F8 /* Resources */,
723736
82E3829DCB61E29D4B984C4F /* Copy Pods Resources */,
737+
3D9B225BD699DD9D3E3783DD /* Embed Pods Frameworks */,
724738
);
725739
buildRules = (
726740
);
@@ -738,7 +752,8 @@
738752
isa = PBXProject;
739753
attributes = {
740754
CLASSPREFIX = DPL;
741-
LastUpgradeCheck = 0610;
755+
LastSwiftUpdateCheck = 0700;
756+
LastUpgradeCheck = 0700;
742757
ORGANIZATIONNAME = "Button, Inc.";
743758
TargetAttributes = {
744759
6003F5AD195388D20070C39A = {
@@ -797,7 +812,6 @@
797812
buildActionMask = 2147483647;
798813
files = (
799814
62891E891B57FA9D00C2AF4F /* Images.xcassets in Resources */,
800-
62335E071B57007F00E3818C /* Info.plist in Resources */,
801815
62891E881B57FA7F00C2AF4F /* Main.storyboard in Resources */,
802816
);
803817
runOnlyForDeploymentPostprocessing = 0;
@@ -889,6 +903,36 @@
889903
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";
890904
showEnvVarsInLog = 0;
891905
};
906+
3D9B225BD699DD9D3E3783DD /* Embed Pods Frameworks */ = {
907+
isa = PBXShellScriptBuildPhase;
908+
buildActionMask = 2147483647;
909+
files = (
910+
);
911+
inputPaths = (
912+
);
913+
name = "Embed Pods Frameworks";
914+
outputPaths = (
915+
);
916+
runOnlyForDeploymentPostprocessing = 0;
917+
shellPath = /bin/sh;
918+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SenderDemo/Pods-SenderDemo-frameworks.sh\"\n";
919+
showEnvVarsInLog = 0;
920+
};
921+
4025AE564DBFB183CA53A923 /* Embed Pods Frameworks */ = {
922+
isa = PBXShellScriptBuildPhase;
923+
buildActionMask = 2147483647;
924+
files = (
925+
);
926+
inputPaths = (
927+
);
928+
name = "Embed Pods Frameworks";
929+
outputPaths = (
930+
);
931+
runOnlyForDeploymentPostprocessing = 0;
932+
shellPath = /bin/sh;
933+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ReceiverDemo/Pods-ReceiverDemo-frameworks.sh\"\n";
934+
showEnvVarsInLog = 0;
935+
};
892936
7E4A77AFF27B0E5465184209 /* Check Pods Manifest.lock */ = {
893937
isa = PBXShellScriptBuildPhase;
894938
buildActionMask = 2147483647;
@@ -934,6 +978,50 @@
934978
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ReceiverDemoSwift/Pods-ReceiverDemoSwift-resources.sh\"\n";
935979
showEnvVarsInLog = 0;
936980
};
981+
A891777DE50BB01821DC55E8 /* Embed Pods Frameworks */ = {
982+
isa = PBXShellScriptBuildPhase;
983+
buildActionMask = 2147483647;
984+
files = (
985+
);
986+
inputPaths = (
987+
);
988+
name = "Embed Pods Frameworks";
989+
outputPaths = (
990+
);
991+
runOnlyForDeploymentPostprocessing = 0;
992+
shellPath = /bin/sh;
993+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh\"\n";
994+
showEnvVarsInLog = 0;
995+
};
996+
F7AECAC5E12B21557769080B /* Embed Pods Frameworks */ = {
997+
isa = PBXShellScriptBuildPhase;
998+
buildActionMask = 2147483647;
999+
files = (
1000+
);
1001+
inputPaths = (
1002+
);
1003+
name = "Embed Pods Frameworks";
1004+
outputPaths = (
1005+
);
1006+
runOnlyForDeploymentPostprocessing = 0;
1007+
shellPath = /bin/sh;
1008+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ReceiverDemoSwift/Pods-ReceiverDemoSwift-frameworks.sh\"\n";
1009+
showEnvVarsInLog = 0;
1010+
};
1011+
DE56F9AB1BD6B0140090BF8C /* Specta Focus Check */ = {
1012+
isa = PBXShellScriptBuildPhase;
1013+
buildActionMask = 2147483647;
1014+
files = (
1015+
);
1016+
inputPaths = (
1017+
);
1018+
name = "Specta Focus Check";
1019+
outputPaths = (
1020+
);
1021+
runOnlyForDeploymentPostprocessing = 0;
1022+
shellPath = /bin/sh;
1023+
shellScript = "\"${SRCROOT}/Tests/BuildScripts/specta-focus-check.sh\"";
1024+
};
9371025
/* End PBXShellScriptBuildPhase section */
9381026

9391027
/* Begin PBXSourcesBuildPhase section */
@@ -1061,6 +1149,7 @@
10611149
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10621150
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
10631151
COPY_PHASE_STRIP = NO;
1152+
ENABLE_TESTABILITY = YES;
10641153
GCC_C_LANGUAGE_STANDARD = gnu99;
10651154
GCC_DYNAMIC_NO_PIC = NO;
10661155
GCC_GENERATE_TEST_COVERAGE_FILES = YES;
@@ -1129,6 +1218,7 @@
11291218
GCC_PREFIX_HEADER = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Prefix.pch";
11301219
INFOPLIST_FILE = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Info.plist";
11311220
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
1221+
PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)";
11321222
PRODUCT_NAME = "$(TARGET_NAME)";
11331223
TARGETED_DEVICE_FAMILY = 1;
11341224
WRAPPER_EXTENSION = app;
@@ -1145,6 +1235,7 @@
11451235
GCC_PREFIX_HEADER = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Prefix.pch";
11461236
INFOPLIST_FILE = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Info.plist";
11471237
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
1238+
PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)";
11481239
PRODUCT_NAME = "$(TARGET_NAME)";
11491240
TARGETED_DEVICE_FAMILY = 1;
11501241
WRAPPER_EXTENSION = app;
@@ -1159,6 +1250,7 @@
11591250
GCC_PRECOMPILE_PREFIX_HEADER = YES;
11601251
GCC_PREFIX_HEADER = "Tests/SupportingFiles/Tests-Prefix.pch";
11611252
INFOPLIST_FILE = "Tests/SupportingFiles/Tests-Info.plist";
1253+
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
11621254
PRODUCT_NAME = "$(TARGET_NAME)";
11631255
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ReceiverDemo.app/ReceiverDemo";
11641256
WRAPPER_EXTENSION = xctest;
@@ -1173,6 +1265,7 @@
11731265
GCC_PRECOMPILE_PREFIX_HEADER = YES;
11741266
GCC_PREFIX_HEADER = "Tests/SupportingFiles/Tests-Prefix.pch";
11751267
INFOPLIST_FILE = "Tests/SupportingFiles/Tests-Info.plist";
1268+
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
11761269
PRODUCT_NAME = "$(TARGET_NAME)";
11771270
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ReceiverDemo.app/ReceiverDemo";
11781271
WRAPPER_EXTENSION = xctest;
@@ -1205,6 +1298,7 @@
12051298
"-fprofile-arcs",
12061299
"-ftest-coverage",
12071300
);
1301+
PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)";
12081302
PRODUCT_NAME = "$(TARGET_NAME)";
12091303
SWIFT_OBJC_BRIDGING_HEADER = "SampleApps/ReceiverDemoSwift/ReceiverDemoSwift-Bridging-Header.h";
12101304
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -1235,6 +1329,7 @@
12351329
"-fprofile-arcs",
12361330
"-ftest-coverage",
12371331
);
1332+
PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)";
12381333
PRODUCT_NAME = "$(TARGET_NAME)";
12391334
SWIFT_OBJC_BRIDGING_HEADER = "SampleApps/ReceiverDemoSwift/ReceiverDemoSwift-Bridging-Header.h";
12401335
TARGETED_DEVICE_FAMILY = 1;
@@ -1264,6 +1359,7 @@
12641359
"-fprofile-arcs",
12651360
"-ftest-coverage",
12661361
);
1362+
PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)";
12671363
PRODUCT_NAME = "$(TARGET_NAME)";
12681364
SWIFT_OBJC_BRIDGING_HEADER = "SampleApps/ReceiverDemoSwift/ReceiverDemoSwift-Bridging-Header.h";
12691365
TARGETED_DEVICE_FAMILY = 1;
@@ -1322,6 +1418,7 @@
13221418
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
13231419
INFOPLIST_FILE = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Info.plist";
13241420
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
1421+
PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)";
13251422
PRODUCT_NAME = "$(TARGET_NAME)";
13261423
TARGETED_DEVICE_FAMILY = 1;
13271424
WRAPPER_EXTENSION = app;
@@ -1345,6 +1442,7 @@
13451442
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
13461443
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
13471444
MTL_ENABLE_DEBUG_INFO = YES;
1445+
PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)";
13481446
PRODUCT_NAME = "$(TARGET_NAME)";
13491447
TARGETED_DEVICE_FAMILY = 1;
13501448
};
@@ -1358,6 +1456,7 @@
13581456
GCC_PRECOMPILE_PREFIX_HEADER = YES;
13591457
GCC_PREFIX_HEADER = "Tests/SupportingFiles/Tests-Prefix.pch";
13601458
INFOPLIST_FILE = "Tests/SupportingFiles/Tests-Info.plist";
1459+
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
13611460
PRODUCT_NAME = "$(TARGET_NAME)";
13621461
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ReceiverDemo.app/ReceiverDemo";
13631462
WRAPPER_EXTENSION = xctest;
@@ -1381,6 +1480,7 @@
13811480
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
13821481
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
13831482
MTL_ENABLE_DEBUG_INFO = YES;
1483+
PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)";
13841484
PRODUCT_NAME = "$(TARGET_NAME)";
13851485
TARGETED_DEVICE_FAMILY = 1;
13861486
};
@@ -1399,6 +1499,7 @@
13991499
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
14001500
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
14011501
MTL_ENABLE_DEBUG_INFO = NO;
1502+
PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)";
14021503
PRODUCT_NAME = "$(TARGET_NAME)";
14031504
TARGETED_DEVICE_FAMILY = 1;
14041505
};

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

Lines changed: 12 additions & 7 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 = "0610"
3+
LastUpgradeVersion = "0700"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Test"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Test">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
<TestableReference
3232
skipped = "NO">
@@ -48,17 +48,21 @@
4848
ReferencedContainer = "container:DeepLinkKit.xcodeproj">
4949
</BuildableReference>
5050
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
5153
</TestAction>
5254
<LaunchAction
55+
buildConfiguration = "Debug"
5356
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5457
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
5558
launchStyle = "0"
5659
useCustomWorkingDirectory = "NO"
57-
buildConfiguration = "Debug"
5860
ignoresPersistentStateOnLaunch = "NO"
5961
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
6063
allowLocationSimulation = "YES">
61-
<BuildableProductRunnable>
64+
<BuildableProductRunnable
65+
runnableDebuggingMode = "0">
6266
<BuildableReference
6367
BuildableIdentifier = "primary"
6468
BlueprintIdentifier = "6003F589195388D20070C39A"
@@ -71,12 +75,13 @@
7175
</AdditionalOptions>
7276
</LaunchAction>
7377
<ProfileAction
78+
buildConfiguration = "Release"
7479
shouldUseLaunchSchemeArgsEnv = "YES"
7580
savedToolIdentifier = ""
7681
useCustomWorkingDirectory = "NO"
77-
buildConfiguration = "Release"
7882
debugDocumentVersioning = "YES">
79-
<BuildableProductRunnable>
83+
<BuildableProductRunnable
84+
runnableDebuggingMode = "0">
8085
<BuildableReference
8186
BuildableIdentifier = "primary"
8287
BlueprintIdentifier = "6003F589195388D20070C39A"

0 commit comments

Comments
 (0)