Skip to content

Commit 7913e39

Browse files
millenomimundaym
authored andcommitted
Correctly make SwiftFoundationXML depend on SwiftFoundation; add diagnostics as we did for …Networking.
1 parent d70383e commit 7913e39

File tree

2 files changed

+32
-14
lines changed

2 files changed

+32
-14
lines changed

Foundation.xcodeproj/project.pbxproj

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -524,13 +524,6 @@
524524
remoteGlobalIDString = 15500FA722EA24D10088F082;
525525
remoteInfo = CFXMLInterface;
526526
};
527-
1550111522EA42780088F082 /* PBXContainerItemProxy */ = {
528-
isa = PBXContainerItemProxy;
529-
containerPortal = 5B5D88541BBC938800234F36 /* Project object */;
530-
proxyType = 1;
531-
remoteGlobalIDString = 15500FA722EA24D10088F082;
532-
remoteInfo = CFXMLInterface;
533-
};
534527
1550111922EA43E00088F082 /* PBXContainerItemProxy */ = {
535528
isa = PBXContainerItemProxy;
536529
containerPortal = 5B5D88541BBC938800234F36 /* Project object */;
@@ -566,6 +559,13 @@
566559
remoteGlobalIDString = 5B5D885C1BBC938800234F36;
567560
remoteInfo = SwiftFoundation;
568561
};
562+
15F14D3922EB9F80001598B5 /* PBXContainerItemProxy */ = {
563+
isa = PBXContainerItemProxy;
564+
containerPortal = 5B5D88541BBC938800234F36 /* Project object */;
565+
proxyType = 1;
566+
remoteGlobalIDString = 5B5D885C1BBC938800234F36;
567+
remoteInfo = SwiftFoundation;
568+
};
569569
15FF00CF22934C39004AD205 /* PBXContainerItemProxy */ = {
570570
isa = PBXContainerItemProxy;
571571
containerPortal = 5B5D88541BBC938800234F36 /* Project object */;
@@ -2402,8 +2402,8 @@
24022402
buildRules = (
24032403
);
24042404
dependencies = (
2405+
15F14D3A22EB9F80001598B5 /* PBXTargetDependency */,
24052406
1550110C22EA26780088F082 /* PBXTargetDependency */,
2406-
1550111622EA42780088F082 /* PBXTargetDependency */,
24072407
);
24082408
name = SwiftFoundationXML;
24092409
productName = CoreFoundation;
@@ -3125,11 +3125,6 @@
31253125
target = 15500FA722EA24D10088F082 /* CFXMLInterface */;
31263126
targetProxy = 1550110B22EA26780088F082 /* PBXContainerItemProxy */;
31273127
};
3128-
1550111622EA42780088F082 /* PBXTargetDependency */ = {
3129-
isa = PBXTargetDependency;
3130-
target = 15500FA722EA24D10088F082 /* CFXMLInterface */;
3131-
targetProxy = 1550111522EA42780088F082 /* PBXContainerItemProxy */;
3132-
};
31333128
1550111A22EA43E00088F082 /* PBXTargetDependency */ = {
31343129
isa = PBXTargetDependency;
31353130
target = 1550106E22EA266B0088F082 /* SwiftFoundationXML */;
@@ -3155,6 +3150,11 @@
31553150
target = 5B5D885C1BBC938800234F36 /* SwiftFoundation */;
31563151
targetProxy = 15B80445228F39B200B30FF6 /* PBXContainerItemProxy */;
31573152
};
3153+
15F14D3A22EB9F80001598B5 /* PBXTargetDependency */ = {
3154+
isa = PBXTargetDependency;
3155+
target = 5B5D885C1BBC938800234F36 /* SwiftFoundation */;
3156+
targetProxy = 15F14D3922EB9F80001598B5 /* PBXContainerItemProxy */;
3157+
};
31583158
15FF00D022934C39004AD205 /* PBXTargetDependency */ = {
31593159
isa = PBXTargetDependency;
31603160
target = 15FF0006229348F2004AD205 /* CFURLSessionInterface */;

Foundation/NSObjCRuntime.swift

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ public func NSClassFromString(_ aClassName: String) -> AnyClass? {
438438
return _typeByName(aClassNameWithPrefix) as? AnyClass
439439
}
440440

441-
// The following types have been moved to FoundationNetworking. They exist here only to allow appropriate diagnostics to surface in the compiler.
441+
// The following types have been moved to FoundationNetworking or FoundationXML. They exist here only to allow appropriate diagnostics to surface in the compiler.
442442

443443
@available(*, unavailable, message: "This type has moved to the FoundationNetworking module. Import that module to use it.")
444444
public typealias CachedURLResponse = AnyObject
@@ -493,3 +493,21 @@ public typealias URLProtectionSpace = AnyObject
493493

494494
@available(*, unavailable, message: "This type has moved to the FoundationNetworking module. Import that module to use it.")
495495
public typealias URLProtocol = AnyObject
496+
497+
@available(*, unavailable, message: "This type has moved to the FoundationXML module. Import that module to use it.")
498+
public typealias XMLDTD = AnyObject
499+
500+
@available(*, unavailable, message: "This type has moved to the FoundationXML module. Import that module to use it.")
501+
public typealias XMLDTDNode = AnyObject
502+
503+
@available(*, unavailable, message: "This type has moved to the FoundationXML module. Import that module to use it.")
504+
public typealias XMLDocument = AnyObject
505+
506+
@available(*, unavailable, message: "This type has moved to the FoundationXML module. Import that module to use it.")
507+
public typealias XMLElement = AnyObject
508+
509+
@available(*, unavailable, message: "This type has moved to the FoundationXML module. Import that module to use it.")
510+
public typealias XMLNode = AnyObject
511+
512+
@available(*, unavailable, message: "This type has moved to the FoundationXML module. Import that module to use it.")
513+
public typealias XMLParser = AnyObject

0 commit comments

Comments
 (0)