Skip to content

Commit 924e5ba

Browse files
committed
[Project] Update to Xcode 7 defaults
1 parent a3423e6 commit 924e5ba

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

JWT.xcodeproj/project.pbxproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
attributes = {
212212
LastSwiftMigration = 0700;
213213
LastSwiftUpdateCheck = 0700;
214-
LastUpgradeCheck = 0620;
214+
LastUpgradeCheck = 0700;
215215
ORGANIZATIONNAME = Cocode;
216216
TargetAttributes = {
217217
279D639B1AD07FFF0024E2BC = {
@@ -386,6 +386,7 @@
386386
COPY_PHASE_STRIP = NO;
387387
CURRENT_PROJECT_VERSION = 1;
388388
ENABLE_STRICT_OBJC_MSGSEND = YES;
389+
ENABLE_TESTABILITY = YES;
389390
GCC_C_LANGUAGE_STANDARD = gnu99;
390391
GCC_DYNAMIC_NO_PIC = NO;
391392
GCC_OPTIMIZATION_LEVEL = 0;
@@ -461,6 +462,7 @@
461462
INFOPLIST_FILE = JWT/Info.plist;
462463
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
463464
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
465+
PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)";
464466
PRODUCT_NAME = "$(TARGET_NAME)";
465467
SKIP_INSTALL = YES;
466468
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -481,6 +483,7 @@
481483
INFOPLIST_FILE = JWT/Info.plist;
482484
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
483485
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
486+
PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)";
484487
PRODUCT_NAME = "$(TARGET_NAME)";
485488
SKIP_INSTALL = YES;
486489
};
@@ -501,6 +504,7 @@
501504
);
502505
INFOPLIST_FILE = JWTTests/Info.plist;
503506
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
507+
PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)";
504508
PRODUCT_NAME = "$(TARGET_NAME)";
505509
};
506510
name = Debug;
@@ -516,6 +520,7 @@
516520
);
517521
INFOPLIST_FILE = JWTTests/Info.plist;
518522
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
523+
PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)";
519524
PRODUCT_NAME = "$(TARGET_NAME)";
520525
};
521526
name = Release;

JWT.xcodeproj/xcshareddata/xcschemes/JWT.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 = "0620"
3+
LastUpgradeVersion = "0700"
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:JWT.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 = "Release"
8892
shouldUseLaunchSchemeArgsEnv = "YES"
8993
savedToolIdentifier = ""
9094
useCustomWorkingDirectory = "NO"
91-
buildConfiguration = "Release"
9295
debugDocumentVersioning = "YES">
9396
<MacroExpansion>
9497
<BuildableReference

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

JWTTests/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.cocode.$(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)