Updated PBX and Xcode classes to inherit from NSObject

Author: TheAngryDarling

Sources/PBXProj/PBXProj.swift

@@ -12,7 +12,7 @@ import Dispatch
 
 
 /// Class that represents an Xcode PBX Project file
-public class PBXProj: Codable {
+public class PBXProj: NSObject, Codable {
     internal enum CodingKeys: String, CodingKey {
         case archiveVersion
         case objectVersion
@@ -106,6 +106,8 @@ public class PBXProj: Codable {
         self.rootObject = "ROOT_REFERENCE"
         self.objects = PBXObjects()
 
+        super.init()
+        
         self.objects.proj = self
 
         if objectVersion >= 50 { self.idGenFunc = generateNewUUIDReference }
@@ -186,6 +188,8 @@ public class PBXProj: Codable {
         self.rootObject = try container.decode(PBXReference.self, forKey: .rootObject)
         self.objects = try container.decode(PBXObjects.self, forKey: .objects)
 
+        super.init()
+        
         self.objects.proj = self
 
         self.project = self.objects.object(withReference: self.rootObject, asType: PBXProject.self)!

Sources/PBXProj/objects/PBXObject.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 /// A base class for all PBX Objects
-public class PBXObject: Codable {
+public class PBXObject: NSObject, Codable {
 
     /// Base PBX Object Coding Keys
     internal enum ObjectCodingKeys: String, CodingKey {
@@ -43,13 +43,15 @@ public class PBXObject: Codable {
     internal init(id: PBXReference, type: PBXObjectType) {
         self.id = id
         self.type = type
+        super.init()
     }
 
     public required init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy:  ObjectCodingKeys.self)
 
         self.id = try container.decode(PBXReference.self, forKey: .id)
         self.type = try container.decode(PBXObjectType.self, forKey: .type)
+        super.init()
     }
 
     public func encode(to encoder: Encoder) throws {

Sources/PBXProj/objects/PBXObjects.swift

@@ -9,7 +9,7 @@ import Foundation
 import AdvancedCodableHelpers
 import RawRepresentableHelpers
 
-public final class PBXObjects: Codable {
+public final class PBXObjects: NSObject, Codable {
     public enum ObjectError: Error {
         case objectNotFound(PBXReference)
         case castingFailure(PBXObject, Any.Type)
@@ -34,12 +34,17 @@ public final class PBXObjects: Codable {
     public var containerProxyItems: [PBXContainerItemProxy] { return self.of(type: PBXContainerItemProxy.self) }
 
     /// Create new instance of PBXObjects
-    internal init() { }
+    internal override init() {
+        super.init()
+    }
     /// Create new instance of PBXObjects
     ///
     /// - Parameter objects: The objects to initialize with
     fileprivate init(_ objects: [PBXObject]) {
         self.objects = objects
+        
+        super.init()
+        
         for o in self.objects {
             o.objectList = self
         }

Sources/PBXProj/objects/attributes/PBXProductType.swift

@@ -9,7 +9,7 @@ import Foundation
 import CustomCoders
 import AdvancedCodableHelpers
 
-public final class XCSharedData {
+public final class XCSharedData: NSObject {
 
     private static let IDE_WORKSPACE_CHECKS_FILE_NAME: String = "IDEWorkspaceChecks.plist"
     private static let WORKSPACE_SETTINGS_FILE_NAME: String = "WorkspaceSettings.xcsettings"
@@ -25,13 +25,16 @@ public final class XCSharedData {
         didSet { self.hasWorkspaceSettingsChanged = true }
     }
 
-    public init() {
+    public override var debugDescription: String { return "XCSharedData(\(self.schemes.debugDescription))" }
+    
+    public override init() {
         self.schemes = XCSchemes()
         self.ideWorkspaceChecks = [:]
         self.workspaceSettings = [:]
 
         // Setup defaults
         self.ideWorkspaceChecks["IDEDidComputeMac32BitWarning"] = true
+        super.init()
 
     }
 
@@ -74,6 +77,7 @@ public final class XCSharedData {
 
         self.schemes = try XCSchemes(from: url.appendingDirComponent(XCSchemes.SCHEMES_FOLDER),
                                      usingFSProvider: provider)
+        super.init()
     }
 
     /// Get all save actions that are needed
@@ -154,7 +158,3 @@ public final class XCSharedData {
 
     }
 }
-
-extension XCSharedData: CustomDebugStringConvertible {
-    public var debugDescription: String { return "XCSharedData(\(self.schemes.debugDescription))" }
-}

Sources/PBXProj/objects/buildPhases/PBXShellScriptBuildPhase.swift

@@ -20,7 +20,7 @@ fileprivate extension String {
     }
 }
 
-public final class XCSchemes {
+public final class XCSchemes: NSObject {
 
     public static let SCHEMES_FOLDER: String = "xcschemes"
     private static let MANAGEMENT_SETTINGS_FILE: String = "xcschememanagement.plist"
@@ -35,13 +35,24 @@ public final class XCSchemes {
         didSet { self.hasProjectSchemesChanged = true }
     }
 
+    public override var debugDescription: String {
+        var rtn: String = "XCSchemes["
+        for (i, scheme) in self.projectSchemes.keys.enumerated() {
+            if i > 0 { rtn += ", " }
+            rtn += "\(scheme): \(self.projectSchemes[scheme]!)"
+        }
+        rtn += "]"
+        return rtn
+    }
+    
 
     /// Create new empty instance of an empty Scheme List
-    public init() {
+    public override init() {
         self.hasManagementChanged = true
         self.management = [:]
         self.projectSchemes = [:]
         self.hasProjectSchemesChanged = true
+        super.init()
     }
 
     /// Create new insatance of a Scheme List
@@ -84,6 +95,7 @@ public final class XCSchemes {
         } else {
             throw XcodeFileSystemProviderErrors.invalidResults
         }
+        super.init()
 
     }
 
@@ -179,15 +191,3 @@ public final class XCSchemes {
 
     }
 }
-
-extension XCSchemes: CustomDebugStringConvertible {
-    public var debugDescription: String {
-        var rtn: String = "XCSchemes["
-        for (i, scheme) in self.projectSchemes.keys.enumerated() {
-            if i > 0 { rtn += ", " }
-            rtn += "\(scheme): \(self.projectSchemes[scheme]!)"
-        }
-        rtn += "]"
-        return rtn
-    }
-}

Sources/XcodeProj/XCWorkspace/objects/XCSharedData.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-public final class XCUserData {
+public final class XCUserData: NSObject {
 
     public enum Error: Swift.Error {
         //case urlNotFileBased(URL)
@@ -25,6 +25,10 @@ public final class XCUserData {
     /// The debugging data
     public let debugger: XCDebugger
 
+    public override var debugDescription: String {
+        return "XCUserData(\(self.user): \(self.schemes.debugDescription))"
+    }
+    
     /// Create new instance of a User Data from file
     ///
     /// - Parameters:
@@ -53,6 +57,7 @@ public final class XCUserData {
         // Load Debugger info
         self.debugger = try XCDebugger(from: url.appendingDirComponent(XCDebugger.DEBUGGER_FOLDER_NAME),
                                        usingFSProvider: provider)
+        super.init()
 
     }
 
@@ -96,9 +101,3 @@ public final class XCUserData {
 
     }
 }
-
-extension XCUserData: CustomDebugStringConvertible {
-    public var debugDescription: String {
-        return "XCUserData(\(self.user): \(self.schemes.debugDescription))"
-    }
-}

Sources/XcodeProj/XCWorkspace/objects/XCShemes.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 /// Stores all the user data
-public final class XCUserDataList {
+public final class XCUserDataList: NSObject {
 
     public enum Error: Swift.Error {
         //case urlNotFileBased(URL)
@@ -25,8 +25,20 @@ public final class XCUserDataList {
         set { self.users[index] = newValue }
     }
 
+    public override var debugDescription: String {
+        var rtn: String = "XCUserDataList["
+        for (i, user) in self.users.enumerated() {
+            if i > 0 { rtn += ", " }
+            rtn += user.debugDescription
+        }
+        rtn += "]"
+        return rtn
+    }
+    
     /// Create a new empty instance of a User Data List
-    public init() {}
+    public override init() {
+        super.init()
+    }
     /// Create a new instance of a User Data List from file
     ///
     /// - Parameters:
@@ -45,6 +57,7 @@ public final class XCUserDataList {
                 }
             }
         }
+        super.init()
 
     }
 
@@ -112,15 +125,3 @@ extension XCUserDataList: Sequence {
         return self.users.makeIterator()
     }
 }
-
-extension XCUserDataList: CustomDebugStringConvertible {
-    public var debugDescription: String {
-        var rtn: String = "XCUserDataList["
-        for (i, user) in self.users.enumerated() {
-            if i > 0 { rtn += ", " }
-            rtn += user.debugDescription
-        }
-        rtn += "]"
-        return rtn
-    }
-}

Sources/XcodeProj/XCWorkspace/objects/XCUserData.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 
-public final class XCWorkspace {
+public final class XCWorkspace: NSObject {
 
     /// Shared Data folder name
     internal static let SHARED_DATA_FOLDER_NAME: String = "xcshareddata"
@@ -39,6 +39,7 @@ public final class XCWorkspace {
         self.sharedData = try XCSharedData(fromURL: url.appendingDirComponent(XCWorkspace.SHARED_DATA_FOLDER_NAME), usingFSProvider: provider)
         self.userdataList = try XCUserDataList(fromURL: url.appendingDirComponent(XCWorkspace.USER_DATA_LIST_FOLDER_NAME),
                                                usingFSProvider: provider)
+        super.init()
     }
 
     /// Get all save actions that are needed

Sources/XcodeProj/XCWorkspace/objects/XCUserDataList.swift

@@ -10,7 +10,7 @@ import RawRepresentableHelpers
 
 
  /// The debugging package where debugging data is stored
- public class XCDebugger {
+public class XCDebugger: NSObject {
 
     /// the debugging package folder name
     public static let DEBUGGER_FOLDER_NAME: String = "xcdebugger"
@@ -21,8 +21,9 @@ import RawRepresentableHelpers
     let breakpoints: Breakpoints
 
     /// Create a new debugging package
-    public init() {
+    public override init() {
         self.breakpoints = Breakpoints()
+        super.init()
     }
 
     /// Load a debugging package from the given path
@@ -34,6 +35,7 @@ import RawRepresentableHelpers
 
         self.breakpoints = try Breakpoints(fromURL: url.appendingFileComponent(XCDebugger.BreakpointsFileName),
                                            usingFSProvider: provider)
+        super.init()
 
     }
 

Sources/XcodeProj/XCWorkspace/objects/XCWorkspace.swift

@@ -15,7 +15,7 @@ import Foundation
 extension XCDebugger {
 
     /// The collection of breakpoints for the project for the given user
-    public class Breakpoints {
+    public class Breakpoints: NSObject {
 
         public enum Error: Swift.Error {
             case schemeDocumentMissingRootNode
@@ -26,7 +26,7 @@ extension XCDebugger {
         }
 
         /// An action to perform on a breakpoint
-        public class BreakpointAction {
+        public class BreakpointAction: NSObject {
 
             /// The breakpoint action type
             ///
@@ -107,6 +107,7 @@ extension XCDebugger {
             /// - Parameter actionType: The action type of this acion
             public init(actionType: ActionType) {
                 self.actionType = actionType
+                super.init()
             }
 
             /// Decode the breakpoint action from the given xml element
@@ -117,6 +118,7 @@ extension XCDebugger {
                     throw Error.attributeNotFound(attribute: "ActionExtensionID", path: element.xPath)
                 }
                 self.actionType = ActionType(rawValue: atNode.stringValue!)
+                super.init()
             }
 
             /// Encodes the given action into an XMLElement
@@ -391,7 +393,7 @@ extension XCDebugger {
         }
 
         /// A project breakpoint
-        public class Breakpoint {
+        public class Breakpoint: NSObject {
             /// The type of breakpoint
             ///
             /// - fileBreakPoint: A file breakpoint
@@ -441,6 +443,7 @@ extension XCDebugger {
             public let breakpointType: BreakpointType
             public init(breakpointType: BreakpointType) {
                 self.breakpointType = breakpointType
+                super.init()
             }
 
             /// Decode the breakpoint from the given xml element
@@ -451,6 +454,7 @@ extension XCDebugger {
                     throw Error.attributeNotFound(attribute: "BreakpointExtensionID", path: element.xPath)
                 }
                 self.breakpointType = BreakpointType(rawValue: atNode.stringValue!)
+                super.init()
             }
 
             /// Encodes the given breakpoint into an XMLElement
@@ -592,10 +596,11 @@ extension XCDebugger {
 
 
         /// Create new empty breakpoints list
-        public init() {
+        public override init() {
             self.type = 1
             self.version = 2.0
             self.breakpoints = []
+            super.init()
         }
 
         /// Create new breakpoints list from the xml data