Merge branch 'imindeu-main'

Author: tomlokhorst

Sources/RswiftGenerators/Shared/SwiftIdentifier.swift

@@ -124,26 +124,23 @@ extension Sequence {
 }
 
 private let disallowedCharacters: CharacterSet = {
-    let disallowed = NSMutableCharacterSet(charactersIn: "")
-    disallowed.formUnion(with: CharacterSet.whitespacesAndNewlines)
-    disallowed.formUnion(with: CharacterSet.punctuationCharacters)
-    disallowed.formUnion(with: CharacterSet.symbols)
-    disallowed.formUnion(with: CharacterSet.illegalCharacters)
-    disallowed.formUnion(with: CharacterSet.controlCharacters)
-    disallowed.removeCharacters(in: "_")
+    var disallowed = CharacterSet(charactersIn: "")
+    disallowed.formUnion(CharacterSet.whitespacesAndNewlines)
+    disallowed.formUnion(CharacterSet.punctuationCharacters)
+    disallowed.formUnion(CharacterSet.symbols)
+    disallowed.formUnion(CharacterSet.illegalCharacters)
+    disallowed.formUnion(CharacterSet.controlCharacters)
+    disallowed.remove(charactersIn: "_")
 
     // Emoji ranges, roughly based on http://www.unicode.org/Public/emoji/1.0//emoji-data.txt
     [
         0x2600...0x27BF,
         0x1F300...0x1F6FF,
         0x1F900...0x1F9FF,
         0x1F1E6...0x1F1FF,
-    ].forEach {
-        let range = NSRange(location: $0.lowerBound, length: $0.upperBound - $0.lowerBound)
-        disallowed.removeCharacters(in: range)
-    }
+    ].forEach { range in range.compactMap(UnicodeScalar.init).forEach { scalar in disallowed.remove(scalar) } }
 
-    return disallowed as CharacterSet
+    return disallowed
 }()
 
 // Based on https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID413

Sources/RswiftParsers/Resources/AssetCatalog+Parser.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 import RswiftResources
-import CoreGraphics
 
 // Note: "appiconset" is not loadable by default, so it's not included here
 private let imageExtensions: Set<String> = ["launchimage", "imageset", "imagestack", "symbolset"]
@@ -41,7 +40,11 @@ extension AssetCatalog: SupportedExtensions {
         }
         let options: FileManager.DirectoryEnumerationOptions
         if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
+            #if !os(Linux)
             options = [.skipsHiddenFiles, .producesRelativePathURLs]
+            #else
+            options = [.skipsHiddenFiles]
+            #endif
         } else {
             options = [.skipsHiddenFiles]
         }

Sources/RswiftParsers/Resources/FontResource+Parser.swift

@@ -7,11 +7,15 @@
 
 import Foundation
 import RswiftResources
+
+#if canImport(CoreGraphics)
 import CoreGraphics
