Added extension specific library

ddaddy · ddaddy · commit 4fa1f95c7223 · 2022-11-10T14:36:36.000+01:00
diff --git a/Package.swift b/Package.swift
@@ -14,8 +14,17 @@ let package = Package(
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
             name: "DJSwiftHelpers",
-            targets: ["DJSwiftHelpers", "DJSwiftHelpers_UIKit", "DJSwiftHelpers_SwiftUI"]
-        )
+            targets: [
+                "DJSwiftHelpers",
+                "DJSwiftHelpers_UIKit",
+                "DJSwiftHelpers_SwiftUI"
+            ]
+        ),
+        .library(name: "DJSwiftHelpers_Extension",
+                 targets: [
+                    "DJSwiftHelpers",
+                    "DJSwiftHelpers_SwiftUI"
+                 ])
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
diff --git a/Sources/SwiftUI/OnFirstAppear.swift b/Sources/SwiftUI/OnFirstAppear.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2022 Dappological Ltd. All rights reserved.
 //
 
+#if canImport(SwiftUI)
 import SwiftUI
 
 @available(iOS 13.0, macOS 10.15, watchOS 6.0, *)
@@ -41,3 +42,4 @@ struct FirstAppear: ViewModifier {
         }
     }
 }
+#endif
diff --git a/Sources/SwiftUI/OpenInSafari.swift b/Sources/SwiftUI/OpenInSafari.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2022 Dappological Ltd. All rights reserved.
 //
 
+#if canImport(SwiftUI)
 #if os(iOS)
 // SwiftUI isn't available in the armv7 architecture
 #if arch(arm64) || arch(x86_64)
@@ -120,3 +121,4 @@ class SafariActivity: UIActivity {
 }
 #endif // arch(arm64) || arch(x86_64)
 #endif // os(iOS)
+#endif // canImport(SwiftUI)
diff --git a/Sources/UIKit/Gradient.swift b/Sources/UIKit/Gradient.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2021 Dappological Ltd. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 
 /**
@@ -25,6 +26,8 @@ import UIKit
  }
  ```
  */
+#if !os(watchOS)
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, *)
 @IBDesignable
 open class Gradient: UIView {
     @IBInspectable open var startColor:   UIColor = .black { didSet { updateColors() }}
@@ -60,3 +63,5 @@ open class Gradient: UIView {
         updateColors()
     }
 }
+#endif
+#endif
diff --git a/Sources/UIKit/NSMutableAttributedString.swift b/Sources/UIKit/NSMutableAttributedString.swift
@@ -6,8 +6,10 @@
 //  Copyright © 2022 Dappological Ltd. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, watchOS 2.0, *)
 public
 extension NSMutableAttributedString {
     
@@ -22,3 +24,4 @@ extension NSMutableAttributedString {
         self.addAttribute(NSAttributedString.Key.foregroundColor, value: color, range: range)
     }
 }
+#endif
diff --git a/Sources/UIKit/UIApplication.swift b/Sources/UIKit/UIApplication.swift
@@ -6,8 +6,11 @@
 //  Copyright © 2020 Dappological Ltd. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 
+#if !os(watchOS)
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, *)
 public
 extension UIApplication {
     
@@ -60,3 +63,5 @@ extension UIApplication {
         UIWindow.key?.rootViewController?.dismiss(animated: animated, completion: completion)
     }
 }
+#endif
+#endif
diff --git a/Sources/UIKit/UIColor.swift b/Sources/UIKit/UIColor.swift
@@ -6,8 +6,10 @@
 //  Copyright © 2020 Darren Jones. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, watchOS 2.0, *)
 public
 extension UIColor {
     
@@ -44,6 +46,7 @@ extension UIColor {
     }
 }
 
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, watchOS 2.0, *)
 public
 extension UIColor {
     
@@ -55,3 +58,4 @@ extension UIColor {
         return getRed(&r, green: &g, blue: &b, alpha: &a) ? UIColor(red: 1.0-r, green: 1.0-g, blue: 1.0-b, alpha: a) : .black
     }
 }
+#endif
diff --git a/Sources/UIKit/UIDevice.swift b/Sources/UIKit/UIDevice.swift
@@ -6,8 +6,11 @@
 //  Copyright © 2020 Dappological Ltd. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 
