Pull request #1469: 🛠 Chore: Update Safari Converter Lib to v2.0.39

Merge in ADGUARD-IOS/adguard-ios from enhance/AG-21154 to version/v4.3 * commit '468a9e3f6f500281c22fbdc4bb7c74fcc54cf458': 🛠 Chore: Bump build version 🛠 Chore: #upgrade_deps converterlib from:v2.0.38 to:v2.0.39
AdguardTeam · Apr 5, 2023 · 240e87c · 240e87c
2 parents 71a695d + 468a9e3
commit 240e87c
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 22 deletions.
diff --git a/AdGuardSDK/AdGuardSDK.xcodeproj/project.pbxproj b/AdGuardSDK/AdGuardSDK.xcodeproj/project.pbxproj
@@ -3208,7 +3208,7 @@
 			repositoryURL = "https://github.com/AdguardTeam/SafariConverterLib";
 			requirement = {
 				kind = exactVersion;
-				version = 2.0.38;
+				version = 2.0.39;
 			};
 		};
 		D0A3CF9026E7AADE006E90AD /* XCRemoteSwiftPackageReference "Reachability" */ = {

diff --git a/AdGuardSDK/AdGuardSDK/Safari/FiltersConvertation/FiltersConverter.swift b/AdGuardSDK/AdGuardSDK/Safari/FiltersConvertation/FiltersConverter.swift
@@ -86,7 +86,7 @@ final class FiltersConverter: FiltersConverterProtocol {
      */
     private lazy var emptyRuleJsonResult: ConversionResult = {
         let converter = ContentBlockerConverterWrapper()
-        let safariVersion = SafariVersion(rawValue: configuration.iosVersion) ?? .safari15
+        let safariVersion = SafariVersion(configuration.iosVersion)
         return converter.convertArray(rules: [], safariVersion: safariVersion, optimize: false, advancedBlocking: false)
     }()
 
@@ -177,7 +177,7 @@ final class FiltersConverter: FiltersConverterProtocol {
     private func convert(filters: [ContentBlockerType: [String]]) -> [FiltersConverterResult] {
         Logger.logInfo("(FiltersConverter) - convertFilters; Safari rules conversion started")
 
-        let safariVersion = SafariVersion(rawValue: configuration.iosVersion) ?? .safari15
+        let safariVersion = SafariVersion(configuration.iosVersion)
         let conversionResult: [FiltersConverterResult] = filters.concurrentMap { [unowned self] cbType, rules -> FiltersConverterResult in
 
             Logger.logInfo("(FiltersConverter) - convertFilters; Start converting \(cbType)")

diff --git a/AdGuardSDK/AdGuardSDK/Safari/SafariProtection/SafariConfiguration.swift b/AdGuardSDK/AdGuardSDK/Safari/SafariProtection/SafariConfiguration.swift
@@ -21,7 +21,7 @@ import SharedAdGuardSDK
 // MARK: - ConfigurationProtocol
 
 public protocol SafariConfigurationProtocol: ConfigurationProtocol {
-    var iosVersion: Int { get set } // iOS version is used in SafariConverter lib, it can be obtained with UIDevice.current.systemVersion
+    var iosVersion: Double { get set } // iOS version is used in SafariConverter lib, it can be obtained with UIDevice.current.systemVersion
     var safariProtectionEnabled: Bool { get set }
     var advancedBlockingIsEnabled: Bool { get set } // Feature is available since iOS 15
     var blocklistIsEnabled: Bool { get set }
@@ -38,7 +38,7 @@ public protocol SafariConfigurationProtocol: ConfigurationProtocol {
 // MARK: - Configuration
 
 public final class SafariConfiguration: SafariConfigurationProtocol {
-    public var iosVersion: Int
+    public var iosVersion: Double
     public var currentLocale: Locale
     public var proStatus: Bool
     public var safariProtectionEnabled: Bool
@@ -53,7 +53,7 @@ public final class SafariConfiguration: SafariConfigurationProtocol {
     public var cid: String
 
     public init(
-        iosVersion: Int,
+        iosVersion: Double,
         currentLocale: Locale,
         proStatus: Bool,
         safariProtectionEnabled: Bool,

diff --git a/AdGuardSDK/AdGuardSDKTests/Mocks/SafariConfigurationMock.swift b/AdGuardSDK/AdGuardSDKTests/Mocks/SafariConfigurationMock.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 final class SafariConfigurationMock: SafariConfigurationProtocol {
-    var iosVersion: Int = 11
+    var iosVersion: Double = 11
 
     var advancedBlockingIsEnabled: Bool = false
 

diff --git a/...ension/AdguardApp/Services/NewAndRefactoredObjects/SafariConfiguration+Initializers.swift b/...ension/AdguardApp/Services/NewAndRefactoredObjects/SafariConfiguration+Initializers.swift
@@ -22,7 +22,7 @@ import SafariAdGuardSDK
 /// This extension adds methods which constuct `SafariConfiguration` objects from inner services
 extension SafariConfiguration {
     convenience init(bundle: Bundle = .main, currentLocale: Locale = .current, resources: AESharedResourcesProtocol, isProPurchased: Bool) {
-        self.init(iosVersion: UIDevice.current.iosVersion,
+        self.init(iosVersion: UIDevice.current.getIOSVersion(),
                   currentLocale: currentLocale,
                   proStatus: bundle.isPro ? true : isProPurchased,
                   safariProtectionEnabled: resources.safariProtectionEnabled,
@@ -40,7 +40,7 @@ extension SafariConfiguration {
     /// All the parameters are set as if the app starts for the first time
     static func defaultConfiguration(bundle: Bundle = .main, currentLocale: Locale = Locale.current) -> SafariConfiguration {
         return SafariConfiguration(
-            iosVersion: UIDevice.current.iosVersion,
+            iosVersion: UIDevice.current.getIOSVersion(),
             currentLocale: currentLocale,
             proStatus: bundle.isPro,
             safariProtectionEnabled: true,

diff --git a/AdguardExtension/AdguardApp/Services/Utils/UIDevice+Utils.swift b/AdguardExtension/AdguardApp/Services/Utils/UIDevice+Utils.swift
@@ -23,4 +23,12 @@ extension UIDevice {
         let versions = systemVersion.split(separator: ".")
         return Int(versions[0]) ?? 0
     }
+
+    func getIOSVersion() -> Double {
+        let splited = systemVersion.split(separator: ".")
+
+        guard 2...3 ~= splited.count else { return 0.0 }
+
+        return Double("\(splited[0]).\(splited[1])") ?? 0.0
+    }
 }
diff --git a/...tension/AdguardApp/UI/ViewControllers/MainTabBar/MainMenu/About/AboutViewController.swift b/...tension/AdguardApp/UI/ViewControllers/MainTabBar/MainMenu/About/AboutViewController.swift
@@ -80,7 +80,7 @@ class AboutViewController: UIViewController {
             // ExtendedCss version place in yarn.lock file, take it not from `tsurlfilter` dependencies
             versionFormat += """
 
-                            SafariConverterLib v2.0.38
+                            SafariConverterLib v2.0.39
                             Scriptlets v1.9.1
                             ExtendedCss v2.0.51
                             """

diff --git a/AdguardExtension/Common-Config.xcconfig b/AdguardExtension/Common-Config.xcconfig
@@ -17,5 +17,5 @@
 //
 
 AG_VERSION = 4.4.6
-AG_BUILD = 995
+AG_BUILD = 998
 
diff --git a/AdguardExtension/SafariWebExtension/Resources/assistant.js b/AdguardExtension/SafariWebExtension/Resources/assistant.js
diff --git a/AdguardExtension/SafariWebExtension/Resources/background.js b/AdguardExtension/SafariWebExtension/Resources/background.js
diff --git a/AdguardExtension/SafariWebExtension/Resources/content.js b/AdguardExtension/SafariWebExtension/Resources/content.js
diff --git a/AdguardExtension/SafariWebExtension/Resources/popup.js b/AdguardExtension/SafariWebExtension/Resources/popup.js
diff --git a/AdguardSafariExtension-iOS.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AdguardSafariExtension-iOS.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/AdguardTeam/SafariConverterLib",
       "state" : {
-        "revision" : "9ed54e90168d18abe7621e740c86b3ea4ea30589",
-        "version" : "2.0.38"
+        "revision" : "c1673c955ff787c4acf3b0082f74fdac0c9bbffd",
+        "version" : "2.0.39"
       }
     },
     {