Skip to content

Commit c3e4014

Browse files
committed
Migrate project to Xcode 14.
1 parent a2cd2e6 commit c3e4014

File tree

9 files changed

+39
-15
lines changed

9 files changed

+39
-15
lines changed

MarkdownKit.xcodeproj/project.pbxproj

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
CCB033D4227CDB2F00E1C4DC /* Block.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCB033CC227CDB2F00E1C4DC /* Block.swift */; };
4949
CCB033D5227CDB2F00E1C4DC /* Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCB033CD227CDB2F00E1C4DC /* Container.swift */; };
5050
CCB033D6227CDB2F00E1C4DC /* DocumentParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCB033CE227CDB2F00E1C4DC /* DocumentParser.swift */; };
51+
CCB7B0D3296240E200F0DB20 /* CustomTextFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC87987F264B434F006950A7 /* CustomTextFragment.swift */; };
52+
CCB7B0D4296240F400F0DB20 /* CustomBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC87987E264B431F006950A7 /* CustomBlock.swift */; };
5153
CCC48B9125CA156600D082AD /* Blocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC8CBC1E2286CED60084683B /* Blocks.swift */; };
5254
CCC48B9625CA156900D082AD /* Block.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCB033CC227CDB2F00E1C4DC /* Block.swift */; };
5355
CCC48B9B25CA156C00D082AD /* Text.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCD0746722A060CF0053B73C /* Text.swift */; };
@@ -438,7 +440,7 @@
438440
isa = PBXProject;
439441
attributes = {
440442
LastSwiftUpdateCheck = 1240;
441-
LastUpgradeCheck = 1200;
443+
LastUpgradeCheck = 1420;
442444
ORGANIZATIONNAME = "Matthias Zenger";
443445
TargetAttributes = {
444446
CC2AF6E7227CD98100BEA420 = {
@@ -586,6 +588,8 @@
586588
CCC48BC125CA157D00D082AD /* HtmlGenerator.swift in Sources */,
587589
CCC48BAE25CA157600D082AD /* ExtendedMarkdownParser.swift in Sources */,
588590
CCC48BA825CA157600D082AD /* MarkdownParser.swift in Sources */,
591+
CCB7B0D3296240E200F0DB20 /* CustomTextFragment.swift in Sources */,
592+
CCB7B0D4296240F400F0DB20 /* CustomBlock.swift in Sources */,
589593
CCC48BEB25CA1E8000D082AD /* Color.swift in Sources */,
590594
CCC48BAA25CA157600D082AD /* DelimiterTransformer.swift in Sources */,
591595
CCC48BB625CA157600D082AD /* InlineParser.swift in Sources */,
@@ -648,6 +652,7 @@
648652
CODE_SIGN_IDENTITY = "Mac Developer";
649653
COPY_PHASE_STRIP = NO;
650654
CURRENT_PROJECT_VERSION = 1;
655+
DEAD_CODE_STRIPPING = YES;
651656
DEBUG_INFORMATION_FORMAT = dwarf;
652657
ENABLE_STRICT_OBJC_MSGSEND = YES;
653658
ENABLE_TESTABILITY = YES;
@@ -666,7 +671,7 @@
666671
GCC_WARN_UNUSED_FUNCTION = YES;
667672
GCC_WARN_UNUSED_VARIABLE = YES;
668673
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
669-
MACOSX_DEPLOYMENT_TARGET = 10.12;
674+
MACOSX_DEPLOYMENT_TARGET = 11.0;
670675
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
671676
MTL_FAST_MATH = YES;
672677
ONLY_ACTIVE_ARCH = YES;
@@ -715,6 +720,7 @@
715720
CODE_SIGN_IDENTITY = "Mac Developer";
716721
COPY_PHASE_STRIP = NO;
717722
CURRENT_PROJECT_VERSION = 1;
723+
DEAD_CODE_STRIPPING = YES;
718724
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
719725
ENABLE_NS_ASSERTIONS = NO;
720726
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -727,7 +733,7 @@
727733
GCC_WARN_UNUSED_FUNCTION = YES;
728734
GCC_WARN_UNUSED_VARIABLE = YES;
729735
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
730-
MACOSX_DEPLOYMENT_TARGET = 10.12;
736+
MACOSX_DEPLOYMENT_TARGET = 11.0;
731737
MTL_ENABLE_DEBUG_INFO = NO;
732738
MTL_FAST_MATH = YES;
733739
SDKROOT = macosx;
@@ -747,6 +753,7 @@
747753
CODE_SIGN_STYLE = Automatic;
748754
COMBINE_HIDPI_IMAGES = YES;
749755
CURRENT_PROJECT_VERSION = 2;
756+
DEAD_CODE_STRIPPING = YES;
750757
DEFINES_MODULE = YES;
751758
DEVELOPMENT_TEAM = C72Z63N8M5;
752759
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -777,6 +784,7 @@
777784
CODE_SIGN_STYLE = Automatic;
778785
COMBINE_HIDPI_IMAGES = YES;
779786
CURRENT_PROJECT_VERSION = 2;
787+
DEAD_CODE_STRIPPING = YES;
780788
DEFINES_MODULE = YES;
781789
DEVELOPMENT_TEAM = C72Z63N8M5;
782790
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -804,6 +812,7 @@
804812
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
805813
CODE_SIGN_STYLE = Automatic;
806814
COMBINE_HIDPI_IMAGES = YES;
815+
DEAD_CODE_STRIPPING = YES;
807816
DEVELOPMENT_TEAM = C72Z63N8M5;
808817
INFOPLIST_FILE = Tests/MarkdownKitTests/Info.plist;
809818
LD_RUNPATH_SEARCH_PATHS = (
@@ -824,6 +833,7 @@
824833
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
825834
CODE_SIGN_STYLE = Automatic;
826835
COMBINE_HIDPI_IMAGES = YES;
836+
DEAD_CODE_STRIPPING = YES;
827837
DEVELOPMENT_TEAM = C72Z63N8M5;
828838
INFOPLIST_FILE = Tests/MarkdownKitTests/Info.plist;
829839
LD_RUNPATH_SEARCH_PATHS = (
@@ -843,6 +853,7 @@
843853
buildSettings = {
844854
CODE_SIGN_IDENTITY = "-";
845855
CODE_SIGN_STYLE = Automatic;
856+
DEAD_CODE_STRIPPING = YES;
846857
DEVELOPMENT_TEAM = C72Z63N8M5;
847858
PRODUCT_NAME = "$(TARGET_NAME)";
848859
SWIFT_VERSION = 5.0;
@@ -854,6 +865,7 @@
854865
buildSettings = {
855866
CODE_SIGN_IDENTITY = "-";
856867
CODE_SIGN_STYLE = Automatic;
868+
DEAD_CODE_STRIPPING = YES;
857869
DEVELOPMENT_TEAM = C72Z63N8M5;
858870
PRODUCT_NAME = "$(TARGET_NAME)";
859871
SWIFT_VERSION = 5.0;

MarkdownKit.xcodeproj/xcshareddata/xcschemes/MarkdownKit iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1420"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

MarkdownKit.xcodeproj/xcshareddata/xcschemes/MarkdownKit.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1200"
3+
LastUpgradeVersion = "1420"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

MarkdownKit.xcodeproj/xcshareddata/xcschemes/MarkdownKitProcess.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1200"
3+
LastUpgradeVersion = "1420"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// `swift test`
1414
//
1515
// Created by Matthias Zenger on 09/08/2019.
16-
// Copyright © 2019-2022 Google LLC.
16+
// Copyright © 2019-2023 Google LLC.
1717
//
1818
// Licensed under the Apache License, Version 2.0 (the "License");
1919
// you may not use this file except in compliance with the License.

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<p>
44
<a href="https://developer.apple.com/osx/"><img src="https://img.shields.io/badge/Platform-macOS%20%7C%20iOS%20%7C%20Linux-blue.svg?style=flat" alt="Platform: macOS | iOS | Linux" /></a>
5-
<a href="https://developer.apple.com/swift/"><img src="https://img.shields.io/badge/Language-Swift%205.5-green.svg?style=flat" alt="Language: Swift 5.5" /></a>
6-
<a href="https://developer.apple.com/xcode/"><img src="https://img.shields.io/badge/IDE-Xcode%2013-orange.svg?style=flat" alt="IDE: Xcode 13" /></a>
5+
<a href="https://developer.apple.com/swift/"><img src="https://img.shields.io/badge/Language-Swift%205.7-green.svg?style=flat" alt="Language: Swift 5.7" /></a>
6+
<a href="https://developer.apple.com/xcode/"><img src="https://img.shields.io/badge/IDE-Xcode%2014-orange.svg?style=flat" alt="IDE: Xcode 14" /></a>
77
<a href="https://raw.githubusercontent.com/objecthub/swift-markdownkit/master/LICENSE"><img src="http://img.shields.io/badge/License-Apache-lightgrey.svg?style=flat" alt="License: Apache" /></a>
88
</p>
99

@@ -369,12 +369,12 @@ The command-line tool can be compiled with the _Swift Package Manager_, so _Xcod
369369
for that. Similarly, just for compiling the framework and trying the command-line tool in _Xcode_, the
370370
_Swift Package Manager_ is not needed.
371371

372-
- [Xcode 13](https://developer.apple.com/xcode/)
373-
- [Swift 5.5](https://developer.apple.com/swift/)
372+
- [Xcode 14](https://developer.apple.com/xcode/)
373+
- [Swift 5.7](https://developer.apple.com/swift/)
374374
- [Swift Package Manager](https://swift.org/package-manager/)
375375

376376
## Copyright
377377

378378
Author: Matthias Zenger (<matthias@objecthub.net>)
379-
Copyright © 2019-2022 Google LLC.
379+
Copyright © 2019-2023 Google LLC.
380380
_Please note: This is not an official Google product._

Sources/MarkdownKit/AttributedString/Color.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
extension NSColor {
4646

4747
public var hexString: String {
48-
guard let rgb = self.usingColorSpaceName(NSColorSpaceName.calibratedRGB) else {
48+
guard let rgb = self.usingColorSpace(NSColorSpace.deviceRGB) else {
4949
return "#FFFFFF"
5050
}
5151
let red = Int(round(rgb.redComponent * 0xff))

Sources/MarkdownKit/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSHumanReadableCopyright</key>
22-
<string>Copyright © 2019-2022 Google LLC.</string>
22+
<string>Copyright © 2019-2023 Google LLC.</string>
2323
</dict>
2424
</plist>

Tests/MarkdownKitTests/MarkdownASTests.swift

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,19 @@
33
// MarkdownKitTests
44
//
55
// Created by Matthias Zenger on 26/02/2022.
6-
// Copyright © 2022 Matthias Zenger. All rights reserved.
6+
// Copyright © 2022 Google LLC.
7+
//
8+
// Licensed under the Apache License, Version 2.0 (the "License");
9+
// you may not use this file except in compliance with the License.
10+
// You may obtain a copy of the License at
11+
//
12+
// http://www.apache.org/licenses/LICENSE-2.0
13+
//
14+
// Unless required by applicable law or agreed to in writing, software
15+
// distributed under the License is distributed on an "AS IS" BASIS,
16+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
// See the License for the specific language governing permissions and
18+
// limitations under the License.
719
//
820

921
import XCTest

0 commit comments

Comments
 (0)