+#if !os(watchOS)
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, *)
 public
 extension UIDevice {
     
@@ -27,3 +30,5 @@ extension UIDevice {
         return UIDevice.current.userInterfaceIdiom == .carPlay
     }
 }
+#endif
+#endif
diff --git a/Sources/UIKit/UIFont.swift b/Sources/UIKit/UIFont.swift
@@ -6,9 +6,10 @@
 //  Copyright © 2021 Dappological Ltd. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 
-@available(iOS 11.0, *)
+@available(iOS 11.0, macCatalyst 13.1, tvOS 11.0, watchOS 4.0, *)
 public
 extension UIFont {
     
@@ -30,3 +31,4 @@ extension UIFont {
         return metrics.scaledFont(for: font)
     }
 }
+#endif
diff --git a/Sources/UIKit/UIImage.swift b/Sources/UIKit/UIImage.swift
@@ -6,8 +6,10 @@
 //  Copyright © 2020 Dappological Ltd. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, watchOS 2.0, *)
 public
 extension UIImage {
     
@@ -47,6 +49,8 @@ extension UIImage {
     }
 }
 
+#if !os(watchOS)
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, *)
 public
 extension UIImage {
     
@@ -76,3 +80,6 @@ extension UIImage {
         return newImage!
     }
 }
+#endif
+
+#endif
diff --git a/Sources/UIKit/UILabel.swift b/Sources/UIKit/UILabel.swift
@@ -6,8 +6,11 @@
 //  Copyright © 2020 Dappological Ltd. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 
+#if !os(watchOS)
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, *)
 public
 extension UILabel {
     
@@ -53,3 +56,5 @@ extension UILabel {
         }
     }
 }
+#endif
+#endif
diff --git a/Sources/UIKit/UIStackView.swift b/Sources/UIKit/UIStackView.swift
@@ -6,8 +6,11 @@
 //  Copyright © 2020 Darren Jones. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 
+#if !os(watchOS)
+@available(iOS 9.0, macCatalyst 13.1, tvOS 9.0, *)
 public
 extension UIStackView {
     
@@ -30,6 +33,7 @@ extension UIStackView {
     }
 }
 
+@available(iOS 9.0, macCatalyst 13.1, tvOS 9.0, *)
 public
 extension UIStackView {
     
@@ -43,3 +47,5 @@ extension UIStackView {
         insertSubview(subView, at: 0)
     }
 }
+#endif
+#endif
diff --git a/Sources/UIKit/UIView.swift b/Sources/UIKit/UIView.swift
@@ -6,8 +6,11 @@
 //  Copyright © 2021 Dappological Ltd. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 
+#if !os(watchOS)
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, *)
 public
 extension UIView {
     
@@ -74,3 +77,5 @@ extension UIView {
         }
     }
 }
+#endif
+#endif
diff --git a/Sources/UIKit/UIViewController.swift b/Sources/UIKit/UIViewController.swift
@@ -6,8 +6,11 @@
 //  Copyright © 2020 Dappological Ltd. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 
+#if !os(watchOS)
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, *)
 public
 extension UIViewController {
     
@@ -37,6 +40,7 @@ extension UIViewController {
     }
 }
 
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, *)
 public
 extension UIViewController {
     
@@ -70,3 +74,5 @@ extension UIViewController {
         child.removeFromParent()
     }
 }
+#endif
+#endif
diff --git a/Sources/UIKit/UIWindow.swift b/Sources/UIKit/UIWindow.swift
@@ -6,8 +6,11 @@
 //  Copyright © 2020 Dappological Ltd. All rights reserved.
 //
 
+#if canImport(UIKit)
 import UIKit
 
+#if !os(watchOS)
+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, *)
 public
 extension UIWindow {
     
@@ -28,3 +31,5 @@ extension UIWindow {
         }
     }
 }
+#endif
+#endif

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`// Copyright © 2022 Dappological Ltd. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
	`9`	`+#if canImport(SwiftUI)`
