Merge pull request 'New LCECryptoKit version' (#2) from feature/LCECryptoKit into main

Reviewed-on: https://loverde_git.localhost:3334/Loverde-Company-LTDA/LCEssentials/pulls/2

Package.resolved

@@ -1,13 +1,13 @@
 {
-  "originHash" : "33e7d52ad13cf774717778548edb365d33ff62d766d0049165bc8970f19a23ef",
+  "originHash" : "0cae429bbd156715149253da2c3f23815f5e41836679a585dd496e0d48155975",
   "pins" : [
     {
       "identity" : "lcecryptokitbinary",
-      "kind" : "localSourceControl",
-      "location" : "/Users/loverde_co/Documents/Loverde_JOBs/Producao/Loverde Co/GIT/XCODE/Repositorios/LCECryptoKit/PrivateLib/LCECryptoKitBinary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://60c260c85d3a2fe840411b0ff98f521b5eca3c56@git.loverde.com.br/Loverde-Company-LTDA/LCECryptoKitBinary.git",
       "state" : {
-        "revision" : "2c5c47cebef40a8adc5557d071a35be405c05e30",
-        "version" : "1.0.2"
+        "revision" : "efd58c115c41bd8c28a1458a9150778806953bd0",
+        "version" : "1.0.1"
       }
     }
   ],

Package.swift

@@ -3,23 +3,6 @@ import PackageDescription
 import Foundation
 
 let isLocalDevelopment = FileManager.default.fileExists(atPath: "../LCECryptoKit/PrivateLib/LCECryptoKitBinary")
-let enableCryptoBinary = ProcessInfo.processInfo.environment["LCE_ENABLE_CRYPTO_BINARY"] != "0"
-
-let cryptoPackageURL = isLocalDevelopment
-    ? "../LCECryptoKit/PrivateLib/LCECryptoKitBinary"
-    : "https://60c260c85d3a2fe840411b0ff98f521b5eca3c56@git.loverde.com.br/Loverde-Company-LTDA/LCECryptoKitBinary.git"
-
-let packageDependencies: [Package.Dependency] = enableCryptoBinary
-    ? [
-        .package(url: cryptoPackageURL, exact: "1.0.2")
-      ]
-    : []
-
-let targetDependencies: [Target.Dependency] = enableCryptoBinary
-    ? [
-        .product(name: "LCECryptoKit", package: "lcecryptokitbinary")
-      ]
-    : []
 
 let package = Package(
     name: "LCEssentials",
@@ -34,10 +17,17 @@ let package = Package(
             name: "LCEssentials",
             targets: ["LCEssentials"]),
     ],
-    dependencies: packageDependencies,
+    dependencies: [
+        .package(
+            url: isLocalDevelopment ?
+                "../LCECryptoKit/PrivateLib/LCECryptoKitBinary" :
+                "https://60c260c85d3a2fe840411b0ff98f521b5eca3c56@git.loverde.com.br/Loverde-Company-LTDA/LCECryptoKitBinary.git",
+            exact: "1.0.1"
+        )
+    ],
     targets: [
         .target(
             name: "LCEssentials",
-            dependencies: targetDependencies),
+            dependencies: [.product(name: "LCECryptoKit", package: "lcecryptokitbinary")]),
     ]
 )

Sources/LCEssentials/Classes/GifHelper.swift

@@ -5,10 +5,8 @@
 //  Created by iOSDevCenters on 11/12/15.
 //  Copyright © 2016 iOSDevCenters. All rights reserved.
 //
-#if canImport(UIKit)
 import UIKit
-#endif
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 import ImageIO
 
 //let jeremyGif = UIImage.gifWithName("jeremy")

Sources/LCEssentials/Classes/LCECrypto.swift

@@ -21,76 +21,21 @@
  
 
 import Foundation
-
-#if canImport(LCECryptoKit)
 import LCECryptoKit
 
