Remove dead code, dependencies

alicerunsonfedora · alicerunsonfedora · commit 1cab298a558c · 2026-01-17T15:58:21.000-05:00
diff --git a/Alidade.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Alidade.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/AlidadeUI/Tests/AlidadeUITests/FiniteColorPickerTests.swift b/AlidadeUI/Tests/AlidadeUITests/FiniteColorPickerTests.swift
@@ -51,11 +51,9 @@ struct FiniteColorPickerTests {
         let picker = FiniteColorPicker("", selection: color, in: Self.colors)
         let sut = try picker.inspect()
 
-        Testchamber.assumeRedWindowBreaks {
-            let button = try sut.find(viewWithTag: expectedColor)
-            try button.button().tap()
-            #expect(color.wrappedValue == expectedColor)
-        }
+        let button = try sut.find(viewWithTag: expectedColor)
+        try button.button().tap()
+        #expect(color.wrappedValue == expectedColor)
     }
 
     @Test(.tags(.finiteColorPicker))
diff --git a/AllTests.xctestplan b/AllTests.xctestplan
@@ -54,7 +54,7 @@
       "target" : {
         "containerPath" : "container:MCMaps.xcodeproj",
         "identifier" : "950402DF2D4D522200F51903",
-        "name" : "MCMapsTests"
+        "name" : "AlidadeTests"
       }
     }
   ],
diff --git a/MCMaps.xcodeproj/project.pbxproj b/MCMaps.xcodeproj/project.pbxproj
@@ -15,11 +15,9 @@
 		95317F2E2F0B0FB9007BCDA0 /* ImageProcessing in Frameworks */ = {isa = PBXBuildFile; productRef = 95317F2D2F0B0FB9007BCDA0 /* ImageProcessing */; };
 		953CBB1D2E12FBD400C54DFD /* Testchamber in Frameworks */ = {isa = PBXBuildFile; productRef = 953CBB1C2E12FBD400C54DFD /* Testchamber */; };
 		954489A82E2D66BD0088B879 /* MCMap in Frameworks */ = {isa = PBXBuildFile; productRef = 954489A72E2D66BD0088B879 /* MCMap */; };
-		955A44382D8F47C600262A6D /* AdaptableSidebarSheetView in Frameworks */ = {isa = PBXBuildFile; productRef = 955A44372D8F47C600262A6D /* AdaptableSidebarSheetView */; };
 		955A4D682D932A6500262A6D /* DesignLibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 955A4D672D932A6500262A6D /* DesignLibrary */; };
 		955CD1652DAAE1BE007F6FA1 /* CubiomesKit in Frameworks */ = {isa = PBXBuildFile; productRef = 955CD1642DAAE1BE007F6FA1 /* CubiomesKit */; };
 		956603732EA588CC0049C15D /* AlidadeSearchEngine in Frameworks */ = {isa = PBXBuildFile; productRef = 956603722EA588CC0049C15D /* AlidadeSearchEngine */; };
-		95F6B0AD2DADE504006A1B8C /* AsyncAlgorithms in Frameworks */ = {isa = PBXBuildFile; productRef = 95F6B0AC2DADE504006A1B8C /* AsyncAlgorithms */; };
 		95FB72D02DE255630003CC61 /* AlidadeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 95FB72CF2DE255630003CC61 /* AlidadeUI */; };
 /* End PBXBuildFile section */
 
@@ -72,14 +70,12 @@
 			files = (
 				9504030F2D4D7E0A00F51903 /* CubiomesKit in Frameworks */,
 				9500D89E2F1229FA00B4A633 /* BedrockUI in Frameworks */,
-				955A44382D8F47C600262A6D /* AdaptableSidebarSheetView in Frameworks */,
 				95FB72D02DE255630003CC61 /* AlidadeUI in Frameworks */,
 				956603732EA588CC0049C15D /* AlidadeSearchEngine in Frameworks */,
 				955CD1652DAAE1BE007F6FA1 /* CubiomesKit in Frameworks */,
 				9500D89C2F1229FA00B4A633 /* Bedrock in Frameworks */,
 				955A4D682D932A6500262A6D /* DesignLibrary in Frameworks */,
 				95141F562F0874D200DAF47D /* DocumentKit in Frameworks */,
-				95F6B0AD2DADE504006A1B8C /* AsyncAlgorithms in Frameworks */,
 				954489A82E2D66BD0088B879 /* MCMap in Frameworks */,
 				95317F2E2F0B0FB9007BCDA0 /* ImageProcessing in Frameworks */,
 			);
