Merge pull request #6 from GoodRequest/feature/swift6

task: Swift 6 support

Author: plajdo

.swiftpm/configuration/Package.resolved

@@ -261,6 +261,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 6.0;
 			};
 			name = Debug;
 		};
@@ -314,6 +315,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 6.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

GoodSwiftUI-Sample/GoodSwiftUI-Sample.xcodeproj/project.pbxproj

@@ -24,28 +24,28 @@ extension InputFieldView {
             eyeImageVisible: UIImage(systemName: "eye.slash"),
             enabled: InputFieldViewStateAppearance(
                 placeholderColor: UIColor.darkGray,
-                contentBackgroundColor: UIColor.white,
+                contentBackgroundColor: UIColor.tertiarySystemBackground,
                 textFieldTextColor: UIColor.systemBlue,
                 borderColor: UIColor.gray,
                 hintColor: UIColor.darkGray
             ),
             selected: InputFieldViewStateAppearance(
                 placeholderColor: UIColor.darkGray,
-                contentBackgroundColor: UIColor.white,
+                contentBackgroundColor: UIColor.tertiarySystemBackground,
                 textFieldTextColor: UIColor.systemBlue,
                 borderColor: UIColor.gray,
                 hintColor: UIColor.darkGray
             ),
             disabled: InputFieldViewStateAppearance(
                 placeholderColor: UIColor.darkGray,
-                contentBackgroundColor: UIColor.lightGray,
+                contentBackgroundColor: UIColor.secondarySystemBackground,
                 textFieldTextColor: UIColor.darkGray,
                 borderColor: UIColor.gray,
                 hintColor: UIColor.darkGray
             ),
             failed: InputFieldViewStateAppearance(
                 placeholderColor: UIColor.darkGray,
-                contentBackgroundColor: UIColor.white,
+                contentBackgroundColor: UIColor.tertiarySystemBackground,
                 textFieldTextColor: UIColor.systemBlue,
                 borderColor: UIColor.systemRed,
                 hintColor: UIColor.systemRed

GoodSwiftUI-Sample/GoodSwiftUI-Sample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -23,29 +23,33 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/goodrequest/goodextensions-ios", .upToNextMinor(from: "1.6.0"))
+        .package(url: "https://github.com/goodrequest/goodextensions-ios", .upToNextMajor(from: "2.0.0"))
     ],
     targets: [
         .target(
             name: "GoodSwiftUI",
-            dependencies: []
+            dependencies: [],
+            swiftSettings: [.swiftLanguageMode(.v6)]
         ),
         .target(
             name: "GRAsyncImage",
             dependencies: [
                 .product(name: "GoodExtensions", package: "GoodExtensions-iOS"),
-            ]
+            ],
+            swiftSettings: [.swiftLanguageMode(.v6)]
         ),
         .target(
             name: "GRInputField",
             dependencies: [
                 .product(name: "GoodExtensions", package: "GoodExtensions-iOS"),
                 .product(name: "GoodStructs", package: "GoodExtensions-iOS")
-            ]
+            ],
+            swiftSettings: [.swiftLanguageMode(.v6), .unsafeFlags(["-Onone"])]
         ),
         .testTarget(
             name: "GoodSwiftUITests",
-            dependencies: ["GoodSwiftUI"]
+            dependencies: ["GoodSwiftUI"],
+            swiftSettings: [.swiftLanguageMode(.v6)]
         ),
     ]
 )

GoodSwiftUI-Sample/GoodSwiftUI-Sample/Extensions/InputFieldViewConfiguration.swift

@@ -34,7 +34,7 @@ public struct GRAsyncImage<FailurePlaceholder: View, LoadingPlaceholder: View>:
         onSuccess: VoidClosure? = nil,
         onFailure: VoidClosure? = nil
     ) {
-        _imageLoader = StateObject(wrappedValue: GRImageLoader(url: url, imageCache: DefaultImageCache.shared))
+        _imageLoader = StateObject(wrappedValue: GRImageLoader(url: url))
 
         self.url = url
         self.failurePlaceholder = failurePlaceholder()
@@ -58,12 +58,12 @@ public struct GRAsyncImage<FailurePlaceholder: View, LoadingPlaceholder: View>:
                     Image(uiImage: image)
                         .resizable()
                 } else {
-                    Button(action: { loadImage(url: url) }, label: { failurePlaceholder })
+                    Button(action: { startLoadingImage(url: url) }, label: { failurePlaceholder })
                 }
 
             case .failure:
-                if let url, allowsReloading {
-                    Button(action: { loadImage(url: url) }, label: { failurePlaceholder })
+                if allowsReloading {
+                    Button(action: { startLoadingImage(url: url) }, label: { failurePlaceholder })
                 } else {
                     failurePlaceholder
                 }
@@ -72,8 +72,8 @@ public struct GRAsyncImage<FailurePlaceholder: View, LoadingPlaceholder: View>:
                 Color.clear
             }
         }
