Move FeatureFlags into a local package

Author: alicerunsonfedora

Alidade.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,8 @@
+.DS_Store
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc

FeatureFlags/.gitignore

@@ -0,0 +1,26 @@
+// swift-tools-version: 6.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "FeatureFlags",
+    products: [
+        // Products define the executables and libraries a package produces, making them visible to other packages.
+        .library(
+            name: "FeatureFlags",
+            targets: ["FeatureFlags"]
+        ),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package, defining a module or a test suite.
+        // Targets can depend on other targets in this package and products from dependencies.
+        .target(
+            name: "FeatureFlags"
+        ),
+        .testTarget(
+            name: "FeatureFlagsTests",
+            dependencies: ["FeatureFlags"]
+        ),
+    ]
+)

FeatureFlags/Package.swift

@@ -9,22 +9,22 @@ import SwiftUI
 
 /// A property wrapper used to retrieve and store feature flag values in user defaults.
 @propertyWrapper
-struct FeatureFlagged {
+public struct FeatureFlagged {
     /// The feature flag being read from or written to.
-    var flag: FeatureFlag
+    public var flag: FeatureFlag
 
     /// The user defaults storage to interact with. Defaults to the standard user defaults.
-    var store: UserDefaults = .standard
+    public var store: UserDefaults = .standard
 
-    var wrappedValue: Bool {
+    public var wrappedValue: Bool {
         get { store.bool(forFeatureFlag: flag) }
         set { store.setValue(newValue, forFeatureFlag: flag) }
     }
 
     /// Create a feature flagged value.
     /// - Parameter flag: The flag to read from and/or write to.
     /// - Parameter store: The user defaults storage to interact with. Defaults to the standard user defaults.
-    init(_ flag: FeatureFlag, store: UserDefaults = .standard) {
+    public init(_ flag: FeatureFlag, store: UserDefaults = .standard) {
         self.flag = flag
         self.store = store
     }

…e Flags/FeatureFlagPropertyWrapper.swift …reFlags/FeatureFlagPropertyWrapper.swiftMCMaps/Shared/Feature Flags/FeatureFlagPropertyWrapper.swift renamed to FeatureFlags/Sources/FeatureFlags/FeatureFlagPropertyWrapper.swift MCMaps/Shared/Feature Flags/FeatureFlagPropertyWrapper.swift renamed to FeatureFlags/Sources/FeatureFlags/FeatureFlagPropertyWrapper.swift

@@ -20,15 +20,14 @@ import Foundation
 ///     @FeatureFlagged(.redWindow) private var useRedWindowDesign
 /// }
 /// ```
-enum FeatureFlag {
-}
+public enum FeatureFlag {}
 
 extension FeatureFlag {
     /// The name of the key as stored in User Defaults.
     ///
     /// This should also correspond to the key used in the app's Settings bundle, whenever applicable.
     var keyName: String {
-        ""
+        "noflag"
     }
 
     /// Whether the flag is enabled by default.
@@ -37,7 +36,7 @@ extension FeatureFlag {
     }
 }
 
-extension UserDefaults {
+public extension UserDefaults {
     /// Retrieve the flag value for a specified feature flag, or the default value if it isn't already set.
     /// - Parameter flag: The flag to retrieve the value of.
     func bool(forFeatureFlag flag: FeatureFlag) -> Bool {

…/Shared/Feature Flags/FeatureFlags.swift …/Sources/FeatureFlags/FeatureFlags.swiftMCMaps/Shared/Feature Flags/FeatureFlags.swift renamed to FeatureFlags/Sources/FeatureFlags/FeatureFlags.swift MCMaps/Shared/Feature Flags/FeatureFlags.swift renamed to FeatureFlags/Sources/FeatureFlags/FeatureFlags.swift

@@ -8,7 +8,7 @@
 import Foundation
 import Testing
 
-@testable import Alidade
+@testable import FeatureFlags
 
 struct FeatureFlagTests {
     @Test(.disabled("No new feature flags"))

MCMapsTests/FeatureFlagTests.swift …eatureFlagsTests/FeatureFlagsTests.swiftMCMapsTests/FeatureFlagTests.swift renamed to FeatureFlags/Tests/FeatureFlagsTests/FeatureFlagsTests.swift MCMapsTests/FeatureFlagTests.swift renamed to FeatureFlags/Tests/FeatureFlagsTests/FeatureFlagsTests.swift

@@ -7,17 +7,17 @@
 		<key>Alidade (Debugging).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 		<key>Alidade (Red Window).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>3</integer>
 		</dict>
 		<key>Alidade (Red Window, Debugging).xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>4</integer>
 		</dict>
 		<key>Alidade.xcscheme_^#shared#^_</key>
 		<dict>
@@ -27,12 +27,12 @@
 		<key>Sanity Tests (Red Window).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>7</integer>
 		</dict>
 		<key>Sanity Tests.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>6</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

MCMaps.xcodeproj/xcuserdata/marquis.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -149,8 +149,6 @@ struct RedWindowSearchView: View {
     }
 
     private func biomesAndStructures(result: CartographySearchService.SearchResult) -> some View {
-        let currentLoc = redWindowEnvironment.mapCenterCoordinate
-
         return Section {
             ForEach(result.biomes) { biome in
                 RedWindowSearchLandmarkResultCell(