Skip to content

Commit de93370

Browse files
consuelitaconsuelita
committed
Deprecation and Import Cleanup
Fixed deprecation warnings and removed unneeded imports
1 parent 8cf919e commit de93370

13 files changed

Lines changed: 41 additions & 102 deletions

File tree

‎AdversaryLabSwift.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
AE17920924DCC55F00620B5E /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = AE17920824DCC55F00620B5E /* ZIPFoundation */; };
3333
AE17920C24DCC5AB00620B5E /* Symphony in Frameworks */ = {isa = PBXBuildFile; productRef = AE17920B24DCC5AB00620B5E /* Symphony */; };
3434
AE17920E24DCC5AB00620B5E /* Song in Frameworks */ = {isa = PBXBuildFile; productRef = AE17920D24DCC5AB00620B5E /* Song */; };
35-
AE17921124DCC5CE00620B5E /* Auburn in Frameworks */ = {isa = PBXBuildFile; productRef = AE17921024DCC5CE00620B5E /* Auburn */; };
3635
AE17921424DCC5E900620B5E /* Datable in Frameworks */ = {isa = PBXBuildFile; productRef = AE17921324DCC5E900620B5E /* Datable */; };
3736
AE17921724DCC61500620B5E /* Abacus in Frameworks */ = {isa = PBXBuildFile; productRef = AE17921624DCC61500620B5E /* Abacus */; };
3837
AE1AC6FA2258020500555456 /* MLModelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE1AC6F92258020500555456 /* MLModelController.swift */; };
@@ -57,6 +56,7 @@
5756
AEA17599286D0D3500B6EBE0 /* LabData.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEA17598286D0D3500B6EBE0 /* LabData.swift */; };
5857
AEA1759B286DACD000B6EBE0 /* ChartsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEA1759A286DACD000B6EBE0 /* ChartsView.swift */; };
5958
AEA1759E286DBA4800B6EBE0 /* SwiftUICharts in Frameworks */ = {isa = PBXBuildFile; productRef = AEA1759D286DBA4800B6EBE0 /* SwiftUICharts */; };
59+
AEA175A1286E001600B6EBE0 /* Auburn in Frameworks */ = {isa = PBXBuildFile; productRef = AEA175A0286E001600B6EBE0 /* Auburn */; };
6060
AEC00A2423733A0800E5582B /* ConnectionGroupData.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEC00A2323733A0800E5582B /* ConnectionGroupData.swift */; };
6161
AED8490622B8465000998CC6 /* OperatorReportController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AED8490522B8465000998CC6 /* OperatorReportController.swift */; };
6262
AEE50AFF228FBE8C009698CC /* Alerts.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE50AFE228FBE8C009698CC /* Alerts.swift */; };
@@ -160,11 +160,11 @@
160160
buildActionMask = 2147483647;
161161
files = (
162162
AE17921424DCC5E900620B5E /* Datable in Frameworks */,
163+
AEA175A1286E001600B6EBE0 /* Auburn in Frameworks */,
163164
AE17920624DCC53800620B5E /* RawPacket in Frameworks */,
164165
AE0BC8DF2280923E00AD89E7 /* Security.framework in Frameworks */,
165166
AE17921724DCC61500620B5E /* Abacus in Frameworks */,
166167
AE0BC8AE226F87A400AD89E7 /* ServiceManagement.framework in Frameworks */,
167-
AE17921124DCC5CE00620B5E /* Auburn in Frameworks */,
168168
AE17920C24DCC5AB00620B5E /* Symphony in Frameworks */,
169169
AE17920E24DCC5AB00620B5E /* Song in Frameworks */,
170170
AE51B04B2519C4D90086668A /* libswiftCreateML.tbd in Frameworks */,
@@ -379,10 +379,10 @@
379379
AE17920824DCC55F00620B5E /* ZIPFoundation */,
380380
AE17920B24DCC5AB00620B5E /* Symphony */,
381381
AE17920D24DCC5AB00620B5E /* Song */,
382-
AE17921024DCC5CE00620B5E /* Auburn */,
383382
AE17921324DCC5E900620B5E /* Datable */,
384383
AE17921624DCC61500620B5E /* Abacus */,
385384
AEA1759D286DBA4800B6EBE0 /* SwiftUICharts */,
385+
AEA175A0286E001600B6EBE0 /* Auburn */,
386386
);
387387
productName = AdversaryLabSwift;
388388
productReference = 4651A14D20083BF700037D31 /* AdversaryLabSwift.app */;
@@ -466,10 +466,10 @@
466466
AE17920424DCC53800620B5E /* XCRemoteSwiftPackageReference "AdversaryLabClientSwift" */,
467467
AE17920724DCC55F00620B5E /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
468468
AE17920A24DCC5AB00620B5E /* XCRemoteSwiftPackageReference "Song" */,
469-
AE17920F24DCC5CE00620B5E /* XCRemoteSwiftPackageReference "Auburn" */,
470469
AE17921224DCC5E900620B5E /* XCRemoteSwiftPackageReference "Datable" */,
471470
AE17921524DCC61500620B5E /* XCRemoteSwiftPackageReference "Abacus" */,
472471
AEA1759C286DBA4800B6EBE0 /* XCRemoteSwiftPackageReference "SwiftUICharts" */,
472+
AEA1759F286E001600B6EBE0 /* XCRemoteSwiftPackageReference "Auburn" */,
473473
);
474474
productRefGroup = 4651A14E20083BF700037D31 /* Products */;
475475
projectDirPath = "";
@@ -923,14 +923,6 @@
923923
minimumVersion = 0.0.23;
924924
};
925925
};
926-
AE17920F24DCC5CE00620B5E /* XCRemoteSwiftPackageReference "Auburn" */ = {
927-
isa = XCRemoteSwiftPackageReference;
928-
repositoryURL = "https://github.com/OperatorFoundation/Auburn.git";
929-
requirement = {
930-
kind = upToNextMajorVersion;
931-
minimumVersion = 0.6.2;
932-
};
933-
};
934926
AE17921224DCC5E900620B5E /* XCRemoteSwiftPackageReference "Datable" */ = {
935927
isa = XCRemoteSwiftPackageReference;
936928
repositoryURL = "https://github.com/OperatorFoundation/Datable.git";
@@ -955,6 +947,14 @@
955947
minimumVersion = 2.0.0;
956948
};
957949
};
950+
AEA1759F286E001600B6EBE0 /* XCRemoteSwiftPackageReference "Auburn" */ = {
951+
isa = XCRemoteSwiftPackageReference;
952+
repositoryURL = "https://github.com/OperatorFoundation/Auburn.git";
953+
requirement = {
954+
kind = upToNextMajorVersion;
955+
minimumVersion = 0.6.2;
956+
};
957+
};
958958
/* End XCRemoteSwiftPackageReference section */
959959

