Skip to content

Commit 6cc9840

Browse files
gonzalezrealgonzalezreal
authored
Add proper support for Xcode 11 and SPM (#14)
* Remove podspec * Use Equatable synthesized conformance * Remove Playgrounds * Move source code * Update package manifest * Update README
1 parent 94d9735 commit 6cc9840

File tree

17 files changed

+69
-172
lines changed

17 files changed

+69
-172
lines changed

‎Markup.podspec‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎Markup.xcodeproj/project.pbxproj‎

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88

99
/* Begin PBXBuildFile section */
1010
52D6D9871BEFF229002C0205 /* Markup.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D97C1BEFF229002C0205 /* Markup.framework */; };
11+
820C3D182328DB1200C3845B /* MarkupParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 820C3D162328DB1200C3845B /* MarkupParserTests.swift */; };
12+
820C3D192328DB1200C3845B /* MarkupParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 820C3D162328DB1200C3845B /* MarkupParserTests.swift */; };
13+
820C3D1A2328DB1200C3845B /* MarkupParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 820C3D162328DB1200C3845B /* MarkupParserTests.swift */; };
14+
820C3D1B2328DB1200C3845B /* MarkupRendererTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 820C3D172328DB1200C3845B /* MarkupRendererTests.swift */; };
15+
820C3D1C2328DB1200C3845B /* MarkupRendererTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 820C3D172328DB1200C3845B /* MarkupRendererTests.swift */; };
16+
820C3D1D2328DB1200C3845B /* MarkupRendererTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 820C3D172328DB1200C3845B /* MarkupRendererTests.swift */; };
1117
99211A5E1F279AAE0039BB88 /* MarkupNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99211A591F279AAE0039BB88 /* MarkupNode.swift */; };
1218
99211A5F1F279AAE0039BB88 /* MarkupNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99211A591F279AAE0039BB88 /* MarkupNode.swift */; };
1319
99211A601F279AAE0039BB88 /* MarkupNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99211A591F279AAE0039BB88 /* MarkupNode.swift */; };
@@ -28,12 +34,6 @@
2834
99211A6F1F279AAE0039BB88 /* MarkupTokenizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99211A5D1F279AAE0039BB88 /* MarkupTokenizer.swift */; };
2935
99211A701F279AAE0039BB88 /* MarkupTokenizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99211A5D1F279AAE0039BB88 /* MarkupTokenizer.swift */; };
3036
99211A711F279AAE0039BB88 /* MarkupTokenizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99211A5D1F279AAE0039BB88 /* MarkupTokenizer.swift */; };
31-
99211A771F279C0A0039BB88 /* MarkupParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99211A721F279BCF0039BB88 /* MarkupParserTests.swift */; };
32-
99211A781F279C0D0039BB88 /* MarkupParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99211A721F279BCF0039BB88 /* MarkupParserTests.swift */; };
33-
99211A791F279C0E0039BB88 /* MarkupParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99211A721F279BCF0039BB88 /* MarkupParserTests.swift */; };
34-
99E800001F28814500AAE464 /* MarkupRendererTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99E8FFFF1F28814500AAE464 /* MarkupRendererTests.swift */; };
35-
99E800011F28814500AAE464 /* MarkupRendererTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99E8FFFF1F28814500AAE464 /* MarkupRendererTests.swift */; };
36-
99E800021F28814500AAE464 /* MarkupRendererTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99E8FFFF1F28814500AAE464 /* MarkupRendererTests.swift */; };
3737
DD7502881C68FEDE006590AF /* Markup.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6DA0F1BF000BD002C0205 /* Markup.framework */; };
3838
DD7502921C690C7A006590AF /* Markup.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D9F01BEFFFBE002C0205 /* Markup.framework */; };
3939
/* End PBXBuildFile section */
@@ -68,13 +68,13 @@
6868
52D6D9E21BEFFF6E002C0205 /* Markup.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Markup.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6969
52D6D9F01BEFFFBE002C0205 /* Markup.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Markup.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7070
52D6DA0F1BF000BD002C0205 /* Markup.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Markup.framework; sourceTree = BUILT_PRODUCTS_DIR; };
71+
820C3D162328DB1200C3845B /* MarkupParserTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkupParserTests.swift; sourceTree = "<group>"; };
72+
820C3D172328DB1200C3845B /* MarkupRendererTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkupRendererTests.swift; sourceTree = "<group>"; };
7173
99211A591F279AAE0039BB88 /* MarkupNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkupNode.swift; sourceTree = "<group>"; };
7274
99211A5A1F279AAE0039BB88 /* MarkupParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkupParser.swift; sourceTree = "<group>"; };
7375
99211A5B1F279AAE0039BB88 /* MarkupRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkupRenderer.swift; sourceTree = "<group>"; };
7476
99211A5C1F279AAE0039BB88 /* MarkupToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkupToken.swift; sourceTree = "<group>"; };
7577
99211A5D1F279AAE0039BB88 /* MarkupTokenizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkupTokenizer.swift; sourceTree = "<group>"; };
76-
99211A721F279BCF0039BB88 /* MarkupParserTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkupParserTests.swift; sourceTree = "<group>"; };
77-
99E8FFFF1F28814500AAE464 /* MarkupRendererTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkupRendererTests.swift; sourceTree = "<group>"; };
7878
AD2FAA261CD0B6D800659CF4 /* Markup.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Markup.plist; sourceTree = "<group>"; };
7979
AD2FAA281CD0B6E100659CF4 /* MarkupTests.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = MarkupTests.plist; sourceTree = "<group>"; };
8080
DD75027A1C68FCFC006590AF /* Markup-macOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Markup-macOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -141,7 +141,7 @@
141141
isa = PBXGroup;
142142
children = (
143143
8933C7811EB5B7E0000D00A4 /* Sources */,
144-
8933C7831EB5B7EB000D00A4 /* Tests */,
144+
820C3D142328DB1200C3845B /* Tests */,
145145
52D6D99C1BEFF38C002C0205 /* Configs */,
146146
52D6D97D1BEFF229002C0205 /* Products */,
147147
);
@@ -170,7 +170,24 @@
170170
path = Configs;
171171
sourceTree = "<group>";
172172
};
173-
8933C7811EB5B7E0000D00A4 /* Sources */ = {
173+
820C3D142328DB1200C3845B /* Tests */ = {
174+
isa = PBXGroup;
175+
children = (
176+
820C3D152328DB1200C3845B /* MarkupTests */,
177+
);
178+
path = Tests;
179+
sourceTree = "<group>";
180+
};
181+
820C3D152328DB1200C3845B /* MarkupTests */ = {
182+
isa = PBXGroup;
183+
children = (
184+
820C3D162328DB1200C3845B /* MarkupParserTests.swift */,
185+
820C3D172328DB1200C3845B /* MarkupRendererTests.swift */,
186+
);
187+
path = MarkupTests;
188+
sourceTree = "<group>";
189+
};
190+
820C3D1E2328DB2500C3845B /* Markup */ = {
174191
isa = PBXGroup;
175192
children = (
176193
99211A591F279AAE0039BB88 /* MarkupNode.swift */,
@@ -179,17 +196,15 @@
179196
99211A5C1F279AAE0039BB88 /* MarkupToken.swift */,
180197
99211A5D1F279AAE0039BB88 /* MarkupTokenizer.swift */,
181198
);
182-
path = Sources;
199+
path = Markup;
183200
sourceTree = "<group>";
184201
};
185-
8933C7831EB5B7EB000D00A4 /* Tests */ = {
202+
8933C7811EB5B7E0000D00A4 /* Sources */ = {
186203
isa = PBXGroup;
187204
children = (
188-
99211A721F279BCF0039BB88 /* MarkupParserTests.swift */,
189-
99E8FFFF1F28814500AAE464 /* MarkupRendererTests.swift */,
205+
820C3D1E2328DB2500C3845B /* Markup */,
190206
);
191-
name = Tests;
192-
path = Tests/MarkupTests;
207+
path = Sources;
193208
sourceTree = "<group>";
194209
};
195210
DD7502721C68FC1B006590AF /* Frameworks */ = {
@@ -580,8 +595,8 @@
580595
isa = PBXSourcesBuildPhase;
581596
buildActionMask = 2147483647;
582597
files = (
583-
99E800001F28814500AAE464 /* MarkupRendererTests.swift in Sources */,
584-
99211A771F279C0A0039BB88 /* MarkupParserTests.swift in Sources */,
598+
820C3D1B2328DB1200C3845B /* MarkupRendererTests.swift in Sources */,
599+
820C3D182328DB1200C3845B /* MarkupParserTests.swift in Sources */,
585600
);
586601
runOnlyForDeploymentPostprocessing = 0;
587602
};
@@ -625,17 +640,17 @@
625640
isa = PBXSourcesBuildPhase;
626641
buildActionMask = 2147483647;
627642
files = (
628-
99E800011F28814500AAE464 /* MarkupRendererTests.swift in Sources */,
629-
99211A781F279C0D0039BB88 /* MarkupParserTests.swift in Sources */,
643+
820C3D1C2328DB1200C3845B /* MarkupRendererTests.swift in Sources */,
644+
820C3D192328DB1200C3845B /* MarkupParserTests.swift in Sources */,
630645
);
631646
runOnlyForDeploymentPostprocessing = 0;
632647
};
633648
DD7502891C690C7A006590AF /* Sources */ = {
634649
isa = PBXSourcesBuildPhase;
635650
buildActionMask = 2147483647;
636651
files = (
637-
99E800021F28814500AAE464 /* MarkupRendererTests.swift in Sources */,
638-
99211A791F279C0E0039BB88 /* MarkupParserTests.swift in Sources */,
652+
820C3D1D2328DB1200C3845B /* MarkupRendererTests.swift in Sources */,
653+
820C3D1A2328DB1200C3845B /* MarkupParserTests.swift in Sources */,
639654
);
640655
runOnlyForDeploymentPostprocessing = 0;
641656
};

‎Markup.xcworkspace/contents.xcworkspacedata‎

Lines changed: 0 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
1+
// swift-tools-version:5.1
2+
13
import PackageDescription
24

35
let package = Package(
4-
name: "Markup"
6+
name: "Markup",
7+
platforms: [
8+
.iOS(.v8),
9+
.macOS(.v10_10),
10+
.tvOS(.v9),
11+
.watchOS(.v2)
12+
],
13+
products: [
14+
.library(name: "Markup", targets: ["Markup"]),
15+
],
16+
targets: [
17+
.target(name: "Markup", dependencies: []),
18+
.testTarget(name: "MarkupTests", dependencies: ["Markup"]),
19+
]
520
)

‎Playgrounds/Parser.playground/Contents.swift‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎Playgrounds/Parser.playground/contents.xcplayground‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Playgrounds/Renderer.playground/Contents.swift‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Playgrounds/Renderer.playground/contents.xcplayground‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Playgrounds/Tokenizer.playground/Contents.swift‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎Playgrounds/Tokenizer.playground/contents.xcplayground‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)