Skip to content

Commit

Permalink
Updated CocoaLumberjack to fix build errors on Xcode 9
Browse files Browse the repository at this point in the history
  • Loading branch information
hjuutilainen committed Aug 26, 2017
1 parent 984c1d4 commit 89d4ff4
Show file tree
Hide file tree
Showing 11 changed files with 251 additions and 211 deletions.
15 changes: 12 additions & 3 deletions MunkiAdmin.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@
path = "MunkiAdmin/Array Controllers";
sourceTree = "<group>";
};
29B97314FDCFA39411CA2CEA /* MunkiAdmin */ = {
29B97314FDCFA39411CA2CEA = {
isa = PBXGroup;
children = (
F5A11C6C195706C6005A39AE /* Warnings.xcconfig */,
Expand Down Expand Up @@ -990,7 +990,7 @@
French,
German,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* MunkiAdmin */;
mainGroup = 29B97314FDCFA39411CA2CEA;
productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -1084,13 +1084,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-MunkiAdmin-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../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";
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;
};
54F6514855D1097BC243BC67 /* [CP] Embed Pods Frameworks */ = {
Expand All @@ -1099,9 +1102,12 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin-frameworks.sh",
"${PODS_ROOT}/DevMateKit/DevMateKit.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DevMateKit.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand All @@ -1114,9 +1120,12 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin-resources.sh",
"${PODS_ROOT}/DevMateKit/DevMateKit.framework",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down
14 changes: 7 additions & 7 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PODS:
- CHCSVParser (2.1.0)
- CocoaLumberjack (3.2.0):
- CocoaLumberjack/Default (= 3.2.0)
- CocoaLumberjack/Extensions (= 3.2.0)
- CocoaLumberjack/Default (3.2.0)
- CocoaLumberjack/Extensions (3.2.0):
- CocoaLumberjack (3.2.1):
- CocoaLumberjack/Default (= 3.2.1)
- CocoaLumberjack/Extensions (= 3.2.1)
- CocoaLumberjack/Default (3.2.1)
- CocoaLumberjack/Extensions (3.2.1):
- CocoaLumberjack/Default
- DevMateKit (1.7.1)
- NSHash (1.0.2)
Expand All @@ -19,11 +19,11 @@ DEPENDENCIES:

SPEC CHECKSUMS:
CHCSVParser: 3bcc7bdb72111a31222e95d57eacceefe4e537e8
CocoaLumberjack: 9b4aed7073d242f29cc2f62068d995faf67f703a
CocoaLumberjack: 2800c03334042fe80589423c8d80e582dcaec482
DevMateKit: 3ba77083f5faa40266e0d2d70776de2a82c71dd0
NSHash: 173d9782d4b7dec17bf32f22d8ab203c88655a04
PXSourceList: 8e37978a5db6c8d8d255f8913603bcea322c6445

PODFILE CHECKSUM: 3ea224301f3df1e23fc413310a0815a6cc455f54

COCOAPODS: 1.2.0
COCOAPODS: 1.3.1
2 changes: 1 addition & 1 deletion Pods/CocoaLumberjack/Classes/DDFileLogger.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 29 additions & 37 deletions Pods/CocoaLumberjack/Classes/DDFileLogger.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Pods/CocoaLumberjack/Classes/DDOSLogger.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 89d4ff4

Please sign in to comment.