960960
/* Begin XCSwiftPackageProductDependency section */
@@ -978,11 +978,6 @@
978978
package = AE17920A24DCC5AB00620B5E /* XCRemoteSwiftPackageReference "Song" */;
979979
productName = Song;
980980
};
981-
AE17921024DCC5CE00620B5E /* Auburn */ = {
982-
isa = XCSwiftPackageProductDependency;
983-
package = AE17920F24DCC5CE00620B5E /* XCRemoteSwiftPackageReference "Auburn" */;
984-
productName = Auburn;
985-
};
986981
AE17921324DCC5E900620B5E /* Datable */ = {
987982
isa = XCSwiftPackageProductDependency;
988983
package = AE17921224DCC5E900620B5E /* XCRemoteSwiftPackageReference "Datable" */;
@@ -998,6 +993,11 @@
998993
package = AEA1759C286DBA4800B6EBE0 /* XCRemoteSwiftPackageReference "SwiftUICharts" */;
999994
productName = SwiftUICharts;
1000995
};
996+
AEA175A0286E001600B6EBE0 /* Auburn */ = {
997+
isa = XCSwiftPackageProductDependency;
998+
package = AEA1759F286E001600B6EBE0 /* XCRemoteSwiftPackageReference "Auburn" */;
999+
productName = Auburn;
1000+
};
10011001
/* End XCSwiftPackageProductDependency section */
10021002
};
10031003
rootObject = 4651A14520083BF700037D31 /* Project object */;

