From da2a8e1673091aba31d95d5dfd8ed38f5c46df73 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Tue, 8 Dec 2015 14:27:21 -0800 Subject: [PATCH] Use product bundle identifier in xcconfig files instead of hard coding into Info.plists. --- Configurations/Parse-OSX.xcconfig | 1 + Configurations/Parse-iOS.xcconfig | 1 + Configurations/Parse-tvOS.xcconfig | 1 + Configurations/Parse-watchOS.xcconfig | 1 + Configurations/ParseUnitTests-OSX.xcconfig | 1 + Configurations/ParseUnitTests-iOS.xcconfig | 1 + Parse/Resources/Parse-OSX.Info.plist | 4 ++-- Parse/Resources/Parse-iOS.Info.plist | 4 ++-- Parse/Resources/Parse-tvOS.Info.plist | 2 +- Parse/Resources/Parse-watchOS.Info.plist | 4 ++-- Tests/Resources/ParseUnitTests-OSX-Info.plist | 2 +- Tests/Resources/ParseUnitTests-iOS-Info.plist | 2 +- 12 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Configurations/Parse-OSX.xcconfig b/Configurations/Parse-OSX.xcconfig index 4254902fc..b7e37b782 100644 --- a/Configurations/Parse-OSX.xcconfig +++ b/Configurations/Parse-OSX.xcconfig @@ -11,6 +11,7 @@ #include "Shared/Product/Framework.xcconfig" PRODUCT_NAME = Parse +PRODUCT_BUNDLE_IDENTIFIER = com.parse.osx MACH_O_TYPE = mh_dylib DEFINES_MODULE = YES diff --git a/Configurations/Parse-iOS.xcconfig b/Configurations/Parse-iOS.xcconfig index dc3ded39a..b272d448c 100644 --- a/Configurations/Parse-iOS.xcconfig +++ b/Configurations/Parse-iOS.xcconfig @@ -11,6 +11,7 @@ #include "Shared/Product/Framework.xcconfig" PRODUCT_NAME = Parse +PRODUCT_BUNDLE_IDENTIFIER = com.parse.ios MACH_O_TYPE = staticlib DEFINES_MODULE = YES diff --git a/Configurations/Parse-tvOS.xcconfig b/Configurations/Parse-tvOS.xcconfig index c616a8c81..5164a8232 100644 --- a/Configurations/Parse-tvOS.xcconfig +++ b/Configurations/Parse-tvOS.xcconfig @@ -11,6 +11,7 @@ #include "Shared/Product/Framework.xcconfig" PRODUCT_NAME = Parse +PRODUCT_BUNDLE_IDENTIFIER = com.parse.tvos MACH_O_TYPE = staticlib APPLICATION_EXTENSION_API_ONLY = YES diff --git a/Configurations/Parse-watchOS.xcconfig b/Configurations/Parse-watchOS.xcconfig index 1143088ed..9cb162a9e 100644 --- a/Configurations/Parse-watchOS.xcconfig +++ b/Configurations/Parse-watchOS.xcconfig @@ -11,6 +11,7 @@ #include "Shared/Product/Framework.xcconfig" PRODUCT_NAME = Parse +PRODUCT_BUNDLE_IDENTIFIER = com.parse.watchos MACH_O_TYPE = staticlib APPLICATION_EXTENSION_API_ONLY = YES diff --git a/Configurations/ParseUnitTests-OSX.xcconfig b/Configurations/ParseUnitTests-OSX.xcconfig index 5ba48d5ac..c0b0a1a30 100644 --- a/Configurations/ParseUnitTests-OSX.xcconfig +++ b/Configurations/ParseUnitTests-OSX.xcconfig @@ -12,6 +12,7 @@ PRODUCT_NAME = ParseUnitTests-OSX PRODUCT_MODULE_NAME = ParseUnitTests +PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.osx INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-OSX-Info.plist LD_RUNPATH_SEARCH_PATHS = $(inherited) @loader_path/../Frameworks diff --git a/Configurations/ParseUnitTests-iOS.xcconfig b/Configurations/ParseUnitTests-iOS.xcconfig index 4131b4480..2e6c70453 100644 --- a/Configurations/ParseUnitTests-iOS.xcconfig +++ b/Configurations/ParseUnitTests-iOS.xcconfig @@ -12,6 +12,7 @@ PRODUCT_NAME = ParseUnitTests-iOS PRODUCT_MODULE_NAME = ParseUnitTests +PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.ios INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist LIBRARY_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) diff --git a/Parse/Resources/Parse-OSX.Info.plist b/Parse/Resources/Parse-OSX.Info.plist index 506eaa06d..b5fee4bad 100644 --- a/Parse/Resources/Parse-OSX.Info.plist +++ b/Parse/Resources/Parse-OSX.Info.plist @@ -1,5 +1,5 @@ - + CFBundleDevelopmentRegion @@ -7,7 +7,7 @@ CFBundleExecutable Parse CFBundleIdentifier - com.parse.ParseOSX + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/Parse/Resources/Parse-iOS.Info.plist b/Parse/Resources/Parse-iOS.Info.plist index ccb7959c0..6bbc62b0d 100644 --- a/Parse/Resources/Parse-iOS.Info.plist +++ b/Parse/Resources/Parse-iOS.Info.plist @@ -1,5 +1,5 @@ - + CFBundleDevelopmentRegion @@ -7,7 +7,7 @@ CFBundleExecutable Parse CFBundleIdentifier - com.parse.Parse + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/Parse/Resources/Parse-tvOS.Info.plist b/Parse/Resources/Parse-tvOS.Info.plist index ecfecf0af..7108d9dda 100644 --- a/Parse/Resources/Parse-tvOS.Info.plist +++ b/Parse/Resources/Parse-tvOS.Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.parse.tvos + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Parse/Resources/Parse-watchOS.Info.plist b/Parse/Resources/Parse-watchOS.Info.plist index fc6fd54bf..cc8ed798f 100644 --- a/Parse/Resources/Parse-watchOS.Info.plist +++ b/Parse/Resources/Parse-watchOS.Info.plist @@ -1,5 +1,5 @@ - + CFBundleDevelopmentRegion @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.parse.watchos + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Tests/Resources/ParseUnitTests-OSX-Info.plist b/Tests/Resources/ParseUnitTests-OSX-Info.plist index 00950c697..8e40b3180 100644 --- a/Tests/Resources/ParseUnitTests-OSX-Info.plist +++ b/Tests/Resources/ParseUnitTests-OSX-Info.plist @@ -11,7 +11,7 @@ CFBundleIconFile CFBundleIdentifier - com.parse.tests.unit.osx + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Tests/Resources/ParseUnitTests-iOS-Info.plist b/Tests/Resources/ParseUnitTests-iOS-Info.plist index 9cb8d8bf6..8e40b3180 100644 --- a/Tests/Resources/ParseUnitTests-iOS-Info.plist +++ b/Tests/Resources/ParseUnitTests-iOS-Info.plist @@ -11,7 +11,7 @@ CFBundleIconFile CFBundleIdentifier - com.parse.tests.unit.ios + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName