From daa8152691e7fd2a5ec50231c079ab6e33b93120 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Wed, 29 May 2019 22:34:34 -0400 Subject: [PATCH] MM-15575 Rename Constants.h to fix naming conflict (#2840) * MM-15575 Rename Constants.h to fix naming conflict * Rename to MMMConstants --- .../MattermostShare-Bridging-Header.h | 2 +- .../UploadAttachments.xcodeproj/project.pbxproj | 12 ++++++------ .../{Constants.h => MMMConstants.h} | 3 +-- .../{Constants.m => MMMConstants.m} | 4 ++-- .../UploadAttachments/MattermostBucket.m | 2 +- .../UploadAttachments/StoreManager.m | 2 +- .../UploadAttachments-Bridging-Header.h | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) rename ios/UploadAttachments/UploadAttachments/{Constants.h => MMMConstants.h} (85%) rename ios/UploadAttachments/UploadAttachments/{Constants.m => MMMConstants.m} (80%) diff --git a/ios/MattermostShare/MattermostShare-Bridging-Header.h b/ios/MattermostShare/MattermostShare-Bridging-Header.h index 75ead341d..feb62f040 100644 --- a/ios/MattermostShare/MattermostShare-Bridging-Header.h +++ b/ios/MattermostShare/MattermostShare-Bridging-Header.h @@ -2,5 +2,5 @@ // Use this file to import your target's public headers that you would like to expose to Swift. // +#import "MMMConstants.h" #import "StoreManager.h" -#import "Constants.h" diff --git a/ios/UploadAttachments/UploadAttachments.xcodeproj/project.pbxproj b/ios/UploadAttachments/UploadAttachments.xcodeproj/project.pbxproj index 6868bb220..871083eef 100644 --- a/ios/UploadAttachments/UploadAttachments.xcodeproj/project.pbxproj +++ b/ios/UploadAttachments/UploadAttachments.xcodeproj/project.pbxproj @@ -9,7 +9,7 @@ /* Begin PBXBuildFile section */ 7F80232C229C91AD0034D6D4 /* Constants.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7FABE054221387B500D0F595 /* Constants.h */; }; 7FABE04E2213818A00D0F595 /* MattermostBucket.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FABE04C2213818900D0F595 /* MattermostBucket.m */; }; - 7FABE055221387B500D0F595 /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FABE053221387B400D0F595 /* Constants.m */; }; + 7FABE055221387B500D0F595 /* MMMConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FABE053221387B400D0F595 /* MMMConstants.m */; }; 7FABE058221388D700D0F595 /* UploadSessionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FABE057221388D600D0F595 /* UploadSessionManager.swift */; }; 7FABE05B2213892200D0F595 /* AttachmentItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FABE0592213892100D0F595 /* AttachmentItem.swift */; }; 7FABE05C2213892200D0F595 /* AttachmentArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FABE05A2213892100D0F595 /* AttachmentArray.swift */; }; @@ -36,8 +36,8 @@ 7FABE04B2213818900D0F595 /* UploadAttachments-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UploadAttachments-Bridging-Header.h"; sourceTree = ""; }; 7FABE04C2213818900D0F595 /* MattermostBucket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MattermostBucket.m; sourceTree = ""; }; 7FABE04D2213818A00D0F595 /* MattermostBucket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MattermostBucket.h; sourceTree = ""; }; - 7FABE053221387B400D0F595 /* Constants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = ""; }; - 7FABE054221387B500D0F595 /* Constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = ""; }; + 7FABE053221387B400D0F595 /* MMMConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMMConstants.m; sourceTree = ""; }; + 7FABE054221387B500D0F595 /* MMMConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMMConstants.h; sourceTree = ""; }; 7FABE057221388D600D0F595 /* UploadSessionManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UploadSessionManager.swift; sourceTree = ""; }; 7FABE0592213892100D0F595 /* AttachmentItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentItem.swift; sourceTree = ""; }; 7FABE05A2213892100D0F595 /* AttachmentArray.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentArray.swift; sourceTree = ""; }; @@ -79,8 +79,8 @@ children = ( 7FABE05A2213892100D0F595 /* AttachmentArray.swift */, 7FABE0592213892100D0F595 /* AttachmentItem.swift */, - 7FABE054221387B500D0F595 /* Constants.h */, - 7FABE053221387B400D0F595 /* Constants.m */, + 7FABE054221387B500D0F595 /* MMMConstants.h */, + 7FABE053221387B400D0F595 /* MMMConstants.m */, 7FABE04D2213818A00D0F595 /* MattermostBucket.h */, 7FABE04C2213818900D0F595 /* MattermostBucket.m */, 7FABE0F92214674200D0F595 /* StoreManager.h */, @@ -178,7 +178,7 @@ 7FABE058221388D700D0F595 /* UploadSessionManager.swift in Sources */, 7FABE0F7221466F900D0F595 /* UploadManager.swift in Sources */, 7FABE04E2213818A00D0F595 /* MattermostBucket.m in Sources */, - 7FABE055221387B500D0F595 /* Constants.m in Sources */, + 7FABE055221387B500D0F595 /* MMMConstants.m in Sources */, 7FABE05B2213892200D0F595 /* AttachmentItem.swift in Sources */, 7FABE0FC2214800F00D0F595 /* UploadSession.swift in Sources */, ); diff --git a/ios/UploadAttachments/UploadAttachments/Constants.h b/ios/UploadAttachments/UploadAttachments/MMMConstants.h similarity index 85% rename from ios/UploadAttachments/UploadAttachments/Constants.h rename to ios/UploadAttachments/UploadAttachments/MMMConstants.h index 830540790..f0ff53c60 100644 --- a/ios/UploadAttachments/UploadAttachments/Constants.h +++ b/ios/UploadAttachments/UploadAttachments/MMMConstants.h @@ -1,7 +1,6 @@ #import - -@interface Constants : NSObject +@interface MMMConstants : NSObject extern NSString *APP_GROUP_ID; extern UInt64 DEFAULT_SERVER_MAX_IMAGE_PIXELS; extern UInt64 DEFAULT_SERVER_MAX_FILE_SIZE; diff --git a/ios/UploadAttachments/UploadAttachments/Constants.m b/ios/UploadAttachments/UploadAttachments/MMMConstants.m similarity index 80% rename from ios/UploadAttachments/UploadAttachments/Constants.m rename to ios/UploadAttachments/UploadAttachments/MMMConstants.m index fe47cacf8..bf5144c0c 100644 --- a/ios/UploadAttachments/UploadAttachments/Constants.m +++ b/ios/UploadAttachments/UploadAttachments/MMMConstants.m @@ -1,6 +1,6 @@ -#import "Constants.h" +#import "MMMConstants.h" -@implementation Constants +@implementation MMMConstants NSString *APP_GROUP_ID = @"group.com.mattermost.rnbeta"; UInt64 DEFAULT_SERVER_MAX_IMAGE_PIXELS = 6048 * 4032; UInt64 DEFAULT_SERVER_MAX_FILE_SIZE = 50 * 1024 * 1024; diff --git a/ios/UploadAttachments/UploadAttachments/MattermostBucket.m b/ios/UploadAttachments/UploadAttachments/MattermostBucket.m index 1aa8c7e3e..a9b99de04 100644 --- a/ios/UploadAttachments/UploadAttachments/MattermostBucket.m +++ b/ios/UploadAttachments/UploadAttachments/MattermostBucket.m @@ -1,5 +1,5 @@ -#import "Constants.h" #import "MattermostBucket.h" +#import "MMMConstants.h" @implementation MattermostBucket diff --git a/ios/UploadAttachments/UploadAttachments/StoreManager.m b/ios/UploadAttachments/UploadAttachments/StoreManager.m index dc5f834c3..423d4977a 100644 --- a/ios/UploadAttachments/UploadAttachments/StoreManager.m +++ b/ios/UploadAttachments/UploadAttachments/StoreManager.m @@ -1,5 +1,5 @@ #import "StoreManager.h" -#import "Constants.h" +#import "MMMConstants.h" @implementation StoreManager +(instancetype)shared { diff --git a/ios/UploadAttachments/UploadAttachments/UploadAttachments-Bridging-Header.h b/ios/UploadAttachments/UploadAttachments/UploadAttachments-Bridging-Header.h index dae2745e4..194d712c7 100644 --- a/ios/UploadAttachments/UploadAttachments/UploadAttachments-Bridging-Header.h +++ b/ios/UploadAttachments/UploadAttachments/UploadAttachments-Bridging-Header.h @@ -2,6 +2,6 @@ // Use this file to import your target's public headers that you would like to expose to Swift. // -#import "Constants.h" +#import "MMMConstants.h" #import "MattermostBucket.h" #import "StoreManager.h"