fix: change minimum supported ios version to 14 & fix Nimble issues

Esakkiraja-Pothikannan · Esakkiraja-Pothikannan · commit b235a890e88c · 2024-08-27T11:56:46.000+05:30
diff --git a/Package.resolved b/Package.resolved
@@ -1,43 +1,41 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "CwlCatchException",
-        "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
-        "state": {
-          "branch": null,
-          "revision": "35f9e770f54ce62dd8526470f14c6e137cef3eea",
-          "version": "2.1.1"
-        }
-      },
-      {
-        "package": "CwlPreconditionTesting",
-        "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
-        "state": {
-          "branch": null,
-          "revision": "c21f7bab5ca8eee0a9998bbd17ca1d0eb45d4688",
-          "version": "2.1.0"
-        }
-      },
-      {
-        "package": "Nimble",
-        "repositoryURL": "https://github.com/Quick/Nimble.git",
-        "state": {
-          "branch": null,
-          "revision": "c93f16c25af5770f0d3e6af27c9634640946b068",
-          "version": "9.2.1"
-        }
-      },
-      {
-        "package": "Quick",
-        "repositoryURL": "https://github.com/Quick/Quick.git",
-        "state": {
-          "branch": null,
-          "revision": "f9d519828bb03dfc8125467d8f7b93131951124c",
-          "version": "5.0.1"
-        }
+  "pins" : [
+    {
+      "identity" : "cwlcatchexception",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/mattgallagher/CwlCatchException.git",
+      "state" : {
+        "revision" : "3ef6999c73b6938cc0da422f2c912d0158abb0a0",
+        "version" : "2.2.0"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "cwlpreconditiontesting",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git",
+      "state" : {
+        "revision" : "2ef56b2caf25f55fa7eef8784c30d5a767550f54",
+        "version" : "2.2.1"
+      }
+    },
+    {
+      "identity" : "nimble",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Quick/Nimble.git",
+      "state" : {
+        "revision" : "831000dd1939bc2096df572c5fd156f41d858bfa",
+        "version" : "12.1.0"
+      }
+    },
+    {
+      "identity" : "quick",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Quick/Quick.git",
+      "state" : {
+        "revision" : "9913828ef3554e6cc1a57797c9f8dfd136c6c9d6",
+        "version" : "7.1.0"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/Podfile b/Podfile
@@ -1,7 +1,7 @@
 workspace 'RSDKUtils.xcworkspace'
 project 'RSDKUtils.xcodeproj'
 
-platform :ios, '12.0'
+platform :ios, '14.0'
 
 use_frameworks!
 
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,19 +1,29 @@
 PODS:
-  - Nimble (10.0.0)
+  - CwlCatchException (2.2.0):
+    - CwlCatchExceptionSupport (~> 2.2.0)
+  - CwlCatchExceptionSupport (2.2.0)
+  - CwlMachBadInstructionHandler (2.2.0)
+  - CwlPosixPreconditionTesting (2.2.0)
+  - CwlPreconditionTesting (2.2.1):
+    - CwlCatchException (~> 2.2.0)
+    - CwlMachBadInstructionHandler (~> 2.2.0)
+    - CwlPosixPreconditionTesting (~> 2.2.0)
+  - Nimble (13.3.0):
+    - CwlPreconditionTesting (~> 2.2.0)
   - Quick (5.0.1)
-  - RSDKUtils (4.2.0):
-    - RSDKUtils/Main (= 4.2.0)
-  - RSDKUtils/Main (4.2.0):
+  - RSDKUtils (4.2.0-sanpshot):
+    - RSDKUtils/Main (= 4.2.0-sanpshot)
+  - RSDKUtils/Main (4.2.0-sanpshot):
     - RSDKUtils/RLogger
-  - RSDKUtils/Nimble (4.2.0):
+  - RSDKUtils/Nimble (4.2.0-sanpshot):
     - Nimble
     - RSDKUtils/Main
-  - RSDKUtils/REventLogger (4.2.0):
+  - RSDKUtils/REventLogger (4.2.0-sanpshot):
     - RSDKUtils/Main
-  - RSDKUtils/RLogger (4.2.0)
-  - RSDKUtils/TestHelpers (4.2.0):
+  - RSDKUtils/RLogger (4.2.0-sanpshot)
+  - RSDKUtils/TestHelpers (4.2.0-sanpshot):
     - RSDKUtils/Main
-  - SwiftLint (0.51.0)
+  - SwiftLint (0.55.1)
 
 DEPENDENCIES:
   - Nimble
@@ -27,6 +37,11 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
+    - CwlCatchException
+    - CwlCatchExceptionSupport
+    - CwlMachBadInstructionHandler
+    - CwlPosixPreconditionTesting
+    - CwlPreconditionTesting
     - Nimble
     - Quick
     - SwiftLint
@@ -36,11 +51,16 @@ EXTERNAL SOURCES:
     :path: "./RSDKUtils.podspec"
 
 SPEC CHECKSUMS:
-  Nimble: 5316ef81a170ce87baf72dd961f22f89a602ff84
+  CwlCatchException: 51bf8319009a31104ea6f0568730d1ecc25b6454
+  CwlCatchExceptionSupport: 1345d6adb01a505933f2bc972dab60dcb9ce3e50
+  CwlMachBadInstructionHandler: ea1030428925d9bf340882522af30712fb4bf356
+  CwlPosixPreconditionTesting: a125dee731883f2582715f548c6b6c92c7fde145
+  CwlPreconditionTesting: ccfd08aca58d14e04062b2a3dd2fd52e09857453
+  Nimble: 3ac6c6b0b7e9835d1540b6507d8054b12a415536
   Quick: 749aa754fd1e7d984f2000fe051e18a3a9809179
-  RSDKUtils: 4ef7a283108a78e879f335c788d78bbd5699f907
-  SwiftLint: 1b7561918a19e23bfed960e40759086e70f4dba5
+  RSDKUtils: 5ea71ba3d42b66fb3ae8934161acdbeb275a3d59
+  SwiftLint: 3fe909719babe5537c552ee8181c0031392be933
 
-PODFILE CHECKSUM: 8a4402b65acba7b2f575d044fe019c2be6438d7e
+PODFILE CHECKSUM: 9f29c14487bce601194343a3e0b8304e001bdd2d
 
 COCOAPODS: 1.15.2
diff --git a/RSDKUtils.podspec b/RSDKUtils.podspec
@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name         = "RSDKUtils"
-  s.version      = "4.2.0"
+  s.version      = "4.2.0-sanpshot"
   s.authors      = "Rakuten Ecosystem Mobile"
   s.summary      = "Rakuten's SDK Team internal utilities module."
   s.homepage     = "https://github.com/rakutentech/ios-sdkutils"
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
   s.source       = { :git => "https://github.com/rakutentech/ios-sdkutils.git", :tag => s.version.to_s }
   s.platforms    = { :ios => '14.0', :watchos => '6.0' }
-  s.swift_versions = ['5.4', '5.5', 5.9]
+  s.swift_versions = ['5.4', '5.5', '5.9']
   s.resources = ['Sources/Resources/PrivacyInfo.xcprivacy']
   s.requires_arc = true
   s.pod_target_xcconfig = {
diff --git a/RSDKUtils.xcodeproj/project.pbxproj b/RSDKUtils.xcodeproj/project.pbxproj
@@ -498,6 +498,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				INFOPLIST_FILE = "Tests/Tests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator watchos watchsimulator";
@@ -515,6 +516,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				INFOPLIST_FILE = "Tests/Tests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator watchos watchsimulator";
diff --git a/Sources/RSDKUtilsMain/AnalyticsBroadcaster.swift b/Sources/RSDKUtilsMain/AnalyticsBroadcaster.swift
@@ -15,7 +15,7 @@ public extension NSNotification.Name {
     /// - Parameter dataObject: Optional dictionary to pass in any other data to RAT.
     /// - Parameter customAccountNumber: When set, the event will be sent to this RAT account number instead of the one set in the app (optional).
     ///                                  The value should be a positive integer.
-    @objc public class func sendEventName(_ name: String, dataObject: [String: Any]? = nil, customAccountNumber: NSNumber? = nil) {
+    @objc public static func sendEventName(_ name: String, dataObject: [String: Any]? = nil, customAccountNumber: NSNumber? = nil) {
         var parameters: [String: Any] = ["eventName": name]
         if let dataObject = dataObject {
             parameters["eventData"] = dataObject
diff --git a/Sources/RSDKUtilsMain/DependencyInjection/AnyDependenciesContainer.swift b/Sources/RSDKUtilsMain/DependencyInjection/AnyDependenciesContainer.swift
@@ -55,14 +55,14 @@ struct SwiftyDependenciesContainer<T: Equatable> {
 
     /// Returns an instance for a given type
     /// @warning Returns the first found instance for a given type
-    func resolve<T>(_ typeToResolve: T.Type) -> T? {
+    func resolve<U>(_ typeToResolve: U.Type) -> U? {
         let result = elements.first {
-            guard let element = $0 as? T else {
+            guard let element = $0 as? U else {
                 return false
             }
             return type(of: element) == typeToResolve
         }
 
-        return result as? T
+        return result as? U
     }
 }
diff --git a/Sources/RSDKUtilsMain/Networking/Reachability.swift b/Sources/RSDKUtilsMain/Networking/Reachability.swift
@@ -125,7 +125,7 @@ public class Reachability: ReachabilityType {
                 _ = unmanagedWeakSelf.retain()
                 return UnsafeRawPointer(unmanagedWeakSelf.toOpaque())
             },
-            release: { (info: UnsafeRawPointer) -> Void in
+            release: { (info: UnsafeRawPointer) in
                 let unmanagedWeakSelf = UnmanagedWeakSelf.fromOpaque(info)
                 unmanagedWeakSelf.release()
             },
diff --git a/Sources/RSDKUtilsNimble/NimbleExtensions.swift b/Sources/RSDKUtilsNimble/NimbleExtensions.swift
@@ -1,11 +1,11 @@
 import Foundation
 import Nimble
 
-public extension Expectation {
+public extension SyncExpectation {
 
     func toAfterTimeout(file: FileString = #file,
                         line: UInt = #line,
-                        _ predicate: Nimble.Predicate<T>,
+                        _ predicate: Nimble.Matcher<Value>,
                         timeout: TimeInterval = 1.0) {
 
         let timeForExecution: TimeInterval = 1.0
@@ -20,7 +20,7 @@ public extension Expectation {
 
     func toAfterTimeoutNot(file: FileString = #file,
                            line: UInt = #line,
-                           _ predicate: Nimble.Predicate<T>,
+                           _ predicate: Nimble.Matcher<Value>,
                            timeout: TimeInterval = 1.0) {
 
         let timeForExecution: TimeInterval = 1.0
@@ -33,7 +33,7 @@ public extension Expectation {
         }
     }
 
-    private func evaluateExpression() throws -> T? {
+    private func evaluateExpression() throws -> Value? {
         try self.expression.evaluate()
     }
 }
@@ -42,17 +42,17 @@ public extension Expectation {
 /// if they are not in the same order.
 public func elementsEqualOrderAgnostic<Col1: Collection, Col2: Collection>(
     _ expectedValue: Col2?
-) -> Nimble.Predicate<Col1> where Col1.Element: Equatable, Col1.Element == Col2.Element {
-    return Predicate.define("elementsEqualOrderAgnostic <\(stringify(expectedValue))>") { (actualExpression, msg) in
+) -> Nimble.Matcher<Col1> where Col1.Element: Equatable, Col1.Element == Col2.Element {
+    return Matcher.define("elementsEqualOrderAgnostic <\(stringify(expectedValue))>") { (actualExpression, msg) in
         let actualValue = try actualExpression.evaluate()
         switch (expectedValue, actualValue) {
         case (nil, _?):
-            return PredicateResult(status: .fail, message: msg.appendedBeNilHint())
+            return MatcherResult(status: .fail, message: msg.appendedBeNilHint())
         case (nil, nil), (_, nil):
-            return PredicateResult(status: .fail, message: msg)
+            return MatcherResult(status: .fail, message: msg)
         case (let expected?, let actual?):
             let matches = expected.count == actual.count && expected.allSatisfy { actual.contains($0) }
-            return PredicateResult(bool: matches, message: msg)
+            return MatcherResult(bool: matches, message: msg)
         }
     }
 }
diff --git a/Sources/RSDKUtilsTestHelpers/URLSessionMock.swift b/Sources/RSDKUtilsTestHelpers/URLSessionMock.swift
@@ -86,9 +86,7 @@ public final class URLSessionMock: URLSession {
             }
             return "\"\(item.name)\": \"\(value)\""
         }.compactMap { $0 }
-        guard let jsonData = "{\(array.joined(separator: ","))}".data(using: .utf8) else {
-            return nil
-        }
+        let jsonData = Data("{\(array.joined(separator: ","))}".utf8)
         return try? JSONDecoder().decode(modelType.self, from: jsonData)
     }
 
diff --git a/Tests/Tests/URLSessionMockSpec.swift b/Tests/Tests/URLSessionMockSpec.swift
@@ -157,7 +157,7 @@ final class URLSessionMockSpec: QuickSpec {
                                                            httpVersion: nil,
                                                            headerFields: nil)
                     let expectedError = NSError(domain: "mock.domain", code: 1234, userInfo: ["user": "info"])
-                    let expectedData = "data".data(using: .utf8)
+                    let expectedData = Data("data".utf8)
                     sessionMock.httpResponse = expectedResponse
                     sessionMock.responseError = expectedError
                     sessionMock.responseData = expectedData
@@ -200,9 +200,9 @@ final class URLSessionMockSpec: QuickSpec {
                 context("when calling decodeSentData()") {
 
                     it("should succeed if all expected parameters are present") {
-                        let jsonData = """
+                        let jsonData = Data("""
                         {"identifier":100, "isTest":true, "appVersion":"1.2.3", "sdkVersion":"0.0.5"}
-                        """.data(using: .utf8)!
+                        """.utf8)
 
                         var request = URLRequest(url: URL(string: "https://google.com")!)
                         request.httpBody = jsonData
@@ -221,9 +221,9 @@ final class URLSessionMockSpec: QuickSpec {
                     }
 
                     it("should succeed if there are optional parameters in the json") {
-                        let jsonData = """
+                        let jsonData = Data("""
                         {"identifier":100, "isTest":true, "appVersion":"1.2.3", "sdkVersion":"0.0.5", "locale":"pl"}
-                        """.data(using: .utf8)!
+                        """.utf8)
 
                         var request = URLRequest(url: URL(string: "https://google.com")!)
                         request.httpBody = jsonData
@@ -242,9 +242,9 @@ final class URLSessionMockSpec: QuickSpec {
                     }
 
                     it("should fail if not all expected parameters are present") {
-                        let jsonData = """
+                        let jsonData = Data("""
                         {"identifier":100, "isTest":true, "appVersion":"1.2.3"}
-                        """.data(using: .utf8)!
+                        """.utf8)
 
                         var request = URLRequest(url: URL(string: "https://google.com")!)
                         request.httpBody = jsonData
@@ -259,9 +259,9 @@ final class URLSessionMockSpec: QuickSpec {
                     }
 
                     it("should fail if parameter type does not match") {
-                        let jsonData = """
+                        let jsonData = Data("""
                         {"identifier":"id", "isTest":true, "appVersion":"1.2.3", "sdkVersion":"0.0.5"}
-                        """.data(using: .utf8)!
+                        """.utf8)
 
                         var request = URLRequest(url: URL(string: "https://google.com")!)
                         request.httpBody = jsonData

Original file line number	Diff line number	Diff line change
`@@ -55,14 +55,14 @@ struct SwiftyDependenciesContainer<T: Equatable> {`
`55`	`55`
`56`	`56`	`/// Returns an instance for a given type`
`57`	`57`	`/// @warning Returns the first found instance for a given type`
`58`		`- func resolve<T>(_ typeToResolve: T.Type) -> T? {`
	`58`	`+ func resolve<U>(_ typeToResolve: U.Type) -> U? {`
`59`	`59`	`let result = elements.first {`
`60`		`- guard let element = $0 as? T else {`
	`60`	`+ guard let element = $0 as? U else {`
`61`	`61`	`return false`
`62`	`62`	`}`
`63`	`63`	`return type(of: element) == typeToResolve`
`64`	`64`	`}`
`65`	`65`
`66`		`- return result as? T`
	`66`	`+ return result as? U`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,7 @@ public final class URLSessionMock: URLSession {`
`86`	`86`	`}`
`87`	`87`	`return "\"\(item.name)\": \"\(value)\""`
`88`	`88`	`}.compactMap { $0 }`
`89`		`- guard let jsonData = "{\(array.joined(separator: ","))}".data(using: .utf8) else {`
`90`		`- return nil`
`91`		`- }`
	`89`	`+ let jsonData = Data("{\(array.joined(separator: ","))}".utf8)`
`92`	`90`	`return try? JSONDecoder().decode(modelType.self, from: jsonData)`
`93`	`91`	`}`
`94`	`92`