Cleanup

Author: consuelita

AdversaryLabSwift.xcodeproj/project.pbxproj

@@ -33,7 +33,6 @@
 		AE17920C24DCC5AB00620B5E /* Symphony in Frameworks */ = {isa = PBXBuildFile; productRef = AE17920B24DCC5AB00620B5E /* Symphony */; };
 		AE17920E24DCC5AB00620B5E /* Song in Frameworks */ = {isa = PBXBuildFile; productRef = AE17920D24DCC5AB00620B5E /* Song */; };
 		AE17921424DCC5E900620B5E /* Datable in Frameworks */ = {isa = PBXBuildFile; productRef = AE17921324DCC5E900620B5E /* Datable */; };
-		AE17921724DCC61500620B5E /* Abacus in Frameworks */ = {isa = PBXBuildFile; productRef = AE17921624DCC61500620B5E /* Abacus */; };
 		AE1AC6FA2258020500555456 /* MLModelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE1AC6F92258020500555456 /* MLModelController.swift */; };
 		AE1D466B24EC5BF900344541 /* PacketTimings.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE1D466A24EC5BF900344541 /* PacketTimings.swift */; };
 		AE1D466D24EC5C6500344541 /* PacketEntropies.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE1D466C24EC5C6500344541 /* PacketEntropies.swift */; };
@@ -57,6 +56,7 @@
 		AEA1759B286DACD000B6EBE0 /* ChartsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEA1759A286DACD000B6EBE0 /* ChartsView.swift */; };
 		AEA1759E286DBA4800B6EBE0 /* SwiftUICharts in Frameworks */ = {isa = PBXBuildFile; productRef = AEA1759D286DBA4800B6EBE0 /* SwiftUICharts */; };
 		AEA175A1286E001600B6EBE0 /* Auburn in Frameworks */ = {isa = PBXBuildFile; productRef = AEA175A0286E001600B6EBE0 /* Auburn */; };
+		AEA175A4286E076500B6EBE0 /* Abacus in Frameworks */ = {isa = PBXBuildFile; productRef = AEA175A3286E076500B6EBE0 /* Abacus */; };
 		AEC00A2423733A0800E5582B /* ConnectionGroupData.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEC00A2323733A0800E5582B /* ConnectionGroupData.swift */; };
 		AED8490622B8465000998CC6 /* OperatorReportController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AED8490522B8465000998CC6 /* OperatorReportController.swift */; };
 		AEE50AFF228FBE8C009698CC /* Alerts.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE50AFE228FBE8C009698CC /* Alerts.swift */; };
@@ -163,11 +163,11 @@
 				AEA175A1286E001600B6EBE0 /* Auburn in Frameworks */,
 				AE17920624DCC53800620B5E /* RawPacket in Frameworks */,
 				AE0BC8DF2280923E00AD89E7 /* Security.framework in Frameworks */,
-				AE17921724DCC61500620B5E /* Abacus in Frameworks */,
 				AE0BC8AE226F87A400AD89E7 /* ServiceManagement.framework in Frameworks */,
 				AE17920C24DCC5AB00620B5E /* Symphony in Frameworks */,
 				AE17920E24DCC5AB00620B5E /* Song in Frameworks */,
 				AE51B04B2519C4D90086668A /* libswiftCreateML.tbd in Frameworks */,
+				AEA175A4286E076500B6EBE0 /* Abacus in Frameworks */,
 				AEA1759E286DBA4800B6EBE0 /* SwiftUICharts in Frameworks */,
 				AE17920924DCC55F00620B5E /* ZIPFoundation in Frameworks */,
 			);
@@ -380,9 +380,9 @@
 				AE17920B24DCC5AB00620B5E /* Symphony */,
 				AE17920D24DCC5AB00620B5E /* Song */,
 				AE17921324DCC5E900620B5E /* Datable */,
