diff --git a/LocalizationManager.xcodeproj/project.pbxproj b/LocalizationManager.xcodeproj/project.pbxproj index 46a88c5..7002b42 100644 --- a/LocalizationManager.xcodeproj/project.pbxproj +++ b/LocalizationManager.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 50; objects = { /* Begin PBXBuildFile section */ @@ -115,9 +115,6 @@ B4B6C97E231ED7D4001A8E5C /* LocalizationManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4B6C961231ED7D4001A8E5C /* LocalizationManagerTests.swift */; }; B4B6C97F231ED7D4001A8E5C /* LocalizationManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4B6C961231ED7D4001A8E5C /* LocalizationManagerTests.swift */; }; B4B6C980231ED7D4001A8E5C /* LocalizationManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4B6C961231ED7D4001A8E5C /* LocalizationManagerTests.swift */; }; - B4B6C981231ED7D4001A8E5C /* Info-iOS.plist in Resources */ = {isa = PBXBuildFile; fileRef = B4B6C963231ED7D4001A8E5C /* Info-iOS.plist */; }; - B4B6C986231ED7D4001A8E5C /* Info-tvOS.plist in Resources */ = {isa = PBXBuildFile; fileRef = B4B6C964231ED7D4001A8E5C /* Info-tvOS.plist */; }; - B4B6C988231ED7D4001A8E5C /* Info-macOS.plist in Resources */ = {isa = PBXBuildFile; fileRef = B4B6C965231ED7D4001A8E5C /* Info-macOS.plist */; }; B4B6C98B231ED86D001A8E5C /* LocalizationManager_watchOS.h in Headers */ = {isa = PBXBuildFile; fileRef = B4B6C98A231ED86D001A8E5C /* LocalizationManager_watchOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; B4B6C98D231ED874001A8E5C /* LocalizationManager_tvOS.h in Headers */ = {isa = PBXBuildFile; fileRef = B4B6C98C231ED874001A8E5C /* LocalizationManager_tvOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; B4B6C99A231ED88A001A8E5C /* LocalizationManager_macOS.h in Headers */ = {isa = PBXBuildFile; fileRef = B4B6C999231ED88A001A8E5C /* LocalizationManager_macOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -670,7 +667,6 @@ C061C1F6217889E400449A14 /* Sources */, C061C1F7217889E400449A14 /* Frameworks */, C061C1F8217889E400449A14 /* Resources */, - EF6973162F624D5385C678DC /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -689,7 +685,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1030; - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1130; ORGANIZATIONNAME = Nodes; TargetAttributes = { 8C50882D230D1D0A00FB80CD = { @@ -753,7 +749,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - B4B6C988231ED7D4001A8E5C /* Info-macOS.plist in Resources */, B4B6C96D231ED7D4001A8E5C /* Localization_en-GB.json in Resources */, B4B6C96A231ED7D4001A8E5C /* Localization_fr-FR.json in Resources */, B4B6C967231ED7D4001A8E5C /* Localization_da-DK.json in Resources */, @@ -778,7 +773,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - B4B6C986231ED7D4001A8E5C /* Info-tvOS.plist in Resources */, B4B6C96E231ED7D4001A8E5C /* Localization_en-GB.json in Resources */, B4B6C96B231ED7D4001A8E5C /* Localization_fr-FR.json in Resources */, B4B6C968231ED7D4001A8E5C /* Localization_da-DK.json in Resources */, @@ -796,7 +790,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - B4B6C981231ED7D4001A8E5C /* Info-iOS.plist in Resources */, B4B6C96C231ED7D4001A8E5C /* Localization_en-GB.json in Resources */, B4B6C969231ED7D4001A8E5C /* Localization_fr-FR.json in Resources */, B4B6C966231ED7D4001A8E5C /* Localization_da-DK.json in Resources */, @@ -864,23 +857,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - EF6973162F624D5385C678DC /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-LocalizationManagerTests/Pods-LocalizationManagerTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-LocalizationManagerTests/Pods-LocalizationManagerTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-LocalizationManagerTests/Pods-LocalizationManagerTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/LocalizationManager/Classes/Manager/LocalizationManager.swift b/LocalizationManager/Classes/Manager/LocalizationManager.swift index fb41de7..cb36047 100644 --- a/LocalizationManager/Classes/Manager/LocalizationManager.swift +++ b/LocalizationManager/Classes/Manager/LocalizationManager.swift @@ -401,7 +401,7 @@ public class LocalizationManager w return } - if let bestFit = descriptors.filter ({ $0.language.isBestFit }).first { + if let bestFit = descriptors.filter({ $0.language.isBestFit }).first { if self.bestFitLanguage?.locale.identifier != bestFit.localeIdentifier { // Running language changed action, if best fit language is now different self.delegate?.localizationManager(languageUpdated: bestFit.language) @@ -409,7 +409,7 @@ public class LocalizationManager w self.bestFitLanguage = bestFit.language as? Language } - if let defaultLang = descriptors.filter ({ $0.language.isDefault }).first { + if let defaultLang = descriptors.filter({ $0.language.isDefault }).first { self.defaultLanguage = defaultLang.language as? Language } diff --git a/Podfile b/Podfile index 359a1fb..79a0353 100644 --- a/Podfile +++ b/Podfile @@ -2,8 +2,6 @@ project 'LocalizationManager.xcodeproj' platform :ios, '10.3' def test_pods - pod 'Quick' - pod 'Nimble' pod 'SwiftLint' pod 'Sourcery' end diff --git a/Podfile.lock b/Podfile.lock index d43ee98..390516e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,28 +1,20 @@ PODS: - - Nimble (8.0.2) - - Quick (2.1.0) - Sourcery (0.17.0) - - SwiftLint (0.34.0) + - SwiftLint (0.39.1) DEPENDENCIES: - - Nimble - - Quick - Sourcery - SwiftLint SPEC REPOS: - https://github.com/CocoaPods/Specs.git: - - Nimble - - Quick + trunk: - Sourcery - SwiftLint SPEC CHECKSUMS: - Nimble: 622629381bda1dd5678162f21f1368cec7cbba60 - Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d Sourcery: 3ed61be7c8a1218fce349266139379dba477efe0 - SwiftLint: 79d48a17c6565dc286c37efb8322c7b450f95c67 + SwiftLint: 55e96a4a4d537d4a3156859fc1c54bd24851a046 -PODFILE CHECKSUM: d35a41b3fa3e303afd415e05f5ac04c5dc33ea09 +PODFILE CHECKSUM: 54f5f694e106ddcbcd3724c53daeefebfe959bc1 COCOAPODS: 1.8.4