-public final class LCECryptoKitManager {
+public final class LCECrypto {
     
     private let hashKey: String
     
-    public init() {
-        self.hashKey = ""
-    }
-    
-    public init(privateKey: String){
+    init(privateKey: String){
         self.hashKey = privateKey
     }
     
-    public static func generateKey() -> String {
-        LCECryptoKit.generateRandomAESKeyString()
-    }
-    
-    public func encodeTP(email: String, password: String) -> String? {
-        return LCECryptoKit.encodeSeed(email: email, password: password)
-    }
-    
-    public func decodeOTP(_ otpHash: String) -> String? {
-        return LCECryptoKit.decodeSeed(otpKey: otpHash)
-    }
-    
-    // MARK: Need hashKey to decode
-    
-    public func encodeOTPWithKey(email: String, password: String) -> String? {
+    func encodeOTP(email: String, password: String) -> String? {
         return LCECryptoKit.encodeSeed(email: email, password: password, hashKey: self.hashKey)
     }
     
-    public func decodeOTPWithKey(_ otpHash: String) -> Bool {
+    func decodeOTP(_ otpHash: String) -> Bool {
         LCECryptoKit.decodeSeed(otpKey: otpHash, hashKey: self.hashKey)
     }
 }
-#else
-
-public final class LCECryptoKitManager {
-
-    private let hashKey: String
-
-    public init() {
-        self.hashKey = ""
-    }
-
-    public init(privateKey: String){
-        self.hashKey = privateKey
-    }
-
-    public static func generateKey() -> String {
-        ""
-    }
-
-    public func encodeTP(email: String, password: String) -> String? {
-        nil
-    }
-
-    public func decodeOTP(_ otpHash: String) -> String? {
-        nil
-    }
-
-    public func encodeOTPWithKey(email: String, password: String) -> String? {
-        nil
-    }
-
-    public func decodeOTPWithKey(_ otpHash: String) -> Bool {
-        false
-    }
-}
-#endif

Sources/LCEssentials/Classes/LCEssentials+API.swift

@@ -26,10 +26,8 @@ import Foundation
 import Security
 #endif
 #if canImport(UIKit)
-#if canImport(UIKit)
 import UIKit
 #endif
-#endif
 
 /// A generic `Result` enumeration to represent either a success `Value` or a failure `Error`.
 public enum Result<Value, Error: Swift.Error> {

Sources/LCEssentials/Classes/LCEssentials.swift

@@ -21,12 +21,8 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
-#if canImport(AVFoundation)
 import AVFoundation
-#endif
 #if os(watchOS)
 import WatchKit
 #endif
@@ -159,7 +155,7 @@ public struct LCEssentials {
             diskPath: "file_cache"
         )
     
-    #if canImport(UIKit)
+    #if os(iOS) || os(macOS)
     /// Extract the file name from the file path
     ///
     /// - Parameter filePath: Full file path in bundle
@@ -270,11 +266,7 @@ public struct LCEssentials {
     /// - LoverdeCo: Check if app is running in debug mode.
     @MainActor
     public static var isInDebuggingMode: Bool {
-        #if canImport(UIKit)
         return UIApplication.inferredEnvironment == .debug
-        #else
-        return false
-        #endif
     }
     
     #if !os(macOS)
@@ -424,7 +416,7 @@ public struct LCEssentials {
 // MARK: - Methods
 public extension LCEssentials {
     
-    #if canImport(UIKit)
+    #if os(iOS) || os(macOS)
     /// - LoverdeCo: Share link with message
     ///
     /// - Parameters:

Sources/LCEssentials/Classes/LCSingleton.swift

@@ -20,9 +20,7 @@
 // THE SOFTWARE.
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 
 @objc public protocol LCESingletonDelegate: AnyObject {
     @objc optional func singleton(object: Any?, withData: Any)

Sources/LCEssentials/Extensions/LCEssentials+Array.swift

@@ -21,9 +21,7 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 
 // MARK: - Methods (Equatable)
 public extension Array where Element: Equatable {
@@ -150,7 +148,6 @@ public extension Array where Element: Equatable {
     }
 }
 
-#if canImport(UIKit)
 extension Array where Element == NSLayoutConstraint {
 
     @MainActor
@@ -172,5 +169,3 @@ extension Array where Element == NSLayoutConstraint {
         }
     }
 }
-
-#endif

Sources/LCEssentials/Extensions/LCEssentials+Data.swift

@@ -21,12 +21,8 @@
  
 
 import Foundation
-#if canImport(CryptoKit)
 import CryptoKit
-#endif
-#if canImport(CommonCrypto)
 import CommonCrypto
-#endif
 
 
 public extension Data {
@@ -75,25 +71,17 @@ public extension Data {
     
     @available(iOS 13.0, *)
     func HMACSHA512(key: Data) -> Data {
-#if canImport(CryptoKit)
         var hmac = HMAC<SHA512>.init(key: SymmetricKey(data: key))
         hmac.update(data: self)
         return Data(hmac.finalize())
-#else
-        return Data()
-#endif
     }
     
     func SHA512() -> Data {
-#if canImport(CommonCrypto)
         var digest = [UInt8](repeating: 0, count: Int(CC_SHA512_DIGEST_LENGTH))
         self.withUnsafeBytes {
             _ = CC_SHA512($0.baseAddress, CC_LONG(self.count), &digest)
         }
         return Data(digest)
-#else
-        return Data()
-#endif
     }
     
     func XOR(with other: Data) -> Data {
@@ -101,15 +89,11 @@ public extension Data {
     }
     
     func SHA256() -> Data {
-#if canImport(CommonCrypto)
         var digest = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
         self.withUnsafeBytes {
             _ = CC_SHA256($0.baseAddress, CC_LONG(self.count), &digest)
         }
         return Data(digest)
-#else
-        return Data()
-#endif
     }
     
     func object<T: Codable>() -> T? {
@@ -140,13 +124,9 @@ public extension Data {
     ///print("md5Hex: \(md5Hex)")
     @available(iOS 13.0, *)
     static func MD5(string: String) -> Data {
-#if canImport(CryptoKit)
         let messageData = string.data(using: .utf8)!
         let digestData = Insecure.MD5.hash (data: messageData)
         let digestHex = String(digestData.map { String(format: "%02hhx", $0) }.joined().prefix(32))
         return Data(digestHex.utf8)
-#else
-        return Data()
-#endif
     }
 }

Sources/LCEssentials/Extensions/LCEssentials+Dictionary.swift

@@ -21,9 +21,7 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 
 public extension Dictionary {
     

Sources/LCEssentials/Extensions/LCEssentials+FileManager.swift

@@ -21,9 +21,7 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 
 public extension FileManager {
     
@@ -56,7 +54,7 @@ public extension FileManager {
         }
     }
     
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
     func saveImageToDirectory( _ imageWithPath : String, imagem : UIImage ) -> Bool {
         
         let data = imagem.pngData()

Sources/LCEssentials/Extensions/LCEssentials+NSLayoutConstraints.swift

@@ -21,11 +21,8 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 
-#if canImport(UIKit)
 extension NSLayoutConstraint {
     
     func constraintWithMultiplier(_ multiplier: CGFloat) -> NSLayoutConstraint {
@@ -75,4 +72,3 @@ extension NSLayoutConstraint {
         return false
     }
 }
-#endif

Sources/LCEssentials/Extensions/LCEssentials+NSMutableAttributedString.swift

@@ -21,10 +21,8 @@
  
 
 import Foundation
-#if canImport(UIKit)
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 import UIKit
-#endif
 
 public extension NSMutableAttributedString {
     @discardableResult func customize(_ text: String,

Sources/LCEssentials/Extensions/LCEssentials+Optional.swift

@@ -20,9 +20,7 @@
 // THE SOFTWARE.
  
 
-#if canImport(UIKit)
 import UIKit
-#endif
 
 public extension Optional {
     /// Get self of default value (if self is nil).

Sources/LCEssentials/Extensions/LCEssentials+String.swift

@@ -21,9 +21,7 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 #if canImport(CommonCrypto)
 import CommonCrypto
 #endif
@@ -50,14 +48,10 @@ public extension String {
     }
     
     var convertToHTML: NSAttributedString? {
-        #if canImport(UIKit)
         return convertHtmlToAttributedStringWithCSS(font: nil,
                                                     csscolor: "",
                                                     lineheight: 0,
                                                     csstextalign: "")
-        #else
-        return convertHtmlToNSAttributedString
-        #endif
     }
     
     /// Check if string is a valid URL.
@@ -652,7 +646,7 @@ public extension String {
         return strDate?.date(withCurrFormatt: newFormatt, localeIdentifier: localeIdentifier, timeZone: timeZone)
     }
 
-    #if canImport(UIKit)
+    #if os(iOS) || os(macOS)
     func height(withConstrainedWidth width: CGFloat, font: UIFont) -> CGFloat {
         let constraintRect = CGSize(width: width, height: .greatestFiniteMagnitude)
         let boundingBox = self.boundingRect(with: constraintRect, options: .usesLineFragmentOrigin, attributes: [NSAttributedString.Key.font: font], context: nil)
@@ -763,7 +757,7 @@ public extension String {
         }
         return self
     }
-#if canImport(UIKit)
+    
     /// Converte String para HTML com CSS.
     ///
     /// - Parameters:
@@ -807,7 +801,6 @@ public extension String {
             return nil
         }
     }
-#endif
     
     /// Float value from string (if applicable).
     ///

Sources/LCEssentials/Extensions/LCEssentials+UIApplication.swift

@@ -19,10 +19,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
  
-#if canImport(UIKit)
-#if canImport(UIKit)
+#if canImport(UIKit) && os(iOS) || os(macOS)
 import UIKit
-#endif
 
 public extension UIApplication {
     /// Application running environment.

Sources/LCEssentials/Extensions/LCEssentials+UIButton.swift

@@ -21,11 +21,9 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 // MARK: - Properties
 public extension UIButton {
     

Sources/LCEssentials/Extensions/LCEssentials+UICollectionView.swift

@@ -21,10 +21,8 @@
  
 
 import Foundation
-#if canImport(UIKit)
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 import UIKit
-#endif
 
 public extension UICollectionView {
     

Sources/LCEssentials/Extensions/LCEssentials+UIColor.swift

@@ -21,11 +21,9 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 public extension UIColor {
     
     var redValue: CGFloat{ return CIColor(color: self).red }

Sources/LCEssentials/Extensions/LCEssentials+UIDevice.swift

@@ -21,11 +21,9 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 public extension UIDevice {
     
     static var topNotch: CGFloat {

Sources/LCEssentials/Extensions/LCEssentials+UIImage.swift

@@ -21,11 +21,9 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 public extension UIImage {
     //Extension Required by RoundedButton to create UIImage from UIColor
     func imageWithColor(color: UIColor) -> UIImage {

Sources/LCEssentials/Extensions/LCEssentials+UIImageView.swift

@@ -21,11 +21,9 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 @MainActor
 public extension UIImageView {
     

Sources/LCEssentials/Extensions/LCEssentials+UILabel.swift

@@ -21,11 +21,9 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 public extension UILabel {
 
     func lineNumbers() -> Int{

Sources/LCEssentials/Extensions/LCEssentials+UINavigationController.swift

@@ -21,10 +21,8 @@
  
 
 import Foundation
-#if canImport(UIKit)
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 import UIKit
-#endif
 import QuartzCore
 
 public extension UINavigationController {

Sources/LCEssentials/Extensions/LCEssentials+UIResponder.swift

@@ -21,10 +21,8 @@
  
 
 import Foundation
-#if canImport(UIKit)
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 import UIKit
-#endif
 
 public extension UIResponder {
     

Sources/LCEssentials/Extensions/LCEssentials+UIScrollView.swift

@@ -21,9 +21,7 @@
  
 
 #if canImport(UIKit) && !os(watchOS)
-#if canImport(UIKit)
 import UIKit
-#endif
 
 // MARK: - Methods
 public extension UIScrollView {

Sources/LCEssentials/Extensions/LCEssentials+UIStackView.swift

@@ -21,9 +21,7 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 #if os(iOS)
 
 // MARK: - Initializers

Sources/LCEssentials/Extensions/LCEssentials+UITabBarController.swift

@@ -21,10 +21,8 @@
  
 
 import Foundation
-#if canImport(UIKit)
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 import UIKit
-#endif
 
 public class CustomTabBadge: UILabel {
     

Sources/LCEssentials/Extensions/LCEssentials+UITableView.swift

@@ -21,11 +21,9 @@
  
 
 import Foundation
-#if canImport(UIKit)
 import UIKit
-#endif
 
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 //MARK: - UITableView Animation Cell
 public typealias UITableViewCellAnimation = (UITableViewCell, IndexPath, UITableView) -> Void
 

Sources/LCEssentials/Extensions/LCEssentials+UITapGestureRecognizer.swift

@@ -21,10 +21,8 @@
  
 
 import Foundation
-#if canImport(UIKit)
-#if canImport(UIKit)
+#if canImport(UIKit) && os(iOS) || os(macOS)
 import UIKit
-#endif
 
 public extension UITapGestureRecognizer {
     

Sources/LCEssentials/Extensions/LCEssentials+UITextField.swift

@@ -21,10 +21,8 @@
  
 
 import Foundation
-#if canImport(UIKit)
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 import UIKit
-#endif
 
 public extension UITextField {
 

Sources/LCEssentials/Extensions/LCEssentials+UIView.swift

@@ -21,10 +21,8 @@
  
 
 import Foundation
-#if canImport(UIKit)
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 import UIKit
-#endif
 
 typealias GradientPoints = (startPoint: CGPoint, endPoint: CGPoint)
 

Sources/LCEssentials/Extensions/LCEssentials+UIViewController.swift

@@ -22,10 +22,8 @@
 
 import Foundation
 
-#if canImport(UIKit)
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 import UIKit
-#endif
 import QuartzCore
 
 public enum ToastPosition {

Sources/LCEssentials/ImagePicker/ImagePickerController.swift

@@ -20,10 +20,8 @@
 // THE SOFTWARE.
  
 
-#if canImport(UIKit)
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 import UIKit
-#endif
 import AVFoundation
 import Photos
 

Sources/LCEssentials/ImageZoom/ImageZoom.swift

@@ -19,11 +19,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
  
-#if canImport(UIKit)
 import UIKit
-#endif
 
-#if canImport(UIKit)
+#if os(iOS) || os(macOS)
 /// A protocol for delegates of `ImageZoomController` to provide callbacks for zoom and close events.
 @objc public protocol ImageZoomControllerDelegate {
     /// Called when the image in the controller is zoomed.

Sources/LCEssentials/Message/LCSnackBarView.swift

@@ -20,8 +20,6 @@
 // THE SOFTWARE.
 
 // MARK: - Framework headers
-#if canImport(UIKit)
-import Foundation
 import UIKit
 
 // MARK: - Protocols
@@ -514,5 +512,3 @@ public extension LCSnackBarView {
         }
     }
 }
-
-#endif

Sources/LCEssentials/SwiftUI/LCENavigationView.swift

@@ -18,7 +18,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if canImport(SwiftUI) && os(iOS)
+#if canImport(SwiftUI)
 import SwiftUI
 
 /// `LCENavigationState` is an `ObservableObject` that manages the state for `LCENavigationView`.