diff --git a/Modules/CommonsLib/Package.swift b/Modules/CommonsLib/Package.swift index 297717fc..0f830238 100644 --- a/Modules/CommonsLib/Package.swift +++ b/Modules/CommonsLib/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "CommonsLib", - platforms: [.iOS(.v17)], + platforms: [.iOS(.v18)], products: [ // Products define the executables and libraries a package produces, making them visible to other packages. .library( diff --git a/Modules/ConfigLib/Package.swift b/Modules/ConfigLib/Package.swift index 63c0b9b0..91eccb70 100644 --- a/Modules/ConfigLib/Package.swift +++ b/Modules/ConfigLib/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "ConfigLib", - platforms: [.iOS(.v17)], + platforms: [.iOS(.v18)], products: [ // Products define the executables and libraries a package produces, making them visible to other packages. .library( diff --git a/Modules/ConfigLib/Sources/ConfigLib/Configuration/Loader/ConfigurationLoader.swift b/Modules/ConfigLib/Sources/ConfigLib/Configuration/Loader/ConfigurationLoader.swift index 4766c49f..1ef083ab 100644 --- a/Modules/ConfigLib/Sources/ConfigLib/Configuration/Loader/ConfigurationLoader.swift +++ b/Modules/ConfigLib/Sources/ConfigLib/Configuration/Loader/ConfigurationLoader.swift @@ -201,7 +201,7 @@ public actor ConfigurationLoader: ConfigurationLoaderProtocol, Loggable { forResource: CommonsLib.Constants.Configuration.DefaultConfigJson, withExtension: nil ), - let confData = try? String(contentsOf: confDataURL) + let confData = try? String(contentsOf: confDataURL, encoding: .utf8) else { throw ConfigurationLoaderError.configurationNotFound } @@ -211,7 +211,7 @@ public actor ConfigurationLoader: ConfigurationLoaderProtocol, Loggable { forResource: CommonsLib.Constants.Configuration.DefaultConfigEcPub, withExtension: nil ), - let publicKey = try? String(contentsOf: publicKeyURL) + let publicKey = try? String(contentsOf: publicKeyURL, encoding: .utf8) else { throw ConfigurationLoaderError.publicKeyNotFound } diff --git a/Modules/ConfigLib/Sources/ConfigLib/Configuration/Properties/ConfigurationProperties.swift b/Modules/ConfigLib/Sources/ConfigLib/Configuration/Properties/ConfigurationProperties.swift index 52dae18b..370e3b3c 100644 --- a/Modules/ConfigLib/Sources/ConfigLib/Configuration/Properties/ConfigurationProperties.swift +++ b/Modules/ConfigLib/Sources/ConfigLib/Configuration/Properties/ConfigurationProperties.swift @@ -93,7 +93,10 @@ public actor ConfigurationProperties: ConfigurationPropertiesProtocol { } private func loadProperties(from propertiesFile: URL) -> [String: String]? { - guard let fileContents = try? String(contentsOfFile: propertiesFile.resolvedPath) else { + guard let fileContents = try? String( + contentsOfFile: propertiesFile.resolvedPath, + encoding: .utf8 + ) else { return nil } diff --git a/Modules/CryptoLib/Package.swift b/Modules/CryptoLib/Package.swift index 6a58c85e..5567f38a 100644 --- a/Modules/CryptoLib/Package.swift +++ b/Modules/CryptoLib/Package.swift @@ -8,7 +8,7 @@ let packageRoot = #filePath let package = Package( name: "CryptoLib", - platforms: [.iOS(.v17)], + platforms: [.iOS(.v18)], products: [ .library( name: "CryptoLib", diff --git a/Modules/IdCardLib/Package.swift b/Modules/IdCardLib/Package.swift index 84f53cf5..48ce3fbb 100644 --- a/Modules/IdCardLib/Package.swift +++ b/Modules/IdCardLib/Package.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( name: "IdCardLib", - platforms: [.iOS(.v17)], + platforms: [.iOS(.v18)], products: [ .library( name: "IdCardLib", diff --git a/Modules/LibdigidocLib/Package.swift b/Modules/LibdigidocLib/Package.swift index 26758e98..ebf502d4 100644 --- a/Modules/LibdigidocLib/Package.swift +++ b/Modules/LibdigidocLib/Package.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( name: "LibdigidocLib", - platforms: [.iOS(.v17)], + platforms: [.iOS(.v18)], products: [ .library( name: "LibdigidocLib", diff --git a/Modules/MobileIdLib/Package.swift b/Modules/MobileIdLib/Package.swift index 2a43ae9e..42ed8182 100644 --- a/Modules/MobileIdLib/Package.swift +++ b/Modules/MobileIdLib/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "MobileIdLib", - platforms: [.iOS(.v17)], + platforms: [.iOS(.v18)], products: [ .library( name: "MobileIdLib", diff --git a/Modules/SmartIdLib/Package.swift b/Modules/SmartIdLib/Package.swift index 1ea29886..02396703 100644 --- a/Modules/SmartIdLib/Package.swift +++ b/Modules/SmartIdLib/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "SmartIdLib", - platforms: [.iOS(.v17)], + platforms: [.iOS(.v18)], products: [ .library( name: "SmartIdLib", diff --git a/Modules/Test/CommonsTestShared/Package.swift b/Modules/Test/CommonsTestShared/Package.swift index 949f0fe8..8690f90c 100644 --- a/Modules/Test/CommonsTestShared/Package.swift +++ b/Modules/Test/CommonsTestShared/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "CommonsTestShared", - platforms: [.iOS(.v17)], + platforms: [.iOS(.v18)], products: [ // Products define the executables and libraries a package produces, making them visible to other packages. .library( diff --git a/Modules/UtilsLib/Package.swift b/Modules/UtilsLib/Package.swift index 5e5e1ab7..68d0bc2e 100644 --- a/Modules/UtilsLib/Package.swift +++ b/Modules/UtilsLib/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "UtilsLib", - platforms: [.iOS(.v17)], + platforms: [.iOS(.v18)], products: [ // Products define the executables and libraries a package produces, making them visible to other packages. .library( diff --git a/Modules/UtilsLib/Sources/UtilsLib/Extensions/URLExtensions.swift b/Modules/UtilsLib/Sources/UtilsLib/Extensions/URLExtensions.swift index 6559bcea..719b8753 100644 --- a/Modules/UtilsLib/Sources/UtilsLib/Extensions/URLExtensions.swift +++ b/Modules/UtilsLib/Sources/UtilsLib/Extensions/URLExtensions.swift @@ -68,7 +68,7 @@ extension URL { from: self, fileNameToFind: "mimetype" ) { - let mimetypeContent = try String(contentsOf: mimetypeFile) + let mimetypeContent = try String(contentsOf: mimetypeFile, encoding: .utf8) return mimetypeContent.lowercased().trimmingCharacters(in: .whitespacesAndNewlines) } } catch { diff --git a/RIADigiDoc.xcodeproj/project.pbxproj b/RIADigiDoc.xcodeproj/project.pbxproj index c8d24640..279e5943 100644 --- a/RIADigiDoc.xcodeproj/project.pbxproj +++ b/RIADigiDoc.xcodeproj/project.pbxproj @@ -1079,7 +1079,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; + IPHONEOS_DEPLOYMENT_TARGET = 18.0; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 3.0.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; @@ -1143,7 +1143,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; + IPHONEOS_DEPLOYMENT_TARGET = 18.0; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 3.0.0; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/RIADigiDoc.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/RIADigiDoc.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9ac97b40..d9200827 100644 --- a/RIADigiDoc.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/RIADigiDoc.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "5cfdacc6dc3e2f080c69617c473a32e3cc20075d8db1ab8dee4ee4d5581b33b0", + "originHash" : "81e76711f6279eca5b9f401e1e845c4440027fd242576922d1b378fa621d3946", "pins" : [ { "identity" : "alamofire",