-        .onAppear { loadImage(url: url) }
-        .onChange(of: url) { url in loadImage(url: url) }
+        .onAppear { startLoadingImage(url: url) }
+        .onChange(of: url) { url in startLoadingImage(url: url) }
         .onChange(of: imageLoader.status) {
             switch $0 {
             case .loading:
@@ -93,23 +93,14 @@ public struct GRAsyncImage<FailurePlaceholder: View, LoadingPlaceholder: View>:
 
     // MARK: - Private
 
-    private func loadImage(url: URL?) {
+    private func startLoadingImage(url: URL?) {
         Task {
             await imageLoader.load(url)
         }
     }
 
 }
 
-@available(iOS 14.0, *)
-extension GRAsyncImage: Equatable {
-
-    public static func == (lhs: GRAsyncImage, rhs: GRAsyncImage) -> Bool {
-        lhs.url == rhs.url
-    }
-
-}
-
 @available(iOS 14.0, *)
 struct GRAsyncImage_Previews: PreviewProvider {
 

Package.swift

@@ -7,23 +7,14 @@
 
 import Foundation
 
-public protocol GRImageCacheType {
-
-    func object(forKey url: NSURL) -> Data?
-    func set(object: NSData, forKey url: NSURL)
-
-}
-
-final class DefaultImageCache {
+@MainActor final class GRImageCache {
 
     // MARK: - Typealiases
 
     typealias ImageCache = NSCache<NSURL, NSData>
 
     // MARK: - Properties
 
-    static var shared = DefaultImageCache()
-
     private lazy var cache: ImageCache = {
         let cache = ImageCache()
         cache.countLimit = 100
@@ -32,23 +23,20 @@ final class DefaultImageCache {
         return cache
     }()
 
-    // MARK: - Initialization
+    // MARK: - Singleton
 
-    private init() {}
-
-}
+    static let shared = GRImageCache()
 
-// MARK: - Protocol implementation
+    private init() {}
 
-extension DefaultImageCache: GRImageCacheType {
+    // MARK: - Internal
 
     func object(forKey url: NSURL) -> Data? {
         return cache.object(forKey: url) as? Data
     }
 
-    func set(object: NSData, forKey url: NSURL) {
-        cache.setObject(object, forKey: url)
+    func set(object: Data, forKey url: URL) {
+        cache.setObject(object as NSData, forKey: url as NSURL)
     }
 
 }
-

Sources/GRAsyncImage/GRAsyncImage.swift

@@ -7,14 +7,12 @@
 
 import SwiftUI
 
-final class GRImageLoader: ObservableObject {
+@MainActor final class GRImageLoader: ObservableObject {
 
     // MARK: - Properties
 
     @Published private(set) var status: Status
 
-    private var imageCache: GRImageCacheType
-
     // MARK: - Enums
 
     enum Status: Equatable {
@@ -28,10 +26,8 @@ final class GRImageLoader: ObservableObject {
 
     // MARK: - Initialization
 
-    init(url: URL?, imageCache: GRImageCacheType) {
-        self.imageCache = imageCache
-
-        if let url = url, let data = imageCache.object(forKey: url as NSURL) {
+    init(url: URL?) {
+        if let url = url, let data = GRImageCache.shared.object(forKey: url as NSURL) {
             status = .success(data)
         } else {
             status = .idle
@@ -40,14 +36,13 @@ final class GRImageLoader: ObservableObject {
 
     // MARK: - Public
 
-    @MainActor
     func load(_ url: URL?) async {
         guard let url = url else {
             status = .failure
             return
         }
 
-        if let data = imageCache.object(forKey: url as NSURL) {
+        if let data = GRImageCache.shared.object(forKey: url as NSURL) {
             status = .success(data)
             return
         }
@@ -57,7 +52,7 @@ final class GRImageLoader: ObservableObject {
         do {
             let (data, _) = try await URLSession.shared.data(from: url)
             status = .success(data)
-            imageCache.set(object: data as NSData, forKey: url as NSURL)
+            GRImageCache.shared.set(object: data, forKey: url)
         } catch {
             status = .failure
         }

Sources/GRAsyncImage/GRImageCache.swift

@@ -7,11 +7,12 @@
 
 import UIKit
 
-public struct InputFieldAppearance {
+public struct InputFieldAppearance: Sendable {
 
     public var titleFont: UIFont?
     public var titleColor: UIColor?
 
+    /// Tint color of text field - eg. typing indicator
     public var textFieldTintColor: UIColor?
     public var textFieldFont: UIFont?
 
@@ -65,7 +66,7 @@ public struct InputFieldAppearance {
 
 }
 
-public struct InputFieldViewStateAppearance {
+public struct InputFieldViewStateAppearance: Sendable {
 
     public var placeholderColor: UIColor?
     public var contentBackgroundColor: UIColor?

Sources/GRAsyncImage/GRImageLoader.swift

@@ -7,7 +7,7 @@
 
 import UIKit
 
-public struct InputFieldTraits {
+public struct InputFieldTraits: Sendable {
 
     public var textContentType: UITextContentType?
     public var autocapitalizationType: UITextAutocapitalizationType = .none