Skip to content

Commit 65c6839

Browse files
committed
Migrate to Swift 5.1 and Xcode 11.0.
1 parent 126aa69 commit 65c6839

File tree

5 files changed

+27
-31
lines changed

5 files changed

+27
-31
lines changed

MarkdownKit.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
328328
isa = PBXProject;
329329
attributes = {
330330
LastSwiftUpdateCheck = 1030;
331-
LastUpgradeCheck = 1020;
331+
LastUpgradeCheck = 1100;
332332
ORGANIZATIONNAME = "Matthias Zenger";
333333
TargetAttributes = {
334334
CC2AF6E7227CD98100BEA420 = {
@@ -503,6 +503,7 @@
503503
SDKROOT = macosx;
504504
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
505505
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
506+
SWIFT_VERSION = 5.0;
506507
VERSIONING_SYSTEM = "apple-generic";
507508
VERSION_INFO_PREFIX = "";
508509
};
@@ -560,6 +561,7 @@
560561
SDKROOT = macosx;
561562
SWIFT_COMPILATION_MODE = wholemodule;
562563
SWIFT_OPTIMIZATION_LEVEL = "-O";
564+
SWIFT_VERSION = 5.0;
563565
VERSIONING_SYSTEM = "apple-generic";
564566
VERSION_INFO_PREFIX = "";
565567
};
@@ -585,6 +587,7 @@
585587
"@executable_path/../Frameworks",
586588
"@loader_path/Frameworks",
587589
);
590+
MARKETING_VERSION = 0.1.3;
588591
PRODUCT_BUNDLE_IDENTIFIER = net.objecthub.MarkdownKit;
589592
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
590593
SKIP_INSTALL = YES;
@@ -613,6 +616,7 @@
613616
"@executable_path/../Frameworks",
614617
"@loader_path/Frameworks",
615618
);
619+
MARKETING_VERSION = 0.1.3;
616620
PRODUCT_BUNDLE_IDENTIFIER = net.objecthub.MarkdownKit;
617621
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
618622
SKIP_INSTALL = YES;

MarkdownKit.xcodeproj/xcshareddata/xcschemes/MarkdownKit.xcscheme

Lines changed: 10 additions & 14 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 = "1020"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "CC2AF6E7227CD98100BEA420"
34+
BuildableName = "MarkdownKit.framework"
35+
BlueprintName = "MarkdownKit"
36+
ReferencedContainer = "container:MarkdownKit.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "CC2AF6E7227CD98100BEA420"
46-
BuildableName = "MarkdownKit.framework"
47-
BlueprintName = "MarkdownKit"
48-
ReferencedContainer = "container:MarkdownKit.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:MarkdownKit.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

MarkdownKit.xcodeproj/xcshareddata/xcschemes/MarkdownKitProcess.xcscheme

Lines changed: 10 additions & 14 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 = "1030"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "CC72626D22F318C0001AB6D9"
34+
BuildableName = "MarkdownKitProcess"
35+
BlueprintName = "MarkdownKitProcess"
36+
ReferencedContainer = "container:MarkdownKit.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "CC72626D22F318C0001AB6D9"
46-
BuildableName = "MarkdownKitProcess"
47-
BlueprintName = "MarkdownKitProcess"
48-
ReferencedContainer = "container:MarkdownKit.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:MarkdownKit.xcodeproj">
7270
</BuildableReference>
7371
</BuildableProductRunnable>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

Sources/MarkdownKit/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.1</string>
18+
<string>0.1.3</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSHumanReadableCopyright</key>

Tests/MarkdownKitTests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
18+
<string>0.1.3</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
</dict>

0 commit comments

Comments
 (0)