Skip to content

Commit 401a536

Browse files
committed
Update project to the latest recommended settings.
1 parent 6c99150 commit 401a536

5 files changed

Lines changed: 21 additions & 9 deletions

File tree

Sample/Sample-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleIconFile</key>
1010
<string></string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.konstantinpavlikhin.WatchdogSampleApp</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

Watchdog-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleIconFile</key>
1010
<string></string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.konstantinpavlikhin.${PRODUCT_NAME:rfc1034identifier}</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

Watchdog.xcodeproj/project.pbxproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@
510510
attributes = {
511511
CLASSPREFIX = WDG;
512512
LastTestingUpgradeCheck = 0610;
513-
LastUpgradeCheck = 0600;
513+
LastUpgradeCheck = 0700;
514514
ORGANIZATIONNAME = "Konstantin Pavlikhin";
515515
};
516516
buildConfigurationList = B5F0B4E114F54B8B0069FFAF /* Build configuration list for PBXProject "Watchdog" */;
@@ -725,6 +725,7 @@
725725
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
726726
INFOPLIST_FILE = "Sample/Sample-Info.plist";
727727
MACOSX_DEPLOYMENT_TARGET = 10.9;
728+
PRODUCT_BUNDLE_IDENTIFIER = com.konstantinpavlikhin.WatchdogSampleApp;
728729
PRODUCT_NAME = "$(TARGET_NAME)";
729730
WRAPPER_EXTENSION = app;
730731
};
@@ -745,6 +746,7 @@
745746
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
746747
INFOPLIST_FILE = "Sample/Sample-Info.plist";
747748
MACOSX_DEPLOYMENT_TARGET = 10.9;
749+
PRODUCT_BUNDLE_IDENTIFIER = com.konstantinpavlikhin.WatchdogSampleApp;
748750
PRODUCT_NAME = "$(TARGET_NAME)";
749751
WRAPPER_EXTENSION = app;
750752
};
@@ -770,6 +772,7 @@
770772
"$(inherited)",
771773
"-ObjC",
772774
);
775+
PRODUCT_BUNDLE_IDENTIFIER = "com.konstantinpavlikhin.${PRODUCT_NAME:rfc1034identifier}";
773776
PRODUCT_NAME = "$(TARGET_NAME)";
774777
WRAPPER_EXTENSION = xctest;
775778
};
@@ -795,6 +798,7 @@
795798
"$(inherited)",
796799
"-ObjC",
797800
);
801+
PRODUCT_BUNDLE_IDENTIFIER = "com.konstantinpavlikhin.${PRODUCT_NAME:rfc1034identifier}";
798802
PRODUCT_NAME = "$(TARGET_NAME)";
799803
WRAPPER_EXTENSION = xctest;
800804
};
@@ -815,9 +819,11 @@
815819
CODE_SIGN_IDENTITY = "";
816820
COPY_PHASE_STRIP = NO;
817821
ENABLE_STRICT_OBJC_MSGSEND = YES;
822+
ENABLE_TESTABILITY = YES;
818823
GCC_C_LANGUAGE_STANDARD = gnu99;
819824
GCC_DYNAMIC_NO_PIC = NO;
820825
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
826+
GCC_NO_COMMON_BLOCKS = YES;
821827
GCC_OPTIMIZATION_LEVEL = 0;
822828
GCC_PREPROCESSOR_DEFINITIONS = (
823829
"DEBUG=1",
@@ -860,6 +866,7 @@
860866
ENABLE_STRICT_OBJC_MSGSEND = YES;
861867
GCC_C_LANGUAGE_STANDARD = gnu99;
862868
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
869+
GCC_NO_COMMON_BLOCKS = YES;
863870
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
864871
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
865872
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
@@ -888,6 +895,7 @@
888895
GCC_PREFIX_HEADER = "Watchdog-Prefix.pch";
889896
INFOPLIST_FILE = "Watchdog-Info.plist";
890897
LIBRARY_SEARCH_PATHS = "$(inherited)";
898+
PRODUCT_BUNDLE_IDENTIFIER = "com.konstantinpavlikhin.${PRODUCT_NAME:rfc1034identifier}";
891899
PRODUCT_NAME = "$(TARGET_NAME)";
892900
WRAPPER_EXTENSION = framework;
893901
};
@@ -904,6 +912,7 @@
904912
GCC_PREFIX_HEADER = "Watchdog-Prefix.pch";
905913
INFOPLIST_FILE = "Watchdog-Info.plist";
906914
LIBRARY_SEARCH_PATHS = "$(inherited)";
915+
PRODUCT_BUNDLE_IDENTIFIER = "com.konstantinpavlikhin.${PRODUCT_NAME:rfc1034identifier}";
907916
PRODUCT_NAME = "$(TARGET_NAME)";
908917
WRAPPER_EXTENSION = framework;
909918
};

Watchdog.xcodeproj/xcshareddata/xcschemes/Watchdog.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 = "0500"
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:Watchdog.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

WatchdogTests/WatchdogTests-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>com.konstantinpavlikhin.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundlePackageType</key>

0 commit comments

Comments
 (0)