Skip to content

Commit 4a8a787

Browse files
chrisballingerchrisballinger
committed
Merge branch 'swiftless' of https://github.com/MacPass/KissXML into MacPass-swiftless
2 parents 56ca42b + 3522ea3 commit 4a8a787

File tree

5 files changed

+35
-67
lines changed

5 files changed

+35
-67
lines changed

‎KissXML.xcodeproj/project.pbxproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
0DCD8DE81E54A3C6001D9832 /* NSString+DDXML.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCD8DD91E54A3C6001D9832 /* NSString+DDXML.h */; settings = {ATTRIBUTES = (Public, ); }; };
1313
0DCD8DE91E54A3C6001D9832 /* NSString+DDXML.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DDA1E54A3C6001D9832 /* NSString+DDXML.m */; };
1414
0DCD8DEA1E54A3C6001D9832 /* DDXML.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCD8DDB1E54A3C6001D9832 /* DDXML.h */; settings = {ATTRIBUTES = (Public, ); }; };
15-
0DCD8DEB1E54A3C6001D9832 /* DDXML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DDC1E54A3C6001D9832 /* DDXML.swift */; };
1615
0DCD8DEC1E54A3C6001D9832 /* DDXMLDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCD8DDD1E54A3C6001D9832 /* DDXMLDocument.h */; settings = {ATTRIBUTES = (Public, ); }; };
1716
0DCD8DED1E54A3C6001D9832 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DDE1E54A3C6001D9832 /* DDXMLDocument.m */; };
1817
0DCD8DEE1E54A3C6001D9832 /* DDXMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCD8DDF1E54A3C6001D9832 /* DDXMLElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -22,7 +21,6 @@
2221
0DCD8DF21E54A3C6001D9832 /* KissXML.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCD8DE31E54A3C6001D9832 /* KissXML.h */; settings = {ATTRIBUTES = (Public, ); }; };
2322
0DCD8DF31E54A3C6001D9832 /* DDXMLPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCD8DE51E54A3C6001D9832 /* DDXMLPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
2423
D94131A21E5CEB7800189BD5 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DCD8DF51E54A3E9001D9832 /* libxml2.tbd */; };
25-
D94131A51E5CEBE700189BD5 /* DDXML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DDC1E54A3C6001D9832 /* DDXML.swift */; };
2624
D94131A61E5CEBE700189BD5 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DD71E54A3C6001D9832 /* DDXMLElementAdditions.m */; };
2725
D94131A71E5CEBE700189BD5 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DDE1E54A3C6001D9832 /* DDXMLDocument.m */; };
2826
D94131A81E5CEBE700189BD5 /* DDXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DE21E54A3C6001D9832 /* DDXMLNode.m */; };
@@ -37,7 +35,6 @@
3735
D94131B31E5CEBE700189BD5 /* DDXMLElementAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCD8DD61E54A3C6001D9832 /* DDXMLElementAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
3836
D94131B41E5CEBE700189BD5 /* KissXML.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCD8DE31E54A3C6001D9832 /* KissXML.h */; settings = {ATTRIBUTES = (Public, ); }; };
3937
D94131B51E5CEBE700189BD5 /* DDXMLPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCD8DE51E54A3C6001D9832 /* DDXMLPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
40-
D94131BE1E5CEC8300189BD5 /* DDXML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DDC1E54A3C6001D9832 /* DDXML.swift */; };
4138
D94131BF1E5CEC8300189BD5 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DD71E54A3C6001D9832 /* DDXMLElementAdditions.m */; };
4239
D94131C01E5CEC8300189BD5 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DDE1E54A3C6001D9832 /* DDXMLDocument.m */; };
4340
D94131C11E5CEC8300189BD5 /* DDXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DE21E54A3C6001D9832 /* DDXMLNode.m */; };
@@ -52,7 +49,6 @@
5249
D94131CC1E5CEC8300189BD5 /* DDXMLElementAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCD8DD61E54A3C6001D9832 /* DDXMLElementAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
5350
D94131CD1E5CEC8300189BD5 /* KissXML.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCD8DE31E54A3C6001D9832 /* KissXML.h */; settings = {ATTRIBUTES = (Public, ); }; };
5451
D94131CE1E5CEC8300189BD5 /* DDXMLPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCD8DE51E54A3C6001D9832 /* DDXMLPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
55-
D94131D71E5CECC700189BD5 /* DDXML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DDC1E54A3C6001D9832 /* DDXML.swift */; };
5652
D94131D81E5CECC700189BD5 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DD71E54A3C6001D9832 /* DDXMLElementAdditions.m */; };
5753
D94131D91E5CECC700189BD5 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DDE1E54A3C6001D9832 /* DDXMLDocument.m */; };
5854
D94131DA1E5CECC700189BD5 /* DDXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD8DE21E54A3C6001D9832 /* DDXMLNode.m */; };
@@ -77,7 +73,6 @@
7773
0DCD8DD91E54A3C6001D9832 /* NSString+DDXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+DDXML.h"; sourceTree = "<group>"; };
7874
0DCD8DDA1E54A3C6001D9832 /* NSString+DDXML.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+DDXML.m"; sourceTree = "<group>"; };
7975
0DCD8DDB1E54A3C6001D9832 /* DDXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXML.h; sourceTree = "<group>"; };
80-
0DCD8DDC1E54A3C6001D9832 /* DDXML.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DDXML.swift; sourceTree = "<group>"; };
8176
0DCD8DDD1E54A3C6001D9832 /* DDXMLDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLDocument.h; sourceTree = "<group>"; };
8277
0DCD8DDE1E54A3C6001D9832 /* DDXMLDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDXMLDocument.m; sourceTree = "<group>"; };
8378
0DCD8DDF1E54A3C6001D9832 /* DDXMLElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLElement.h; sourceTree = "<group>"; };
@@ -154,7 +149,6 @@
154149
0DCD8DD51E54A3C6001D9832 /* Additions */,
155150
0DCD8DD81E54A3C6001D9832 /* Categories */,
156151
0DCD8DDB1E54A3C6001D9832 /* DDXML.h */,
157-
0DCD8DDC1E54A3C6001D9832 /* DDXML.swift */,
158152
0DCD8DDD1E54A3C6001D9832 /* DDXMLDocument.h */,
159153
0DCD8DDE1E54A3C6001D9832 /* DDXMLDocument.m */,
160154
0DCD8DDF1E54A3C6001D9832 /* DDXMLElement.h */,
@@ -418,7 +412,6 @@
418412
isa = PBXSourcesBuildPhase;
419413
buildActionMask = 2147483647;
420414
files = (
421-
0DCD8DEB1E54A3C6001D9832 /* DDXML.swift in Sources */,
422415
0DCD8DE71E54A3C6001D9832 /* DDXMLElementAdditions.m in Sources */,
423416
0DCD8DED1E54A3C6001D9832 /* DDXMLDocument.m in Sources */,
424417
0DCD8DF11E54A3C6001D9832 /* DDXMLNode.m in Sources */,
@@ -431,7 +424,6 @@
431424
isa = PBXSourcesBuildPhase;
432425
buildActionMask = 2147483647;
433426
files = (
434-
D94131A51E5CEBE700189BD5 /* DDXML.swift in Sources */,
435427
D94131A61E5CEBE700189BD5 /* DDXMLElementAdditions.m in Sources */,
436428
D94131A71E5CEBE700189BD5 /* DDXMLDocument.m in Sources */,
437429
D94131A81E5CEBE700189BD5 /* DDXMLNode.m in Sources */,
@@ -444,7 +436,6 @@
444436
isa = PBXSourcesBuildPhase;
445437
buildActionMask = 2147483647;
446438
files = (
447-
D94131BE1E5CEC8300189BD5 /* DDXML.swift in Sources */,
448439
D94131BF1E5CEC8300189BD5 /* DDXMLElementAdditions.m in Sources */,
449440
D94131C01E5CEC8300189BD5 /* DDXMLDocument.m in Sources */,
450441
D94131C11E5CEC8300189BD5 /* DDXMLNode.m in Sources */,
@@ -457,7 +448,6 @@
457448
isa = PBXSourcesBuildPhase;
458449
buildActionMask = 2147483647;
459450
files = (
460-
D94131D71E5CECC700189BD5 /* DDXML.swift in Sources */,
461451
D94131D81E5CECC700189BD5 /* DDXMLElementAdditions.m in Sources */,
462452
D94131D91E5CECC700189BD5 /* DDXMLDocument.m in Sources */,
463453
D94131DA1E5CECC700189BD5 /* DDXMLNode.m in Sources */,

‎KissXML/DDXML.swift

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

‎KissXML/DDXMLDocument.h

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
**/
2222

2323
enum {
24-
DDXMLDocumentXMLKind = 0,
25-
DDXMLDocumentXHTMLKind,
26-
DDXMLDocumentHTMLKind,
27-
DDXMLDocumentTextKind
24+
DDXMLDocumentXMLKind NS_SWIFT_NAME(XMLDocumentXMLKind) = 0,
25+
DDXMLDocumentXHTMLKind NS_SWIFT_NAME(XMLDocumentXHTMLKind),
26+
DDXMLDocumentHTMLKind NS_SWIFT_NAME(XMLDocumentHTMLKind),
27+
DDXMLDocumentTextKind NS_SWIFT_NAME(XMLDocumentTextKind)
2828
};
29-
typedef NSUInteger DDXMLDocumentContentKind;
29+
typedef NSUInteger DDXMLDocumentContentKind NS_SWIFT_NAME(XMLDocumentContentKind);
3030

3131
NS_ASSUME_NONNULL_BEGIN
3232
@interface DDXMLDocument : DDXMLNode
@@ -83,4 +83,7 @@ NS_ASSUME_NONNULL_BEGIN
8383
//- (BOOL)validateAndReturnError:(NSError **)error;
8484

8585
@end
86-
NS_ASSUME_NONNULL_END
86+
#if TARGET_OS_IPHONE || TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_WATCH
87+
@compatibility_alias XMLDocument DDXMLDocument;
88+
#endif
89+
NS_ASSUME_NONNULL_END

‎KissXML/DDXMLElement.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,7 @@ NS_ASSUME_NONNULL_BEGIN
6363
//- (void)normalizeAdjacentTextNodesPreservingCDATA:(BOOL)preserve;
6464

6565
@end
66+
#if TARGET_OS_IPHONE || TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_WATCH
67+
@compatibility_alias XMLElement DDXMLElement;
68+
#endif
6669
NS_ASSUME_NONNULL_END

‎KissXML/DDXMLNode.h

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@
2121
**/
2222

2323
enum {
24-
DDXMLInvalidKind = 0,
25-
DDXMLDocumentKind,
26-
DDXMLElementKind,
27-
DDXMLAttributeKind,
28-
DDXMLNamespaceKind,
29-
DDXMLProcessingInstructionKind,
30-
DDXMLCommentKind,
31-
DDXMLTextKind,
32-
DDXMLDTDKind,
33-
DDXMLEntityDeclarationKind,
34-
DDXMLAttributeDeclarationKind,
35-
DDXMLElementDeclarationKind,
36-
DDXMLNotationDeclarationKind
24+
DDXMLInvalidKind NS_SWIFT_NAME(XMLInvalidKind) = 0,
25+
DDXMLDocumentKind NS_SWIFT_NAME(XMLDocumentKind),
26+
DDXMLElementKind NS_SWIFT_NAME(XMLElementKind),
27+
DDXMLAttributeKind NS_SWIFT_NAME(XMLAttributeKind),
28+
DDXMLNamespaceKind NS_SWIFT_NAME(XMLNamespaceKind),
29+
DDXMLProcessingInstructionKind NS_SWIFT_NAME(XMLProcessingInstructionKind),
30+
DDXMLCommentKind NS_SWIFT_NAME(XMLCommentKind),
31+
DDXMLTextKind NS_SWIFT_NAME(XMLTextKind),
32+
DDXMLDTDKind NS_SWIFT_NAME(XMLDTDKind),
33+
DDXMLEntityDeclarationKind NS_SWIFT_NAME(XMLEntityDeclarationKind),
34+
DDXMLAttributeDeclarationKind NS_SWIFT_NAME(XMLAttributeDeclarationKind),
35+
DDXMLElementDeclarationKind NS_SWIFT_NAME(XMLElementDeclarationKind),
36+
DDXMLNotationDeclarationKind NS_SWIFT_NAME(XMLNotationDeclarationKind)
3737
};
38-
typedef NSUInteger DDXMLNodeKind;
38+
typedef NSUInteger DDXMLNodeKind NS_SWIFT_NAME(XMLNodeKind);
3939

4040
enum {
41-
DDXMLNodeOptionsNone = 0,
42-
DDXMLNodeExpandEmptyElement = 1 << 1,
43-
DDXMLNodeCompactEmptyElement = 1 << 2,
44-
DDXMLNodePrettyPrint = 1 << 17,
41+
DDXMLNodeOptionsNone NS_SWIFT_NAME(XMLNodeOptionsNone) = 0,
42+
DDXMLNodeExpandEmptyElement NS_SWIFT_NAME(XMLNodeExpandEmptyElement) = 1 << 1,
43+
DDXMLNodeCompactEmptyElement NS_SWIFT_NAME(XMLNodeCompactEmptyElement) = 1 << 2,
44+
DDXMLNodePrettyPrint NS_SWIFT_NAME(XMLNodePrettyPrint) = 1 << 17,
4545
};
4646

4747

@@ -138,4 +138,8 @@ NS_ASSUME_NONNULL_BEGIN
138138
//- (NSArray *)objectsForXQuery:(NSString *)xquery error:(NSError **)error;
139139

140140
@end
141-
NS_ASSUME_NONNULL_END
141+
#if TARGET_OS_IPHONE || TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_WATCH
142+
@compatibility_alias XMLNode DDXMLNode;
143+
#endif
144+
145+
NS_ASSUME_NONNULL_END

0 commit comments

Comments
 (0)