Skip to content

Cocoapods cleanup #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mariusc merged 2 commits into from
Feb 20, 2020
Merged

Cocoapods cleanup #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d34ffa
Removed Quick and Nimble; they weren't used
mariusc Feb 20, 2020
cbb90ed
Validate project settings
mariusc Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions LocalizationManager.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 50;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -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, ); }; };
Expand Down Expand Up @@ -670,7 +667,6 @@
C061C1F6217889E400449A14 /* Sources */,
C061C1F7217889E400449A14 /* Frameworks */,
C061C1F8217889E400449A14 /* Resources */,
EF6973162F624D5385C678DC /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -689,7 +685,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1030;
LastUpgradeCheck = 1000;
LastUpgradeCheck = 1130;
ORGANIZATIONNAME = Nodes;
TargetAttributes = {
8C50882D230D1D0A00FB80CD = {
Expand Down Expand Up @@ -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 */,
Expand All @@ -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 */,
Expand All @@ -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 */,
Expand Down Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions LocalizationManager/Classes/Manager/LocalizationManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,15 +401,15 @@ public class LocalizationManager<Language, Descriptor: LocalizationDescriptor> 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)
}
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
}

Expand Down
2 changes: 0 additions & 2 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ project 'LocalizationManager.xcodeproj'
platform :ios, '10.3'

def test_pods
pod 'Quick'
pod 'Nimble'
pod 'SwiftLint'
pod 'Sourcery'
end
Expand Down
16 changes: 4 additions & 12 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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