Skip to content

Commit 7a2e65f

Browse files
ryanolsonkryanolsonk
committed
Allow Xcode 7 to make desired changes to the project and scheme files
1 parent 0489c09 commit 7a2e65f

File tree

6 files changed

+34
-22
lines changed

6 files changed

+34
-22
lines changed

‎Classes/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.flipboard.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎Example/UICatalog.xcodeproj/project.pbxproj

+12-9
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,12 @@
287287
944F7486197B458C009AB039 /* FLEXHierarchyTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXHierarchyTableViewController.m; sourceTree = "<group>"; };
288288
944F7487197B458C009AB039 /* FLEXImagePreviewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLEXImagePreviewViewController.h; sourceTree = "<group>"; };
289289
944F7488197B458C009AB039 /* FLEXImagePreviewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXImagePreviewViewController.m; sourceTree = "<group>"; };
290-
946C6EC71A7598D3006545C2 /* FLEXSystemLogTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FLEXSystemLogTableViewCell.h; path = "FLEXSystemLogTableViewCell.h"; sourceTree = "<group>"; };
291-
946C6EC81A7598D3006545C2 /* FLEXSystemLogTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FLEXSystemLogTableViewCell.m; path = "FLEXSystemLogTableViewCell.m"; sourceTree = "<group>"; };
292-
946C6ECA1A759928006545C2 /* FLEXSystemLogTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FLEXSystemLogTableViewController.m; path = "FLEXSystemLogTableViewController.m"; sourceTree = "<group>"; };
293-
946C6ECB1A759928006545C2 /* FLEXSystemLogTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FLEXSystemLogTableViewController.h; path = "FLEXSystemLogTableViewController.h"; sourceTree = "<group>"; };
294-
946C6ECD1A7599C4006545C2 /* FLEXSystemLogMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FLEXSystemLogMessage.h; path = "FLEXSystemLogMessage.h"; sourceTree = "<group>"; };
295-
946C6ECE1A7599C4006545C2 /* FLEXSystemLogMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FLEXSystemLogMessage.m; path = "FLEXSystemLogMessage.m"; sourceTree = "<group>"; };
290+
946C6EC71A7598D3006545C2 /* FLEXSystemLogTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLEXSystemLogTableViewCell.h; sourceTree = "<group>"; };
291+
946C6EC81A7598D3006545C2 /* FLEXSystemLogTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXSystemLogTableViewCell.m; sourceTree = "<group>"; };
292+
946C6ECA1A759928006545C2 /* FLEXSystemLogTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXSystemLogTableViewController.m; sourceTree = "<group>"; };
293+
946C6ECB1A759928006545C2 /* FLEXSystemLogTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLEXSystemLogTableViewController.h; sourceTree = "<group>"; };
294+
946C6ECD1A7599C4006545C2 /* FLEXSystemLogMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLEXSystemLogMessage.h; sourceTree = "<group>"; };
295+
946C6ECE1A7599C4006545C2 /* FLEXSystemLogMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXSystemLogMessage.m; sourceTree = "<group>"; };
296296
94C681F11A3E941800E1936D /* FLEXLayerExplorerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLEXLayerExplorerViewController.h; sourceTree = "<group>"; };
297297
94C681F21A3E941800E1936D /* FLEXLayerExplorerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXLayerExplorerViewController.m; sourceTree = "<group>"; };
298298
94CB48371A8EC6000054A905 /* FLEXMultilineTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLEXMultilineTableViewCell.h; sourceTree = "<group>"; };
@@ -626,7 +626,7 @@
626626
944F7473197B458C009AB039 /* Global State Explorers */ = {
627627
isa = PBXGroup;
628628
children = (
629-
946C6EC61A75986C006545C2 /* SystemLog */,
629+
946C6EC61A75986C006545C2 /* System Log */,
630630
944F7474197B458C009AB039 /* FLEXClassesTableViewController.h */,
631631
944F7475197B458C009AB039 /* FLEXClassesTableViewController.m */,
632632
944F7476197B458C009AB039 /* FLEXFileBrowserTableViewController.h */,
@@ -673,7 +673,7 @@
673673
name = "FLEX Integration";
674674
sourceTree = "<group>";
675675
};
676-
946C6EC61A75986C006545C2 /* SystemLog */ = {
676+
946C6EC61A75986C006545C2 /* System Log */ = {
677677
isa = PBXGroup;
678678
children = (
679679
946C6ECB1A759928006545C2 /* FLEXSystemLogTableViewController.h */,
@@ -722,7 +722,7 @@
722722
5356823218F3656900BAAD62 /* Project object */ = {
723723
isa = PBXProject;
724724
attributes = {
725-
LastUpgradeCheck = 0510;
725+
LastUpgradeCheck = 0700;
726726
ORGANIZATIONNAME = f;
727727
};
728728
buildConfigurationList = 5356823518F3656900BAAD62 /* Build configuration list for PBXProject "UICatalog" */;
@@ -905,6 +905,7 @@
905905
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
906906
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
907907
COPY_PHASE_STRIP = NO;
908+
ENABLE_TESTABILITY = YES;
908909
GCC_C_LANGUAGE_STANDARD = gnu99;
909910
GCC_DYNAMIC_NO_PIC = NO;
910911
GCC_OPTIMIZATION_LEVEL = 0;
@@ -968,6 +969,7 @@
968969
GCC_PRECOMPILE_PREFIX_HEADER = YES;
969970
GCC_PREFIX_HEADER = "UICatalog/UICatalog-Prefix.pch";
970971
INFOPLIST_FILE = "UICatalog/UICatalog-Info.plist";
972+
PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.UICatalog";
971973
PRODUCT_NAME = "$(TARGET_NAME)";
972974
WRAPPER_EXTENSION = app;
973975
};
@@ -982,6 +984,7 @@
982984
GCC_PRECOMPILE_PREFIX_HEADER = YES;
983985
GCC_PREFIX_HEADER = "UICatalog/UICatalog-Prefix.pch";
984986
INFOPLIST_FILE = "UICatalog/UICatalog-Info.plist";
987+
PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.UICatalog";
985988
PRODUCT_NAME = "$(TARGET_NAME)";
986989
WRAPPER_EXTENSION = app;
987990
};

‎Example/UICatalog.xcodeproj/xcshareddata/xcschemes/UICatalog.xcscheme

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0600"
3+
LastUpgradeVersion = "0700"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
3232
<MacroExpansion>
@@ -38,15 +38,18 @@
3838
ReferencedContainer = "container:UICatalog.xcodeproj">
3939
</BuildableReference>
4040
</MacroExpansion>
41+
<AdditionalOptions>
42+
</AdditionalOptions>
4143
</TestAction>
4244
<LaunchAction
45+
buildConfiguration = "Debug"
4346
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4447
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4548
launchStyle = "0"
4649
useCustomWorkingDirectory = "NO"
47-
buildConfiguration = "Debug"
4850
ignoresPersistentStateOnLaunch = "NO"
4951
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
5053
allowLocationSimulation = "YES">
5154
<BuildableProductRunnable
5255
runnableDebuggingMode = "0">
@@ -62,10 +65,10 @@
6265
</AdditionalOptions>
6366
</LaunchAction>
6467
<ProfileAction
68+
buildConfiguration = "Debug"
6569
shouldUseLaunchSchemeArgsEnv = "YES"
6670
savedToolIdentifier = ""
6771
useCustomWorkingDirectory = "NO"
68-
buildConfiguration = "Debug"
6972
debugDocumentVersioning = "YES">
7073
<BuildableProductRunnable
7174
runnableDebuggingMode = "0">

‎Example/UICatalog/UICatalog-Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.example.apple-samplecode.UICatalog</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎FLEX.xcodeproj/project.pbxproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@
639639
isa = PBXProject;
640640
attributes = {
641641
CLASSPREFIX = FLEX;
642-
LastUpgradeCheck = 0640;
642+
LastUpgradeCheck = 0700;
643643
ORGANIZATIONNAME = Flipboard;
644644
TargetAttributes = {
645645
3A4C941E1B5B20570088C3F2 = {
@@ -770,6 +770,7 @@
770770
CURRENT_PROJECT_VERSION = 1;
771771
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
772772
ENABLE_STRICT_OBJC_MSGSEND = YES;
773+
ENABLE_TESTABILITY = YES;
773774
GCC_C_LANGUAGE_STANDARD = gnu99;
774775
GCC_DYNAMIC_NO_PIC = NO;
775776
GCC_NO_COMMON_BLOCKS = YES;
@@ -846,6 +847,7 @@
846847
INFOPLIST_FILE = Classes/Info.plist;
847848
INSTALL_PATH = "@rpath";
848849
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
850+
PRODUCT_BUNDLE_IDENTIFIER = "com.flipboard.$(PRODUCT_NAME:rfc1034identifier)";
849851
PRODUCT_NAME = "$(TARGET_NAME)";
850852
SKIP_INSTALL = YES;
851853
};
@@ -861,6 +863,7 @@
861863
INFOPLIST_FILE = Classes/Info.plist;
862864
INSTALL_PATH = "@rpath";
863865
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
866+
PRODUCT_BUNDLE_IDENTIFIER = "com.flipboard.$(PRODUCT_NAME:rfc1034identifier)";
864867
PRODUCT_NAME = "$(TARGET_NAME)";
865868
SKIP_INSTALL = YES;
866869
};

‎FLEX.xcodeproj/xcshareddata/xcschemes/FLEX.xcscheme

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0640"
3+
LastUpgradeVersion = "0700"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
3232
<MacroExpansion>
@@ -38,15 +38,18 @@
3838
ReferencedContainer = "container:FLEX.xcodeproj">
3939
</BuildableReference>
4040
</MacroExpansion>
41+
<AdditionalOptions>
42+
</AdditionalOptions>
4143
</TestAction>
4244
<LaunchAction
45+
buildConfiguration = "Debug"
4346
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4447
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4548
launchStyle = "0"
4649
useCustomWorkingDirectory = "NO"
47-
buildConfiguration = "Debug"
4850
ignoresPersistentStateOnLaunch = "NO"
4951
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
5053
allowLocationSimulation = "YES">
5154
<MacroExpansion>
5255
<BuildableReference
@@ -61,10 +64,10 @@
6164
</AdditionalOptions>
6265
</LaunchAction>
6366
<ProfileAction
67+
buildConfiguration = "Release"
6468
shouldUseLaunchSchemeArgsEnv = "YES"
6569
savedToolIdentifier = ""
6670
useCustomWorkingDirectory = "NO"
67-
buildConfiguration = "Release"
6871
debugDocumentVersioning = "YES">
6972
<MacroExpansion>
7073
<BuildableReference

0 commit comments

Comments
 (0)