`9`	`10`	`import SwiftUI`
`10`	`11`
`11`	`12`	`@available(iOS 13.0, macOS 10.15, watchOS 6.0, *)`
`@@ -41,3 +42,4 @@ struct FirstAppear: ViewModifier {`
`41`	`42`	`}`
`42`	`43`	`}`
`43`	`44`	`}`
	`45`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`// Copyright © 2021 Dappological Ltd. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
	`9`	`+#if canImport(UIKit)`
`9`	`10`	`import UIKit`
`10`	`11`
`11`	`12`	`/**`
`@@ -25,6 +26,8 @@ import UIKit`
`25`	`26`	`}`
`26`	`27`	```
`27`	`28`	`*/`
	`29`	`+#if !os(watchOS)`
	`30`	`+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, *)`
`28`	`31`	`@IBDesignable`
`29`	`32`	`open class Gradient: UIView {`
`30`	`33`	`@IBInspectable open var startColor: UIColor = .black { didSet { updateColors() }}`
`@@ -60,3 +63,5 @@ open class Gradient: UIView {`
`60`	`63`	`updateColors()`
`61`	`64`	`}`
`62`	`65`	`}`
	`66`	`+#endif`
	`67`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,10 @@`
`6`	`6`	`// Copyright © 2022 Dappological Ltd. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
	`9`	`+#if canImport(UIKit)`
`9`	`10`	`import UIKit`
`10`	`11`
	`12`	`+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, watchOS 2.0, *)`
`11`	`13`	`public`
`12`	`14`	`extension NSMutableAttributedString {`
`13`	`15`
`@@ -22,3 +24,4 @@ extension NSMutableAttributedString {`
`22`	`24`	`self.addAttribute(NSAttributedString.Key.foregroundColor, value: color, range: range)`
`23`	`25`	`}`
`24`	`26`	`}`
	`27`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,11 @@`
`6`	`6`	`// Copyright © 2020 Dappological Ltd. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
	`9`	`+#if canImport(UIKit)`
`9`	`10`	`import UIKit`
`10`	`11`
	`12`	`+#if !os(watchOS)`
	`13`	`+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, *)`
`11`	`14`	`public`
`12`	`15`	`extension UIApplication {`
`13`	`16`
`@@ -60,3 +63,5 @@ extension UIApplication {`
`60`	`63`	`UIWindow.key?.rootViewController?.dismiss(animated: animated, completion: completion)`
`61`	`64`	`}`
`62`	`65`	`}`
	`66`	`+#endif`
	`67`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,10 @@`
`6`	`6`	`// Copyright © 2020 Darren Jones. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
	`9`	`+#if canImport(UIKit)`
`9`	`10`	`import UIKit`
`10`	`11`
	`12`	`+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, watchOS 2.0, *)`
`11`	`13`	`public`
`12`	`14`	`extension UIColor {`
`13`	`15`
`@@ -44,6 +46,7 @@ extension UIColor {`
`44`	`46`	`}`
`45`	`47`	`}`
`46`	`48`
	`49`	`+@available(iOS 2.0, macCatalyst 13.1, tvOS 9.0, watchOS 2.0, *)`
`47`	`50`	`public`
`48`	`51`	`extension UIColor {`
`49`	`52`
`@@ -55,3 +58,4 @@ extension UIColor {`
`55`	`58`	`return getRed(&r, green: &g, blue: &b, alpha: &a) ? UIColor(red: 1.0-r, green: 1.0-g, blue: 1.0-b, alpha: a) : .black`
`56`	`59`	`}`
`57`	`60`	`}`
	`61`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,10 @@`
`6`	`6`	`// Copyright © 2021 Dappological Ltd. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
	`9`	`+#if canImport(UIKit)`
`9`	`10`	`import UIKit`
`10`	`11`
`11`		`-@available(iOS 11.0, *)`
	`12`	`+@available(iOS 11.0, macCatalyst 13.1, tvOS 11.0, watchOS 4.0, *)`
`12`	`13`	`public`
`13`	`14`	`extension UIFont {`
`14`	`15`
`@@ -30,3 +31,4 @@ extension UIFont {`
`30`	`31`	`return metrics.scaledFont(for: font)`
`31`	`32`	`}`
`32`	`33`	`}`
	`34`	`+#endif`