‎AdversaryLabSwift/Base.lproj/Main.storyboard‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -716,14 +716,12 @@
716716
<rect key="frame" x="4" y="4" width="279" height="281"/>
717717
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
718718
<subviews>
719-
<imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Smf-4j-n6x">
719+
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="Smf-4j-n6x">
720720
<rect key="frame" x="-29" y="-72" width="356" height="406"/>
721-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
722721
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyDown" image="al-256" id="gEa-Eq-R2K"/>
723722
</imageView>
724-
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KIV-L6-1gO">
723+
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KIV-L6-1gO">
725724
<rect key="frame" x="68" y="114" width="143" height="32"/>
726-
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
727725
<buttonCell key="cell" type="push" title="Start a New Lab" bezelStyle="rounded" image="NSAddTemplate" imagePosition="leading" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ABJ-Ra-uc9">
728726
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
729727
<font key="font" size="14" name="Hubballi-Regular"/>
@@ -734,6 +732,14 @@
734732
</connections>
735733
</button>
736734
</subviews>
735+
<constraints>
736+
<constraint firstItem="Smf-4j-n6x" firstAttribute="leading" secondItem="J0M-t7-QSy" secondAttribute="leading" constant="-29" id="JP0-XV-FiZ"/>
737+
<constraint firstItem="KIV-L6-1gO" firstAttribute="centerY" secondItem="Smf-4j-n6x" secondAttribute="centerY" id="L6U-6J-5Zy"/>
738+
<constraint firstAttribute="trailing" secondItem="Smf-4j-n6x" secondAttribute="trailing" constant="-48" id="OXH-Ot-gGm"/>
739+
<constraint firstItem="KIV-L6-1gO" firstAttribute="top" secondItem="J0M-t7-QSy" secondAttribute="top" constant="140" id="RaV-yj-pOh"/>
740+
<constraint firstItem="Smf-4j-n6x" firstAttribute="top" secondItem="J0M-t7-QSy" secondAttribute="top" constant="-53" id="laY-aT-FZ5"/>
741+
<constraint firstItem="KIV-L6-1gO" firstAttribute="centerX" secondItem="J0M-t7-QSy" secondAttribute="centerX" id="lxx-1N-y4M"/>
742+
</constraints>
737743
</view>
738744
<color key="borderColor" red="0.6394116862" green="0.49871700149999998" blue="0.79499363729999994" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
739745
<color key="fillColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

‎AdversaryLabSwift/Controllers/DataProcessing.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import Foundation
1010

1111
import Abacus
1212
import Auburn
13-
import Symphony
1413
import RawPacket
14+
import Symphony
1515

1616
class DataProcessing
1717
{

‎AdversaryLabSwift/Controllers/FakeConnectionGenerator.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//
88

99
import Foundation
10+
1011
import Auburn
11-
import RedShot
1212
import Datable
1313

1414
class FakeConnectionGenerator

‎AdversaryLabSwift/Controllers/OperatorReportController.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import Foundation
1010
import Cocoa
1111
import Quartz
12+
1213
import Auburn
1314

1415
/**

‎AdversaryLabSwift/CoreMLFeatures/AllFeatures.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
// Copyright © 2019 Operator Foundation. All rights reserved.
77
//
88

9-
import Foundation
10-
import Auburn
119
import CreateML
1210
import CoreML
11+
import Foundation
12+
13+
import Auburn
1314

1415
class AllFeatures
1516
{

‎AdversaryLabSwift/CoreMLFeatures/TLS12CoreML.swift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
//
88

99
import Foundation
10+
import CoreML
11+
import CreateML
12+
1013
import Auburn
1114
import Datable
12-
import CreateML
13-
import CoreML
15+
1416

1517
let tlsRequestStart=Data([0x16, 0x03])
1618
let tlsResponseStart=Data([0x16, 0x03])

‎AdversaryLabSwift/CoreMLFeatures/TimingCoreML.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import Foundation
1010
import CreateML
1111
import CoreML
1212

13-
import Auburn
14-
1513
class TimingCoreML
1614
{
1715
// TODO: Currently not using error

‎AdversaryLabSwift/Features/Protocols/KnownProtocols.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88

99
import Foundation
10-
import Auburn
1110

1211
func detectKnownProtocol(connection: ObservedConnection) -> KnownProtocolType? {
1312
if TLS12CoreML().isTls12(forConnection: connection) {

‎AdversaryLabSwift/Features/Sequences.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//
88

99
import Foundation
10+
1011
import Auburn
11-
import RedShot
1212
import Datable
1313

1414
func processSequences(forConnection connection: ObservedConnection) -> (processed: Bool, error: Error?)

0 commit comments

Comments
 (0)