SwiftWin32: further adopt static libraries on 5.7+

Swift 5.7.0 enables static libraries for non-standard library
cases.  Use this to extract the CoreGraphics interfaces out of the
primary library.

Author: compnerd

Examples/Calculator/Calculator.swift

@@ -4,6 +4,10 @@
 import SwiftWin32
 import Foundation
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 private extension View {
   func addSubviews(_ views: [View]) {
     _ = views.map { self.addSubview($0) }

Examples/UICatalog/UICatalog.swift

@@ -8,6 +8,10 @@ import func WinSDK.MessageBoxW
 import let WinSDK.MB_OK
 import struct WinSDK.UINT
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 private extension Label {
   convenience init(frame: Rect, title: String) {
     self.init(frame: frame)

Package.swift

@@ -27,17 +27,24 @@ let SwiftWin32: Package =
           targets: [
             .target(name: "CoreAnimation",
                     path: "Sources/SwiftWin32/CoreAnimation"),
+            .target(name: "CoreGraphics",
+                    path: "Sources/SwiftWin32/CoreGraphics"),
             .target(name: "SwiftWin32",
                     dependencies: [
                       "CoreAnimation",
+                      "CoreGraphics",
                       .product(name: "Logging", package: "swift-log"),
                       .product(name: "OrderedCollections",
                                package: "swift-collections"),
                       .product(name: "cassowary", package: "cassowary"),
                       .product(name: "SwiftCOM", package: "swift-com"),
                     ],
                     path: "Sources/SwiftWin32",
-                    exclude: ["CoreAnimation", "CMakeLists.txt"],
+                    exclude: [
+                      "CoreAnimation",
+                      "CoreGraphics",
+                      "CMakeLists.txt"
+                    ],
                     swiftSettings: [
                       .enableExperimentalFeature("AccessLevelOnImport"),
                     ],
@@ -76,7 +83,7 @@ let SwiftWin32: Package =
                               ]),
             .target(name: "TestUtilities", path: "Tests/Utilities"),
             .testTarget(name: "AutoLayoutTests", dependencies: ["SwiftWin32"]),
-            .testTarget(name: "CoreGraphicsTests", dependencies: ["SwiftWin32"]),
+            .testTarget(name: "CoreGraphicsTests", dependencies: ["CoreGraphics"]),
             .testTarget(name: "SupportTests", dependencies: ["SwiftWin32"]),
             .testTarget(name: "UICoreTests",
                         dependencies: ["SwiftWin32", "TestUtilities"])

[email protected]

@@ -27,17 +27,24 @@ let SwiftWin32: Package =
           targets: [
             .target(name: "CoreAnimation",
                     path: "Sources/SwiftWin32/CoreAnimation"),
+            .target(name: "CoreGraphics",
+                    path: "Sources/SwiftWin32/CoreGraphics"),
             .target(name: "SwiftWin32",
                     dependencies: [
                       "CoreAnimation",
+                      "CoreGraphics",
                       .product(name: "Logging", package: "swift-log"),
                       .product(name: "OrderedCollections",
                                package: "swift-collections"),
                       .product(name: "cassowary", package: "cassowary"),
                       .product(name: "SwiftCOM", package: "swift-com"),
                     ],
                     path: "Sources/SwiftWin32",
-                    exclude: ["CoreAnimation", "CMakeLists.txt"],
+                    exclude: [
+                      "CoreAnimation",
+                      "CoreGraphics",
+                      "CMakeLists.txt",
+                    ],
                     linkerSettings: [
                       .linkedLibrary("User32"),
                       .linkedLibrary("ComCtl32"),
@@ -73,7 +80,7 @@ let SwiftWin32: Package =
                               ]),
             .target(name: "TestUtilities", path: "Tests/Utilities"),
             .testTarget(name: "AutoLayoutTests", dependencies: ["SwiftWin32"]),
-            .testTarget(name: "CoreGraphicsTests", dependencies: ["SwiftWin32"]),
+            .testTarget(name: "CoreGraphicsTests", dependencies: ["CoreGraphics"]),
             .testTarget(name: "SupportTests", dependencies: ["SwiftWin32"]),
             .testTarget(name: "UICoreTests",
                         dependencies: ["SwiftWin32", "TestUtilities"])

Sources/SwiftWin32/Animation and Haptics/Property-Based Animations/CubicTimingParameters.swift

@@ -1,6 +1,10 @@
 // Copyright © 2021 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 /// The timing information for animations in the form of a cubic Bézier curve.
 public class CubicTimingParameters {
   // MARK - Initializing a Cubic Timing Parameters Object

Sources/SwiftWin32/Animation and Haptics/Property-Based Animations/SpringTimingParameters.swift

@@ -1,6 +1,10 @@
 // Copyright © 2021 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 /// The timing information for animations that mimics the behavior of a spring.
 public class SpringTimingParameters {
   // MARK - Initializing a Spring Timing Parameters Object

Sources/SwiftWin32/Animation and Haptics/View Controller Transitions/ViewControllerTransitionCoordinatorContext.swift

@@ -3,6 +3,10 @@
 
 import struct Foundation.TimeInterval
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 /// Modal presentation styles available when presenting view controllers.
 public enum ModalPresentationStyle: Int {
   /// The default presentation style chosen by the system.

Sources/SwiftWin32/Animation and Haptics/ViewControllerContextTransitioning.swift

@@ -1,6 +1,10 @@
 // Copyright © 2021 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 /// The keys you use to identify the view controllers involved in a transition.
 public struct TransitionContextViewControllerKey: Equatable, Hashable, RawRepresentable {
   public typealias RawValue = String

Sources/SwiftWin32/Appearance Customization/Configurations/ListContentConfiguration.swift

@@ -3,6 +3,10 @@
 
 import class Foundation.NSAttributedString
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 extension ListContentConfiguration {
   /// Properties that affect the list content configuration's image.
   public struct ImageProperties {

Sources/SwiftWin32/AutoLayout/LayoutGuide.swift

@@ -1,6 +1,10 @@
 // Copyright © 2020 Saleem Abdulrasool <[email protected]>.
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 public class LayoutGuide {
   // MARK - Working with Layout Guides
 

Sources/SwiftWin32/CMakeLists.txt

@@ -134,12 +134,6 @@ target_sources(SwiftWin32 PRIVATE
   "Windows and Screens/CoordinateSpace.swift"
   "Windows and Screens/Screen.swift"
   "Windows and Screens/Window.swift")
-target_sources(SwiftWin32 PRIVATE
-  CG/AffineTransform.swift
-  CG/Point.swift
-  CG/Rect.swift
-  CG/Size.swift
-  CG/Vector.swift)
 target_sources(SwiftWin32 PRIVATE
   Platform/BatteryMonitor.swift
   Platform/Error.swift
@@ -164,11 +158,26 @@ target_sources(SwiftWin32 PRIVATE
 if(CMAKE_Swift_COMPILER_VERSION VERSION_LESS 5.7.0)
   target_sources(SwiftWin32 PRIVATE
     CoreAnimation/Transform3D.swift)
+  target_sources(SwiftWin32 PRIVATE
+    CoreGraphics/AffineTransform.swift
+    CoreGraphics/Point.swift
+    CoreGraphics/Rect.swift
+    CoreGraphics/Size.swift
+    CoreGraphics/Vector.swift)
 else()
   add_library(CoreAnimation STATIC
     CoreAnimation/Transform3D.swift)
   target_link_libraries(SwiftWin32 PRIVATE
     CoreAnimation)
+
+  add_library(CoreGraphics STATIC
+    CoreGraphics/AffineTransform.swift
+    CoreGraphics/Point.swift
+    CoreGraphics/Rect.swift
+    CoreGraphics/Size.swift
+    CoreGraphics/Vector.swift)
+  target_link_libraries(SwiftWin32 PRIVATE
+    CoreGraphics)
 endif()
 target_link_libraries(SwiftWin32 PUBLIC
   ComCtl32
@@ -188,5 +197,6 @@ set_target_properties(SwiftWin32 PROPERTIES
 
 if(CMAKE_Swift_COMPILER_VERSION VERSION_GREATER_EQUAL 5.7.0)
   _install_target(CoreAnimation)
+  _install_target(CoreGraphics)
 endif()
 _install_target(SwiftWin32)

Sources/SwiftWin32/CG/AffineTransform.swift Sources/SwiftWin32/CoreGraphics/AffineTransform.swift

@@ -275,17 +275,3 @@ extension Rect: CustomDebugStringConvertible {
     return "Rect(origin: \(origin), size: \(size))"
   }
 }
-
-extension Rect {
-  internal func scaled(for dpi: UINT, style: WindowStyle) -> Rect {
-    let scale: Double = Double(dpi) / Double(USER_DEFAULT_SCREEN_DPI)
-
-    var r: RECT =
-        RECT(from: self.applying(AffineTransform(scaleX: scale, y: scale)))
-    if !AdjustWindowRectExForDpi(&r, style.base, false, style.extended, dpi) {
-      log.warning("AdjustWindowRectExForDpi: \(Error(win32: GetLastError()))")
-    }
-
-    return Rect(from: r)
-  }
-}

Sources/SwiftWin32/CG/Point.swift Sources/SwiftWin32/CoreGraphics/Point.swift

@@ -1,6 +1,10 @@
 // Copyright © 2020 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 /// An object that can become focused.
 public protocol FocusItem: FocusEnvironment {
   // MARK - Determining Focusability

Sources/SwiftWin32/CG/Rect.swift Sources/SwiftWin32/CoreGraphics/Rect.swift

@@ -1,6 +1,10 @@
 // Copyright © 2020 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 /// The container responsible for providing geometric context to focus items
 /// within a given focus environment.
 public protocol FocusItemContainer {

Sources/SwiftWin32/CG/Size.swift Sources/SwiftWin32/CoreGraphics/Size.swift

@@ -3,6 +3,7 @@
 
 #if swift(>=5.7)
 import CoreAnimation
+import CoreGraphics
 #endif
 
 /// Provides movement hint information for the focused item.

Sources/SwiftWin32/CG/Vector.swift Sources/SwiftWin32/CoreGraphics/Vector.swift

@@ -4,6 +4,10 @@
 import WinSDK
 import SwiftCOM
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 private let WICImagingFactory: SwiftCOM.IWICImagingFactory? =
     try? IWICImagingFactory.CreateInstance(class: CLSID_WICImagingFactory)
 

Sources/SwiftWin32/Focus-Based Navigation/FocusItem.swift

@@ -1,6 +1,10 @@
 // Copyright © 2020 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 extension ContextMenuInteraction {
   /// Constants that describe the appearance of the menu.
   public enum Appearance: Int {

Sources/SwiftWin32/Focus-Based Navigation/FocusItemContainer.swift

@@ -1,6 +1,10 @@
 // Copyright © 2020 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 /// The methods for providing the set of actions to perform on your content,
 /// and for customizing the preview of that content.
 public protocol ContextMenuInteractionDelegate: AnyObject {

Sources/SwiftWin32/Focus-Based Navigation/FocusMovementHint.swift

@@ -1,6 +1,10 @@
 // Copyright © 2020 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 /// An object that specifies the container view to use for animations.
 public class PreviewTarget {
   /// Creating a Preview Target Object

Sources/SwiftWin32/Images and PDF/Image.swift

@@ -1,6 +1,10 @@
 // Copyright © 2020 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 public class TargetedPreview {
   /// Creting a Targeted Preview Object
 

Sources/SwiftWin32/Menus and Shortcuts/ContextMenuInteraction.swift

@@ -1,6 +1,10 @@
 // Copyright © 2020 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 public class PointerRegion {
   // MARK - Configuring a Region
 

Sources/SwiftWin32/Menus and Shortcuts/ContextMenuInteractionDelegate.swift

@@ -1,6 +1,10 @@
 // Copyright © 2020 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 /// An object to describe the pointer's location in the interaction's view.
 public class PointerRegionRequest {
   // MARK - Inspecting the Region Request

Sources/SwiftWin32/Menus and Shortcuts/PreviewTarget.swift

@@ -1,6 +1,10 @@
 // Copyright © 2020 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 extension PointerEffect {
   /// An effect that defines how to apply a tint to a view during a pointer
   /// interaction.

Sources/SwiftWin32/Menus and Shortcuts/TargetedPreview.swift

@@ -2,6 +2,9 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 import WinSDK
+#if swift(>=5.7)
+import CoreGraphics
+#endif
 
 extension Point {
   internal init(from: POINT) {

Sources/SwiftWin32/Pointer Interactions/PointerRegion.swift

@@ -2,12 +2,15 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 import WinSDK
+#if swift(>=5.7)
+import CoreGraphics
+#endif
 
 extension Rect {
   internal init(from: RECT) {
-    self.origin = Point(x: from.left, y: from.top)
-    self.size = Size(width: from.right - from.left,
-                     height: from.bottom - from.top)
+    self.init(origin: Point(x: from.left, y: from.top),
+              size: Size(width: from.right - from.left,
+                         height: from.bottom - from.top))
   }
 }
 
@@ -25,3 +28,17 @@ extension Rect {
     Point(x: self.midX, y: self.midY)
   }
 }
+
+extension Rect {
+  internal func scaled(for dpi: UINT, style: WindowStyle) -> Rect {
+    let scale: Double = Double(dpi) / Double(USER_DEFAULT_SCREEN_DPI)
+
+    var r: RECT =
+        RECT(from: self.applying(AffineTransform(scaleX: scale, y: scale)))
+    if !AdjustWindowRectExForDpi(&r, style.base, false, style.extended, dpi) {
+      log.warning("AdjustWindowRectExForDpi: \(Error(win32: GetLastError()))")
+    }
+
+    return Rect(from: r)
+  }
+}

Sources/SwiftWin32/Pointer Interactions/PointerRegionRequest.swift

@@ -1,6 +1,10 @@
 // Copyright © 2020 Saleem Abdulrasool <[email protected]>
 // SPDX-License-Identifier: BSD-3-Clause
 
+#if swift(>=5.7)
+import CoreGraphics
+#endif
+
 extension Size {
   internal init<Integer: FixedWidthInteger>(width: Integer, height: Integer) {
     self.init(width: Int(width), height: Int(height))