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

Commit 1787270

Browse files
committed
Update to recommended settings for Xcode 7
1 parent ac8b24f commit 1787270

File tree

5 files changed

+25
-13
lines changed

5 files changed

+25
-13
lines changed

Lin.xcodeproj/project.pbxproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
AA80F3331A82804C007687A3 /* Project object */ = {
295295
isa = PBXProject;
296296
attributes = {
297-
LastUpgradeCheck = 0610;
297+
LastUpgradeCheck = 0700;
298298
ORGANIZATIONNAME = "Katsuma Tanaka";
299299
TargetAttributes = {
300300
AA023C111A82A2E700D4AE5F = {
@@ -387,6 +387,7 @@
387387
);
388388
INFOPLIST_FILE = LinTests/Info.plist;
389389
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
390+
PRODUCT_BUNDLE_IDENTIFIER = "jp.questbeat.$(PRODUCT_NAME:rfc1034identifier)";
390391
PRODUCT_NAME = "$(TARGET_NAME)";
391392
};
392393
name = Debug;
@@ -401,6 +402,7 @@
401402
);
402403
INFOPLIST_FILE = LinTests/Info.plist;
403404
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
405+
PRODUCT_BUNDLE_IDENTIFIER = "jp.questbeat.$(PRODUCT_NAME:rfc1034identifier)";
404406
PRODUCT_NAME = "$(TARGET_NAME)";
405407
};
406408
name = Release;
@@ -424,6 +426,7 @@
424426
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
425427
COPY_PHASE_STRIP = NO;
426428
ENABLE_STRICT_OBJC_MSGSEND = YES;
429+
ENABLE_TESTABILITY = YES;
427430
GCC_C_LANGUAGE_STANDARD = gnu99;
428431
GCC_DYNAMIC_NO_PIC = NO;
429432
GCC_OPTIMIZATION_LEVEL = 0;
@@ -492,6 +495,7 @@
492495
);
493496
INFOPLIST_FILE = Lin/Info.plist;
494497
INSTALL_PATH = "/Library/Application Support/Developer/Shared/Xcode/Plug-ins";
498+
PRODUCT_BUNDLE_IDENTIFIER = "jp.questbeat.$(PRODUCT_NAME:rfc1034identifier)";
495499
PRODUCT_NAME = "$(TARGET_NAME)";
496500
SKIP_INSTALL = NO;
497501
WRAPPER_EXTENSION = xcplugin;
@@ -511,6 +515,7 @@
511515
);
512516
INFOPLIST_FILE = Lin/Info.plist;
513517
INSTALL_PATH = "/Library/Application Support/Developer/Shared/Xcode/Plug-ins";
518+
PRODUCT_BUNDLE_IDENTIFIER = "jp.questbeat.$(PRODUCT_NAME:rfc1034identifier)";
514519
PRODUCT_NAME = "$(TARGET_NAME)";
515520
SKIP_INSTALL = NO;
516521
WRAPPER_EXTENSION = xcplugin;

Lin.xcodeproj/xcshareddata/xcschemes/Lin.xcscheme

Lines changed: 9 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 = "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 = "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
<TestableReference
3232
skipped = "NO">
@@ -48,18 +48,22 @@
4848
ReferencedContainer = "container:Lin.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"
6164
viewDebuggingEnabled = "No">
6265
<PathRunnable
66+
runnableDebuggingMode = "0"
6367
FilePath = "/Applications/Xcode.app">
6468
</PathRunnable>
6569
<MacroExpansion>
@@ -75,10 +79,10 @@
7579
</AdditionalOptions>
7680
</LaunchAction>
7781
<ProfileAction
82+
buildConfiguration = "Release"
7883
shouldUseLaunchSchemeArgsEnv = "YES"
7984
savedToolIdentifier = ""
8085
useCustomWorkingDirectory = "NO"
81-
buildConfiguration = "Release"
8286
debugDocumentVersioning = "YES">
8387
<MacroExpansion>
8488
<BuildableReference

Lin.xcodeproj/xcshareddata/xcschemes/LinTests.xcscheme

Lines changed: 8 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 = "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 = "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
<TestableReference
3232
skipped = "NO">
@@ -48,15 +48,18 @@
4848
ReferencedContainer = "container:Lin.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">
6164
<MacroExpansion>
6265
<BuildableReference
@@ -71,10 +74,10 @@
7174
</AdditionalOptions>
7275
</LaunchAction>
7376
<ProfileAction
77+
buildConfiguration = "Release"
7478
shouldUseLaunchSchemeArgsEnv = "YES"
7579
savedToolIdentifier = ""
7680
useCustomWorkingDirectory = "NO"
77-
buildConfiguration = "Release"
7881
debugDocumentVersioning = "YES">
7982
<MacroExpansion>
8083
<BuildableReference

Lin/Info.plist

Lines changed: 1 addition & 1 deletion
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>jp.questbeat.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

LinTests/Info.plist

Lines changed: 1 addition & 1 deletion
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>jp.questbeat.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

0 commit comments

Comments
 (0)