Add Adwaita trait

This should allow developers to compile CubiomesKit without needing to
have libadwaita for libshumate installed as dependencies. Developers
will need to enable the trait to get access to these features.

Author: alicerunsonfedora

.github/workflows/docs-build.yml

@@ -41,7 +41,7 @@ jobs:
           brew install libadwaita-devel libshumate
       - name: Build DocC
         run: |
-          swift package --disable-sandbox \
+          swift package --disable-sandbox --traits Adwaita \
             generate-documentation \
             --enable-experimental-combined-documentation \
             --target CubiomesKit \

.swift-version

@@ -4,11 +4,26 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>CubiomesKit.xcscheme_^#shared#^_</key>
+		<key>CubiomesKit-Package.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>CubiomesKit.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>CubiomesKitAdwaitaDemo.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+		<key>SQLite (Playground).xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
@@ -17,11 +32,26 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>CubiomesKitAdwaitaDemo</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>CubiomesKitCoreTests</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>CubiomesKitTests</key>
 		<dict>
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>CubiomesMapKitTests</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 	</dict>
 </dict>
 </plist>

.swiftpm/xcode/xcuserdata/marquis.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.2
 
 import PackageDescription
 
@@ -20,6 +20,10 @@ let package = Package(
             name: "CubiomesKit",
             targets: ["CubiomesKit"])
     ],
+    traits: [
+        .default(enabledTraits: []),
+        .trait(name: "Adwaita", description: "Used to enable Adwaita features.")
+    ],
     dependencies: [
         .package(url: "https://github.com/stadiamaps/mapkit-caching-tile-overlay", from: "1.1.0"),
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.4.0"),
@@ -28,7 +32,7 @@ let package = Package(
     targets: [
         .systemLibrary(
             name: "CShumate",
-            pkgConfig: "shumate-1.0"
+            pkgConfig: "shumate-1.0",
         ),
         .target(
             name: "Cubiomes",
@@ -62,20 +66,21 @@ let package = Package(
             name: "CubiomesKitAdwaita",
             dependencies: [
                 "CubiomesKitCore",
-                .product(name: "Adwaita", package: "adwaita-swift"),
-                .target(name: "CShumate", condition: .when(platforms: [.linux, .windows])),
+                .targetItem(name: "CShumate", condition: .when(traits: ["Adwaita"])),
+                .product(name: "Adwaita", package: "adwaita-swift", condition: .when(traits: ["Adwaita"])),
+                .product(name: "CAdw", package: "adwaita-swift", condition: .when(traits: ["Adwaita"])),
             ]),
         .target(
             name: "CubiomesKit",
             dependencies: [
                 "CubiomesKitCore",
+                .target(name: "CubiomesKitAdwaita", condition: .when(traits: ["Adwaita"])),
                 .target(name: "CubiomesMapKit", condition: .when(platforms: [.macOS, .iOS, .tvOS, .visionOS])),
-                .target(name: "CubiomesKitAdwaita", condition: .when(platforms: [.linux, .windows])),
             ]),
         .executableTarget(
             name: "CubiomesKitAdwaitaDemo",
             dependencies: [
-                .product(name: "Adwaita", package: "adwaita-swift"),
+                .product(name: "Adwaita", package: "adwaita-swift", condition: .when(traits: ["Adwaita"])),
                 "CubiomesKit",
             ]),
         .testTarget(
@@ -99,6 +104,8 @@ let adwaitaRestrict = ["CubiomesKitAdwaitaDemo"]
 
 #if os(Linux) || os(Windows)
     package.targets.removeAll(where: { appleRestrict.contains($0.name) })
-#else
+#endif
+
+#if !Adwaita
     package.targets.removeAll(where: { adwaitaRestrict.contains($0.name) })
 #endif

Package.resolved

@@ -4,6 +4,6 @@
 @_exported import CubiomesMapKit
 #endif
 
-#if canImport(CubiomesKitAdwaita)
+#if Adwaita
 @_exported import CubiomesKitAdwaita
-#endif
+#endif

Package.swift

@@ -1,4 +1,7 @@
+#if Adwaita
+
 import Adwaita
+import CAdw
 import CShumate
 import CubiomesKitCore
 import Foundation
@@ -13,4 +16,6 @@ public struct MinecraftMap: AdwaitaWidget {
         shumate_simple_map_set_map_source(map, source)
         return map
     }
-}
+}
+
+#endif

Sources/CubiomesKit/CubiomesKit.swift

@@ -1,3 +1,5 @@
+#if Adwaita
+
 import Adwaita
 import CubiomesKit
 
@@ -15,3 +17,5 @@ struct CubiomesKitAdwaitaDemo: App {
         }
     }
 }
+
+#endif

Sources/CubiomesKitAdwaita/MinecraftMap.swift

@@ -1,3 +1,5 @@
+#if Adwaita
+
 import Adwaita
 
 struct MainToolbar: View {
@@ -39,3 +41,5 @@ struct MainToolbar: View {
         }
     }
 }
+
+#endif