-				AE17921624DCC61500620B5E /* Abacus */,
 				AEA1759D286DBA4800B6EBE0 /* SwiftUICharts */,
 				AEA175A0286E001600B6EBE0 /* Auburn */,
+				AEA175A3286E076500B6EBE0 /* Abacus */,
 			);
 			productName = AdversaryLabSwift;
 			productReference = 4651A14D20083BF700037D31 /* AdversaryLabSwift.app */;
@@ -467,9 +467,9 @@
 				AE17920724DCC55F00620B5E /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
 				AE17920A24DCC5AB00620B5E /* XCRemoteSwiftPackageReference "Song" */,
 				AE17921224DCC5E900620B5E /* XCRemoteSwiftPackageReference "Datable" */,
-				AE17921524DCC61500620B5E /* XCRemoteSwiftPackageReference "Abacus" */,
 				AEA1759C286DBA4800B6EBE0 /* XCRemoteSwiftPackageReference "SwiftUICharts" */,
 				AEA1759F286E001600B6EBE0 /* XCRemoteSwiftPackageReference "Auburn" */,
+				AEA175A2286E076500B6EBE0 /* XCRemoteSwiftPackageReference "Abacus" */,
 			);
 			productRefGroup = 4651A14E20083BF700037D31 /* Products */;
 			projectDirPath = "";
@@ -931,14 +931,6 @@
 				minimumVersion = 3.0.2;
 			};
 		};
-		AE17921524DCC61500620B5E /* XCRemoteSwiftPackageReference "Abacus" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/OperatorFoundation/Abacus.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.2;
-			};
-		};
 		AEA1759C286DBA4800B6EBE0 /* XCRemoteSwiftPackageReference "SwiftUICharts" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/willdale/SwiftUICharts.git";
@@ -955,6 +947,14 @@
 				minimumVersion = 0.6.2;
 			};
 		};
+		AEA175A2286E076500B6EBE0 /* XCRemoteSwiftPackageReference "Abacus" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/OperatorFoundation/Abacus.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.0.0;
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -983,11 +983,6 @@
 			package = AE17921224DCC5E900620B5E /* XCRemoteSwiftPackageReference "Datable" */;
 			productName = Datable;
 		};
-		AE17921624DCC61500620B5E /* Abacus */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = AE17921524DCC61500620B5E /* XCRemoteSwiftPackageReference "Abacus" */;
-			productName = Abacus;
-		};
 		AEA1759D286DBA4800B6EBE0 /* SwiftUICharts */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = AEA1759C286DBA4800B6EBE0 /* XCRemoteSwiftPackageReference "SwiftUICharts" */;
@@ -998,6 +993,11 @@
 			package = AEA1759F286E001600B6EBE0 /* XCRemoteSwiftPackageReference "Auburn" */;
 			productName = Auburn;
 		};
+		AEA175A3286E076500B6EBE0 /* Abacus */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = AEA175A2286E076500B6EBE0 /* XCRemoteSwiftPackageReference "Abacus" */;
+			productName = Abacus;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 4651A14520083BF700037D31 /* Project object */;

AdversaryLabSwift/Controllers/DataProcessing.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 
-import Abacus
 import Auburn
 import RawPacket
 import Symphony

AdversaryLabSwift/Helpers/Globals.swift

@@ -6,11 +6,7 @@
 //  Copyright © 2019 Operator Foundation. All rights reserved.
 //
 
-import Cocoa
 import Foundation
-import SwiftUI
-
-import Abacus
 
 var modelDirectoryURL: URL?
 

AdversaryLabSwift/Models/PacketEntropies.swift

@@ -8,8 +8,6 @@
 
 import Foundation
 
-import Abacus
-
 struct PacketEntropies: Codable
 {
     var incomingA: [Double] = []

AdversaryLabSwift/Models/PacketTimings.swift

@@ -8,8 +8,6 @@
 
 import Foundation
 
-import Abacus
-
 struct PacketTimings: Codable
 {
     var transportA: [Double] = []