Skip to content

Commit 775bf43

Browse files
committed
Xcode recommended settings
1 parent 1d3dc74 commit 775bf43

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

ReactiveTask.xcodeproj/project.pbxproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
isa = PBXProject;
270270
attributes = {
271271
LastSwiftUpdateCheck = 0700;
272-
LastUpgradeCheck = 0630;
272+
LastUpgradeCheck = 0710;
273273
ORGANIZATIONNAME = Carthage;
274274
TargetAttributes = {
275275
D0BFEA571A2D1E5E00E23194 = {
@@ -349,6 +349,7 @@
349349
baseConfigurationReference = D0BFEA781A2D1E7C00E23194 /* Debug.xcconfig */;
350350
buildSettings = {
351351
CURRENT_PROJECT_VERSION = 1;
352+
ENABLE_TESTABILITY = YES;
352353
GCC_NO_COMMON_BLOCKS = YES;
353354
MACOSX_DEPLOYMENT_TARGET = 10.9;
354355
ONLY_ACTIVE_ARCH = YES;
@@ -379,6 +380,7 @@
379380
DYLIB_CURRENT_VERSION = 1;
380381
FRAMEWORK_VERSION = A;
381382
INFOPLIST_FILE = ReactiveTask/Info.plist;
383+
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
382384
PRODUCT_NAME = "$(TARGET_NAME)";
383385
};
384386
name = Debug;
@@ -391,6 +393,7 @@
391393
DYLIB_CURRENT_VERSION = 1;
392394
FRAMEWORK_VERSION = A;
393395
INFOPLIST_FILE = ReactiveTask/Info.plist;
396+
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
394397
PRODUCT_NAME = "$(TARGET_NAME)";
395398
};
396399
name = Release;
@@ -404,6 +407,7 @@
404407
"$(inherited)",
405408
);
406409
INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
410+
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
407411
PRODUCT_NAME = "$(TARGET_NAME)";
408412
};
409413
name = Debug;
@@ -417,6 +421,7 @@
417421
"$(inherited)",
418422
);
419423
INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
424+
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
420425
PRODUCT_NAME = "$(TARGET_NAME)";
421426
};
422427
name = Release;
@@ -442,6 +447,7 @@
442447
DYLIB_CURRENT_VERSION = 1;
443448
FRAMEWORK_VERSION = A;
444449
INFOPLIST_FILE = ReactiveTask/Info.plist;
450+
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
445451
PRODUCT_NAME = "$(TARGET_NAME)";
446452
};
447453
name = Test;
@@ -455,6 +461,7 @@
455461
"$(inherited)",
456462
);
457463
INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
464+
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
458465
PRODUCT_NAME = "$(TARGET_NAME)";
459466
};
460467
name = Test;
@@ -480,6 +487,7 @@
480487
DYLIB_CURRENT_VERSION = 1;
481488
FRAMEWORK_VERSION = A;
482489
INFOPLIST_FILE = ReactiveTask/Info.plist;
490+
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
483491
PRODUCT_NAME = "$(TARGET_NAME)";
484492
};
485493
name = Profile;
@@ -493,6 +501,7 @@
493501
"$(inherited)",
494502
);
495503
INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
504+
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
496505
PRODUCT_NAME = "$(TARGET_NAME)";
497506
};
498507
name = Profile;

ReactiveTask.xcodeproj/xcshareddata/xcschemes/ReactiveTask.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 = "0630"
3+
LastUpgradeVersion = "0710"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -62,15 +62,18 @@
6262
ReferencedContainer = "container:ReactiveTask.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
6567
</TestAction>
6668
<LaunchAction
69+
buildConfiguration = "Debug"
6770
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6871
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
6972
launchStyle = "0"
7073
useCustomWorkingDirectory = "NO"
71-
buildConfiguration = "Debug"
7274
ignoresPersistentStateOnLaunch = "NO"
7375
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
7477
allowLocationSimulation = "YES">
7578
<MacroExpansion>
7679
<BuildableReference
@@ -85,10 +88,10 @@
8588
</AdditionalOptions>
8689
</LaunchAction>
8790
<ProfileAction
91+
buildConfiguration = "Profile"
8892
shouldUseLaunchSchemeArgsEnv = "YES"
8993
savedToolIdentifier = ""
9094
useCustomWorkingDirectory = "NO"
91-
buildConfiguration = "Profile"
9295
debugDocumentVersioning = "YES">
9396
<MacroExpansion>
9497
<BuildableReference

ReactiveTask/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>org.carthage.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

ReactiveTaskTests/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>org.carthage.$(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)