+#endif
 
 extension FontResource: SupportedExtensions {
     static public let supportedExtensions: Set<String> = ["otf", "ttf"]
 
+    #if canImport(CoreGraphics)
     static public func parse(url: URL) throws -> FontResource {
         guard let dataProvider = CGDataProvider(url: url as CFURL) else {
             throw ResourceParsingError("Unable to create data provider for font at \(url)")
@@ -28,4 +32,9 @@ extension FontResource: SupportedExtensions {
             filename: url.lastPathComponent
         )
     }
+    #else
+    static public func parse(url: URL) throws -> FontResource {
+        throw ResourceParsingError("Unsupported FontResource.parse")
+    }
+    #endif
 }

Sources/RswiftParsers/Resources/ImageResource+Parser.swift

@@ -7,8 +7,6 @@
 
 import Foundation
 import RswiftResources
-import CoreGraphics
-
 
 extension ImageResource: SupportedExtensions {
     // See "Supported Image Formats" on https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIImage_Class/

Sources/RswiftParsers/Resources/Nib+Parser.swift

@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if canImport(FoundationXML)
+import FoundationXML
+#endif
 import RswiftResources
 
 
@@ -60,7 +63,7 @@ internal class NibParserDelegate: NSObject, XMLParserDelegate {
     var isObjectsTagOpened = false;
     var levelSinceObjectsTagOpened = 0;
 
-    @objc func parser(_ parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attributeDict: [String : String]) {
+    func parser(_ parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attributeDict: [String : String]) {
         if isObjectsTagOpened {
             levelSinceObjectsTagOpened += 1
         }
@@ -113,7 +116,7 @@ internal class NibParserDelegate: NSObject, XMLParserDelegate {
         }
     }
 
-    @objc func parser(_ parser: XMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?) {
+    func parser(_ parser: XMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?) {
         switch elementName {
         case "objects":
             isObjectsTagOpened = false;

Sources/RswiftParsers/Resources/Storyboard+Parser.swift

@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if canImport(FoundationXML)
+import FoundationXML
+#endif
 import RswiftResources
 
 
@@ -96,7 +99,7 @@ private class StoryboardParserDelegate: NSObject, XMLParserDelegate {
     // State
     var currentViewController: StoryboardResource.ViewController?
 
-    @objc func parser(_ parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attributeDict: [String : String]) {
+    func parser(_ parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attributeDict: [String : String]) {
         if let id = attributeDict["id"], isGenerated(id: id) {
             generatedIds.append(id)
         }
@@ -173,7 +176,7 @@ private class StoryboardParserDelegate: NSObject, XMLParserDelegate {
         }
     }
 
-    @objc func parser(_ parser: XMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?) {
+    func parser(_ parser: XMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?) {
         // We keep the current view controller open to collect segues until the closing scene:
         // <scene>
         //   <viewController>

Sources/RswiftParsers/Shared/Glob.swift

@@ -8,6 +8,12 @@
 
 import Foundation
 
+#if os(Linux)
+import Glibc
+#else
+import Darwin
+#endif
+
 public let GlobBehaviorBashV3 = Glob.Behavior(
     supportsGlobstar: false,
     includesFilesFromRootOfGlobstar: false,
@@ -202,7 +208,7 @@ public class Glob: Collection {
     private func populateFiles(gt: glob_t, includeFiles: Bool) {
         let includeDirectories = behavior.includesDirectoriesInResults
 
-        for i in 0..<Int(gt.gl_matchc) {
+        for i in 0..<Int(gt.gl_pathc) {
             if let path = String(validatingUTF8: gt.gl_pathv[i]!) {
                 if !includeFiles || !includeDirectories {
                     let isDirectory = self.isDirectory(path: path)

Sources/RswiftResources/Integrations/Bundle+Extensions.swift

@@ -32,7 +32,7 @@ extension Bundle {
                 if #available(macOS 13, iOS 16, tvOS 16, watchOS 9, *) {
                     // Xcode 14 doesn't recognize `Locale.language`, Xcode 14.1 does know `Locale.language`
                     // Xcode 14.1 is first to ship with swift 5.7.1
-                    #if swift(>=5.7.1)
+                    #if swift(>=5.7.1) && !os(Linux)
                     language = locale.language.languageCode?.identifier
                     #else
                     language = locale.languageCode

Sources/RswiftResources/Integrations/ColorResource+Integrations.swift

@@ -6,6 +6,8 @@
 //
 
 import Foundation
+
+#if canImport(SwiftUI)
 import SwiftUI
 
 @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, visionOS 1, *)
@@ -20,7 +22,7 @@ extension Color {
         self.init(resource.name, bundle: resource.bundle)
     }
 }
-
+#endif
 
 #if os(iOS) || os(tvOS) || os(visionOS)
 import UIKit

Sources/RswiftResources/Integrations/DataResource+Integrations.swift

@@ -13,6 +13,7 @@ import UIKit
 import AppKit
 #endif
 
+#if canImport(UIKit) || canImport(AppKit)
 extension NSDataAsset {
 
     /**
@@ -37,3 +38,4 @@ extension DataResource {
         NSDataAsset(resource: self)?.data
     }
 }
+#endif