@@ -138,10 +134,8 @@
 			name = Alidade;
 			packageProductDependencies = (
 				9504030E2D4D7E0A00F51903 /* CubiomesKit */,
-				955A44372D8F47C600262A6D /* AdaptableSidebarSheetView */,
 				955A4D672D932A6500262A6D /* DesignLibrary */,
 				955CD1642DAAE1BE007F6FA1 /* CubiomesKit */,
-				95F6B0AC2DADE504006A1B8C /* AsyncAlgorithms */,
 				95FB72CF2DE255630003CC61 /* AlidadeUI */,
 				954489A72E2D66BD0088B879 /* MCMap */,
 				956603722EA588CC0049C15D /* AlidadeSearchEngine */,
@@ -210,10 +204,8 @@
 			packageReferences = (
 				95DDE9652D57D0E1002B29D9 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */,
 				951FE2BA2D5937630091BE11 /* XCRemoteSwiftPackageReference "ViewInspector" */,
-				955A44362D8F47C600262A6D /* XCRemoteSwiftPackageReference "AdaptableSidebarSheetView" */,
 				955A4D662D932A6500262A6D /* XCLocalSwiftPackageReference "DesignLibrary" */,
 				955CD1632DAAE1BE007F6FA1 /* XCRemoteSwiftPackageReference "CubiomesKit" */,
-				95F6B0AB2DADE504006A1B8C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
 				95FB72CE2DE255630003CC61 /* XCLocalSwiftPackageReference "AlidadeUI" */,
 				953CBB1B2E12FBD400C54DFD /* XCLocalSwiftPackageReference "Testchamber" */,
 				954489A62E2D66BD0088B879 /* XCRemoteSwiftPackageReference "mcmap" */,
@@ -682,14 +674,6 @@
 				minimumVersion = 2.0.0;
 			};
 		};
-		955A44362D8F47C600262A6D /* XCRemoteSwiftPackageReference "AdaptableSidebarSheetView" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/AlidadeMC/AdaptableSidebarSheetView";
-			requirement = {
-				branch = main;
-				kind = branch;
-			};
-		};
 		955CD1632DAAE1BE007F6FA1 /* XCRemoteSwiftPackageReference "CubiomesKit" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://source.marquiskurt.net/AlidadeMC/CubiomesKit";
@@ -714,14 +698,6 @@
 				minimumVersion = 0.58.2;
 			};
 		};
-		95F6B0AB2DADE504006A1B8C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/apple/swift-async-algorithms.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.3;
-			};
-		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -763,11 +739,6 @@
 			package = 954489A62E2D66BD0088B879 /* XCRemoteSwiftPackageReference "mcmap" */;
 			productName = MCMap;
 		};
-		955A44372D8F47C600262A6D /* AdaptableSidebarSheetView */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 955A44362D8F47C600262A6D /* XCRemoteSwiftPackageReference "AdaptableSidebarSheetView" */;
-			productName = AdaptableSidebarSheetView;
-		};
 		955A4D672D932A6500262A6D /* DesignLibrary */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = DesignLibrary;
@@ -787,11 +758,6 @@
 			package = 95DDE9652D57D0E1002B29D9 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */;
 			productName = "plugin:SwiftLintBuildToolPlugin";
 		};
-		95F6B0AC2DADE504006A1B8C /* AsyncAlgorithms */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 95F6B0AB2DADE504006A1B8C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */;
-			productName = AsyncAlgorithms;
-		};
 		95FB72CF2DE255630003CC61 /* AlidadeUI */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = AlidadeUI;
diff --git a/MCMaps/Views/Search/CartographySearchView.swift b/MCMaps/Views/Search/CartographySearchView.swift
@@ -6,7 +6,6 @@
 //
 
 import AlidadeSearchEngine
-import AsyncAlgorithms
 import CubiomesKit
 import MCMap
 import SwiftUI
