From 72658512e8fd7c10882c67192476c7ec81166ccc Mon Sep 17 00:00:00 2001 From: Aaron Douglas Date: Wed, 11 May 2016 15:29:33 -0500 Subject: [PATCH] Fix for Logging.h issue --- Automattic-Tracks-iOS.xcodeproj/project.pbxproj | 16 ++++++++-------- .../{Logging.h => TracksLoggingPrivate.h} | 0 .../{Logging.m => TracksLoggingPrivate.m} | 2 +- Automattic-Tracks-iOS/TracksContextManager.m | 2 +- .../TracksEventPersistenceService.m | 2 +- Automattic-Tracks-iOS/TracksEventService.m | 2 +- Automattic-Tracks-iOS/TracksLogging.m | 2 +- Automattic-Tracks-iOS/TracksService.m | 2 +- TracksDemo/Podfile.lock | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) rename Automattic-Tracks-iOS/Private/{Logging.h => TracksLoggingPrivate.h} (100%) rename Automattic-Tracks-iOS/Private/{Logging.m => TracksLoggingPrivate.m} (52%) diff --git a/Automattic-Tracks-iOS.xcodeproj/project.pbxproj b/Automattic-Tracks-iOS.xcodeproj/project.pbxproj index 153a0a57..5496d8fa 100644 --- a/Automattic-Tracks-iOS.xcodeproj/project.pbxproj +++ b/Automattic-Tracks-iOS.xcodeproj/project.pbxproj @@ -10,7 +10,7 @@ 00EC19F5C9B3F78F5F50366F /* Pods_Automattic_Tracks_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EBDB237A5CBEE0EE8433798 /* Pods_Automattic_Tracks_iOS.framework */; }; 93B5C7AE1CE25D40002820B3 /* Automattic-Tracks-iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B5C7AD1CE25D40002820B3 /* Automattic-Tracks-iOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; 93B5C7B51CE25D40002820B3 /* AutomatticTracks.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93B5C7AB1CE25D40002820B3 /* AutomatticTracks.framework */; }; - 93B5C7C21CE25D66002820B3 /* Logging.m in Sources */ = {isa = PBXBuildFile; fileRef = 93B5C7681CE230AD002820B3 /* Logging.m */; }; + 93B5C7C21CE25D66002820B3 /* TracksLoggingPrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 93B5C7681CE230AD002820B3 /* TracksLoggingPrivate.m */; }; 93B5C7C31CE25D66002820B3 /* TracksContextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 93AD39991AC714A80069344D /* TracksContextManager.m */; }; 93B5C7C41CE25D66002820B3 /* TracksEventCoreData.m in Sources */ = {isa = PBXBuildFile; fileRef = 9333CA9D1ACB22D300ACE506 /* TracksEventCoreData.m */; }; 93B5C7C51CE25D66002820B3 /* TracksEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 93C021351AB0BB100014096A /* TracksEvent.m */; }; @@ -21,7 +21,7 @@ 93B5C7CA1CE25D66002820B3 /* TracksServiceRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = 93C021391AB1BFF30014096A /* TracksServiceRemote.m */; }; 93B5C7CB1CE25D66002820B3 /* TracksConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 9339E70B1ADE98B800AEAB68 /* TracksConstants.m */; }; 93B5C7CC1CE25D66002820B3 /* TracksLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = 93B5C7641CE2303D002820B3 /* TracksLogging.m */; }; - 93B5C7CD1CE25D7D002820B3 /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B5C7671CE230AD002820B3 /* Logging.h */; }; + 93B5C7CD1CE25D7D002820B3 /* TracksLoggingPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B5C7671CE230AD002820B3 /* TracksLoggingPrivate.h */; }; 93B5C7CE1CE25D7D002820B3 /* TracksContextManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 93AD39981AC714A80069344D /* TracksContextManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; 93B5C7CF1CE25D7D002820B3 /* TracksEventCoreData.h in Headers */ = {isa = PBXBuildFile; fileRef = 9333CA9C1ACB22D300ACE506 /* TracksEventCoreData.h */; }; 93B5C7D01CE25D7D002820B3 /* TracksEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C021341AB0BB100014096A /* TracksEvent.h */; }; @@ -75,8 +75,8 @@ 93AD39A21ACADA650069344D /* TracksEventPersistenceService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TracksEventPersistenceService.h; sourceTree = ""; }; 93AD39A31ACADA650069344D /* TracksEventPersistenceService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TracksEventPersistenceService.m; sourceTree = ""; }; 93B5C7641CE2303D002820B3 /* TracksLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TracksLogging.m; sourceTree = ""; }; - 93B5C7671CE230AD002820B3 /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = ""; }; - 93B5C7681CE230AD002820B3 /* Logging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Logging.m; sourceTree = ""; }; + 93B5C7671CE230AD002820B3 /* TracksLoggingPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TracksLoggingPrivate.h; sourceTree = ""; }; + 93B5C7681CE230AD002820B3 /* TracksLoggingPrivate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TracksLoggingPrivate.m; sourceTree = ""; }; 93B5C7AB1CE25D40002820B3 /* AutomatticTracks.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AutomatticTracks.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 93B5C7AD1CE25D40002820B3 /* Automattic-Tracks-iOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Automattic-Tracks-iOS.h"; sourceTree = ""; }; 93B5C7AF1CE25D40002820B3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -168,8 +168,8 @@ 93B5C7661CE2308D002820B3 /* Private */ = { isa = PBXGroup; children = ( - 93B5C7671CE230AD002820B3 /* Logging.h */, - 93B5C7681CE230AD002820B3 /* Logging.m */, + 93B5C7671CE230AD002820B3 /* TracksLoggingPrivate.h */, + 93B5C7681CE230AD002820B3 /* TracksLoggingPrivate.m */, ); path = Private; sourceTree = ""; @@ -283,7 +283,7 @@ buildActionMask = 2147483647; files = ( 93B5C7AE1CE25D40002820B3 /* Automattic-Tracks-iOS.h in Headers */, - 93B5C7CD1CE25D7D002820B3 /* Logging.h in Headers */, + 93B5C7CD1CE25D7D002820B3 /* TracksLoggingPrivate.h in Headers */, 93B5C7CE1CE25D7D002820B3 /* TracksContextManager.h in Headers */, 93B5C7CF1CE25D7D002820B3 /* TracksEventCoreData.h in Headers */, 93B5C7D01CE25D7D002820B3 /* TracksEvent.h in Headers */, @@ -479,7 +479,7 @@ files = ( 93B5C7CA1CE25D66002820B3 /* TracksServiceRemote.m in Sources */, 93B5C7CB1CE25D66002820B3 /* TracksConstants.m in Sources */, - 93B5C7C21CE25D66002820B3 /* Logging.m in Sources */, + 93B5C7C21CE25D66002820B3 /* TracksLoggingPrivate.m in Sources */, 93B5C7C31CE25D66002820B3 /* TracksContextManager.m in Sources */, 93D77A531CE26C43009EDB38 /* Tracks.swift in Sources */, 93B5C7C71CE25D66002820B3 /* TracksEventPersistenceService.m in Sources */, diff --git a/Automattic-Tracks-iOS/Private/Logging.h b/Automattic-Tracks-iOS/Private/TracksLoggingPrivate.h similarity index 100% rename from Automattic-Tracks-iOS/Private/Logging.h rename to Automattic-Tracks-iOS/Private/TracksLoggingPrivate.h diff --git a/Automattic-Tracks-iOS/Private/Logging.m b/Automattic-Tracks-iOS/Private/TracksLoggingPrivate.m similarity index 52% rename from Automattic-Tracks-iOS/Private/Logging.m rename to Automattic-Tracks-iOS/Private/TracksLoggingPrivate.m index c4003ddd..2c39329a 100644 --- a/Automattic-Tracks-iOS/Private/Logging.m +++ b/Automattic-Tracks-iOS/Private/TracksLoggingPrivate.m @@ -1,2 +1,2 @@ -#import "Logging.h" +#import "TracksLoggingPrivate.h" int ddLogLevel = DDLogLevelWarning; diff --git a/Automattic-Tracks-iOS/TracksContextManager.m b/Automattic-Tracks-iOS/TracksContextManager.m index 71276104..e63101e4 100644 --- a/Automattic-Tracks-iOS/TracksContextManager.m +++ b/Automattic-Tracks-iOS/TracksContextManager.m @@ -1,5 +1,5 @@ #import "TracksContextManager.h" -#import "Logging.h" +#import "TracksLoggingPrivate.h" @interface TracksContextManager () diff --git a/Automattic-Tracks-iOS/TracksEventPersistenceService.m b/Automattic-Tracks-iOS/TracksEventPersistenceService.m index 76d621c1..0f5f7e4d 100644 --- a/Automattic-Tracks-iOS/TracksEventPersistenceService.m +++ b/Automattic-Tracks-iOS/TracksEventPersistenceService.m @@ -1,6 +1,6 @@ #import "TracksEventPersistenceService.h" #import "TracksEventCoreData.h" -#import "Logging.h" +#import "TracksLoggingPrivate.h" @interface TracksEventPersistenceService () diff --git a/Automattic-Tracks-iOS/TracksEventService.m b/Automattic-Tracks-iOS/TracksEventService.m index ba87e965..c322e4c5 100644 --- a/Automattic-Tracks-iOS/TracksEventService.m +++ b/Automattic-Tracks-iOS/TracksEventService.m @@ -1,6 +1,6 @@ #import "TracksEventService.h" #import "TracksEventPersistenceService.h" -#import "Logging.h" +#import "TracksLoggingPrivate.h" @interface TracksEventService () diff --git a/Automattic-Tracks-iOS/TracksLogging.m b/Automattic-Tracks-iOS/TracksLogging.m index 43972313..75133213 100644 --- a/Automattic-Tracks-iOS/TracksLogging.m +++ b/Automattic-Tracks-iOS/TracksLogging.m @@ -1,5 +1,5 @@ #import "TracksLogging.h" -#import "Logging.h" +#import "TracksLoggingPrivate.h" int TracksGetLoggingLevel() { return ddLogLevel; diff --git a/Automattic-Tracks-iOS/TracksService.m b/Automattic-Tracks-iOS/TracksService.m index 35361c72..866619e2 100644 --- a/Automattic-Tracks-iOS/TracksService.m +++ b/Automattic-Tracks-iOS/TracksService.m @@ -1,6 +1,6 @@ #import "TracksService.h" #import "TracksDeviceInformation.h" -#import "Logging.h" +#import "TracksLoggingPrivate.h" #import #if TARGET_OS_IPHONE diff --git a/TracksDemo/Podfile.lock b/TracksDemo/Podfile.lock index 788509c2..e7db2ad0 100644 --- a/TracksDemo/Podfile.lock +++ b/TracksDemo/Podfile.lock @@ -22,7 +22,7 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - Automattic-Tracks-iOS: 74247b53c0ae6d3c7e45860ede2e6cbcbdcdfeb6 + Automattic-Tracks-iOS: 5b76290a74355cc8be18e5177b4af58774a63a46 CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0 Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 UIDeviceIdentifier: a959a6d4f51036b4180dd31fb26483a820f1cc46