From 50aafca96b89d4fd49115bd3e285267ed24e065d Mon Sep 17 00:00:00 2001 From: Brendan Szymanski Date: Wed, 24 Jun 2026 00:01:41 -0400 Subject: [PATCH] Rename CGtkWidgets to CModules --- Package.swift | 17 +++++++++++++---- .../aspect_container.c | 0 Sources/{CGtkWidgets => CModules}/flow_grid.c | 0 .../include/aspect_container.h | 0 .../include/flow_grid.h | 0 .../LuminateUI/Components/AspectContainer.swift | 2 +- Sources/LuminateUI/Components/FlowGrid.swift | 2 +- Tests/LuminateTests/WidgetTests.swift | 2 +- 8 files changed, 16 insertions(+), 7 deletions(-) rename Sources/{CGtkWidgets => CModules}/aspect_container.c (100%) rename Sources/{CGtkWidgets => CModules}/flow_grid.c (100%) rename Sources/{CGtkWidgets => CModules}/include/aspect_container.h (100%) rename Sources/{CGtkWidgets => CModules}/include/flow_grid.h (100%) diff --git a/Package.swift b/Package.swift index 957d766..91b7d11 100644 --- a/Package.swift +++ b/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( name: "Luminate", - platforms: [.macOS(.v13)], + platforms: [.macOS(.v15)], dependencies: [ .package(url: "https://git.aparoksha.dev/aparoksha/adwaita-swift", branch: "main"), .package(url: "https://git.aparoksha.dev/aparoksha/localized", branch: "main"), @@ -53,16 +53,24 @@ let package = Package( ] ), .target( - name: "CGtkWidgets", + name: "CModules", dependencies: [ .product(name: "CAdw", package: "adwaita-swift") + ], + cSettings: [ + .headerSearchPath("include"), + .unsafeFlags(["-I/opt/homebrew/include"], .when(platforms: [.macOS])), + ], + linkerSettings: [ + .unsafeFlags(["-L/opt/homebrew/lib"], .when(platforms: [.macOS])), + .linkedLibrary("mpv"), ] ), .target( name: "LuminateUI", dependencies: [ - "CGtkWidgets", + "CModules", "LuminateCore", "LuminateDI", "LuminateObservationMacros", @@ -73,6 +81,7 @@ let package = Package( .target( name: "LuminatePlayer", dependencies: [ + "CModules", "LuminateCore", "LuminateDI", "LuminateUI", @@ -99,7 +108,7 @@ let package = Package( .testTarget( name: "LuminateTests", dependencies: [ - "CGtkWidgets", + "CModules", .product(name: "CAdw", package: "adwaita-swift"), .product(name: "Adwaita", package: "adwaita-swift"), ] diff --git a/Sources/CGtkWidgets/aspect_container.c b/Sources/CModules/aspect_container.c similarity index 100% rename from Sources/CGtkWidgets/aspect_container.c rename to Sources/CModules/aspect_container.c diff --git a/Sources/CGtkWidgets/flow_grid.c b/Sources/CModules/flow_grid.c similarity index 100% rename from Sources/CGtkWidgets/flow_grid.c rename to Sources/CModules/flow_grid.c diff --git a/Sources/CGtkWidgets/include/aspect_container.h b/Sources/CModules/include/aspect_container.h similarity index 100% rename from Sources/CGtkWidgets/include/aspect_container.h rename to Sources/CModules/include/aspect_container.h diff --git a/Sources/CGtkWidgets/include/flow_grid.h b/Sources/CModules/include/flow_grid.h similarity index 100% rename from Sources/CGtkWidgets/include/flow_grid.h rename to Sources/CModules/include/flow_grid.h diff --git a/Sources/LuminateUI/Components/AspectContainer.swift b/Sources/LuminateUI/Components/AspectContainer.swift index 9567357..4267419 100644 --- a/Sources/LuminateUI/Components/AspectContainer.swift +++ b/Sources/LuminateUI/Components/AspectContainer.swift @@ -20,7 +20,7 @@ // import Adwaita -import CGtkWidgets +import CModules /// A single‑child container that preserves a fixed aspect ratio. /// diff --git a/Sources/LuminateUI/Components/FlowGrid.swift b/Sources/LuminateUI/Components/FlowGrid.swift index 8c336f0..304461f 100644 --- a/Sources/LuminateUI/Components/FlowGrid.swift +++ b/Sources/LuminateUI/Components/FlowGrid.swift @@ -20,7 +20,7 @@ // import Adwaita -import CGtkWidgets +import CModules /// Controls how the last row is aligned when it doesn't fill the width. public enum FlowGridJustifySetting: Int { diff --git a/Tests/LuminateTests/WidgetTests.swift b/Tests/LuminateTests/WidgetTests.swift index 71ffda3..3bb918e 100644 --- a/Tests/LuminateTests/WidgetTests.swift +++ b/Tests/LuminateTests/WidgetTests.swift @@ -1,6 +1,6 @@ import Adwaita import CAdw -import CGtkWidgets +import CModules import Testing // MARK: - Helpers