diff --git a/MCMapsTests/Views/Shared/LocationBadgeTests.swift b/MCMapsTests/Views/Shared/LocationBadgeTests.swift
@@ -32,16 +32,12 @@ struct LocationBadgeTests {
         let badge = LocationBadge(location: .init(x: 1847, y: 1847))
         let sut = try badge.inspect()
 
-        Testchamber.assumeRedWindowBreaks {
-            let hStack = try sut.hStack()
-            #expect(try hStack.background().shape().fillShapeStyle(Material.self) == .thinMaterial)
-
-            let label = try hStack.label(0)
-            #expect(try label.icon().image().actualImage() == Image(systemName: "location.fill"))
-            #expect(try label.title().text().string() == "X: 1847, Z: 1847")
-            #expect(label.hasPadding())
-            #expect(try label.padding() == .init(top: 3, leading: 6, bottom: 3, trailing: 6))
-        }
+        let hStack = try sut.hStack()
+        let label = try hStack.label(0)
+        #expect(try label.icon().image().actualImage() == Image(systemName: "location.fill"))
+        #expect(try label.title().text().string() == "X: 1847, Z: 1847")
+        #expect(label.hasPadding())
+        #expect(try label.padding() == .init(top: 3, leading: 6, bottom: 3, trailing: 6))
     }
 }
 
diff --git a/MCMapsTests/Views/Shared/WorldDimensionPickerViewTests.swift b/MCMapsTests/Views/Shared/WorldDimensionPickerViewTests.swift
@@ -26,26 +26,19 @@ struct WorldDimensionPickerViewTests {
         let overworld = try picker.label(0)
         #expect(try overworld.title().text().string() == "Overworld")
         #expect(try overworld.icon().image().actualImage() == Image(semanticIcon: .overworld))
-        Testchamber.assumeRedWindowBreaks {
-            let tag = try overworld.tag()
-            #expect(tag as? MinecraftWorld.Dimension == MinecraftWorld.Dimension.overworld)
-
-        }
+        let tag = try overworld.tag()
+        #expect(tag as? MinecraftWorld.Dimension == MinecraftWorld.Dimension.overworld)
 
         let nether = try picker.label(1)
         #expect(try nether.title().text().string() == "Nether")
         #expect(try nether.icon().image().actualImage() == Image(semanticIcon: .nether))
-        Testchamber.assumeRedWindowBreaks {
-            let tag = try nether.tag()
-            #expect(tag as? MinecraftWorld.Dimension == MinecraftWorld.Dimension.nether)
-        }
+        let netherTag = try nether.tag()
+        #expect(netherTag as? MinecraftWorld.Dimension == MinecraftWorld.Dimension.nether)
 
         let end = try picker.label(2)
         #expect(try end.title().text().string() == "End")
         #expect(try end.icon().image().actualImage() == Image(semanticIcon: .end))
-        Testchamber.assumeRedWindowBreaks {
-            let tag = try end.tag()
-            #expect(tag as? MinecraftWorld.Dimension == MinecraftWorld.Dimension.end)
-        }
+        let endTag = try end.tag()
+        #expect(endTag as? MinecraftWorld.Dimension == MinecraftWorld.Dimension.end)
     }
 }
diff --git a/Testchamber/Sources/Testchamber/Testchamber.swift b/Testchamber/Sources/Testchamber/Testchamber.swift
@@ -34,24 +34,4 @@ public enum Testchamber {
         return false
         #endif
     }
-
-    /// Run a test that is known to be faulty under the Red Window build scheme.
-    /// - Parameter comment: A corresponding comment for the issue.
-    /// - Parameter sourceLocation: Where the faulty call occurs.
-    /// - Parameter target: The test to be executed.
-    public static func assumeRedWindowBreaks(
-        _ comment: Comment? = nil,
-        at sourceLocation: SourceLocation = #_sourceLocation,
-        when target: @escaping () throws -> Void
-    ) {
-        if #available(iOS 19, macOS 16, *) {
-            withKnownIssue(comment, isIntermittent: true, sourceLocation: sourceLocation) {
-                try target()
-            }
-        } else {
-            #expect(throws: Never.self, sourceLocation: sourceLocation) {
-                try target()
-            }
-        }
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`"target" : {`
`55`	`55`	`"containerPath" : "container:MCMaps.xcodeproj",`
`56`	`56`	`"identifier" : "950402DF2D4D522200F51903",`
`57`		`- "name" : "MCMapsTests"`
	`57`	`+ "name" : "AlidadeTests"`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`],`