Revert Regex changes to hopefully fix GH Actions

Signed-off-by: Henrik Panhans <[email protected]>

Sources/SwiftFrameCore/Config/ConfigData.swift

@@ -67,9 +67,9 @@ struct ConfigData: Decodable, ConfigValidateable {
     // MARK: - Processing
 
     mutating func process() throws {
-        let regex: Regex<AnyRegexOutput>?
+        let regex: NSRegularExpression?
         if let localesRegex, !localesRegex.isEmpty {
-            regex = try Regex(localesRegex)
+            regex = try NSRegularExpression(pattern: localesRegex)
         } else {
             regex = nil
         }

Sources/SwiftFrameCore/Config/DeviceData.swift

@@ -57,7 +57,7 @@ struct DeviceData: Decodable, ConfigValidateable {
 
     // MARK: - Methods
 
-    func makeProcessedData(localesRegex: Regex<AnyRegexOutput>?) throws -> DeviceData {
+    func makeProcessedData(localesRegex: NSRegularExpression?) throws -> DeviceData {
         guard let templateImage = ImageLoader.loadRepresentation(at: templateImagePath.absoluteURL) else {
             throw NSError(description: "Error while loading template image at path \(templateImagePath.absoluteString)")
         }

Sources/SwiftFrameCore/Extensions/Collection+Extensions.swift

@@ -1,15 +1,24 @@
 import Foundation
 
-extension [URL] {
+extension Array where Element == URL {
 
-    func filterByFileOrFoldername(regex: Regex<AnyRegexOutput>?) throws -> Self {
+    func filterByFileOrFoldername(regex: NSRegularExpression?) throws -> Self {
         guard let regex else {
             return self
         }
         return self.filter { url in
             let lastComponent = url.deletingPathExtension().lastPathComponent
-            return !lastComponent.matches(of: regex).isEmpty
+            return regex.matches(lastComponent)
         }
     }
 
 }
+
+extension NSRegularExpression {
+
+    func matches(_ string: String) -> Bool {
+        let range = NSRange(location: 0, length: (string as NSString).length)
+        return firstMatch(in: string, options: [], range: range) != nil
+    }
+
+}

Tests/SwiftFrameTests/RegexMatchTests.swift

@@ -19,7 +19,7 @@ class RegexMatchTests: XCTestCase {
     }
 
     func testFranceFilteredOut() throws {
-        let regex = try Regex("^(?!fr$)\\w*$")
+        let regex = try NSRegularExpression(pattern: "^(?!fr$)\\w*$", options: .caseInsensitive)
         let urls = try RegexMatchTests.urls.filterByFileOrFoldername(regex: regex)
 
         guard ky_assertEqual(urls.count, 3) else {
@@ -31,7 +31,7 @@ class RegexMatchTests: XCTestCase {
     }
 
     func testFranceAndRussiaFilteredOut() throws {
-        let regex = try Regex("^(?!fr|ru$)\\w*$")
+        let regex = try NSRegularExpression(pattern: "^(?!fr|ru$)\\w*$", options: .caseInsensitive)
         let urls = try RegexMatchTests.urls.filterByFileOrFoldername(regex: regex)
 
         guard ky_assertEqual(urls.count, 2) else {
@@ -42,7 +42,7 @@ class RegexMatchTests: XCTestCase {
     }
 
     func testOnlyRussiaAndFrance() throws {
-        let regex = try Regex("ru|fr")
+        let regex = try NSRegularExpression(pattern: "ru|fr", options: .caseInsensitive)
         let urls = try RegexMatchTests.urls.filterByFileOrFoldername(regex: regex)
 
         guard ky_assertEqual(urls.count, 2) else {