Merge pull request #211 from BoltsFramework/nlutsenko.xcode72

nlutsenko · nlutsenko · commit 73a36f604f38 · 2016-01-01T01:29:48.000-08:00
Use PRODUCT_BUNDLE_IDENTIFIER build setting for all targets.
diff --git a/Bolts.xcodeproj/project.pbxproj b/Bolts.xcodeproj/project.pbxproj
@@ -984,7 +984,7 @@
 		8E9C3CE117DE9DE000427E62 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0720;
 				ORGANIZATIONNAME = "Parse Inc.";
 				TargetAttributes = {
 					8E8C8F1817F241DA00E3F1C7 = {
@@ -1300,6 +1300,7 @@
 				INFOPLIST_FILE = "BoltsTestUI/BoltsTestUI-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 6.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.bolts.ios.testapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1325,6 +1326,7 @@
 				INFOPLIST_FILE = "BoltsTestUI/BoltsTestUI-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 6.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.bolts.ios.testapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-OSX.xcscheme b/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-iOS-Dynamic.xcscheme b/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-iOS-Dynamic.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-iOS.xcscheme b/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-tvOS.xcscheme b/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-watchOS.xcscheme b/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Bolts/Resources/Mac-Info.plist b/Bolts/Resources/Mac-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.bolts.boltsmac</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/Bolts/Resources/iOS-Info.plist b/Bolts/Resources/iOS-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Bolts</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.bolts.bolts-ios</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/Bolts/Resources/tvOS-Info.plist b/Bolts/Resources/tvOS-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.bolts.boltstv</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/Bolts/Resources/watchOS-Info.plist b/Bolts/Resources/watchOS-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.bolts.watchos</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/BoltsTestUI/BoltsTestUI-Info.plist b/BoltsTestUI/BoltsTestUI-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>bolts.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/BoltsTests/BoltsTests-Info.plist b/BoltsTests/BoltsTests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.parse.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/Configurations/Bolts-OSX.xcconfig b/Configurations/Bolts-OSX.xcconfig
@@ -11,6 +11,7 @@
 #include "Shared/Product/Framework.xcconfig"
 
 PRODUCT_NAME = Bolts
+PRODUCT_BUNDLE_IDENTIFIER = com.bolts.osx
 MACOSX_DEPLOYMENT_TARGET = 10.8
 
 MACH_O_TYPE = mh_dylib
diff --git a/Configurations/Bolts-iOS-Dynamic.xcconfig b/Configurations/Bolts-iOS-Dynamic.xcconfig
@@ -11,6 +11,7 @@
 #include "Shared/Product/Framework.xcconfig"
 
 PRODUCT_NAME = Bolts
+PRODUCT_BUNDLE_IDENTIFIER = com.bolts.ios
 IPHONEOS_DEPLOYMENT_TARGET = 8.0
 
 MACH_O_TYPE = mh_dylib
diff --git a/Configurations/Bolts-iOS.xcconfig b/Configurations/Bolts-iOS.xcconfig
@@ -11,6 +11,7 @@
 #include "Shared/Product/Framework.xcconfig"
 
 PRODUCT_NAME = Bolts
+PRODUCT_BUNDLE_IDENTIFIER = com.bolts.ios
 IPHONEOS_DEPLOYMENT_TARGET = 6.0
 
 MACH_O_TYPE = staticlib
diff --git a/Configurations/Bolts-tvOS-Dynamic.xcconfig b/Configurations/Bolts-tvOS-Dynamic.xcconfig
@@ -11,6 +11,7 @@
 #include "Shared/Product/Framework.xcconfig"
 
 PRODUCT_NAME = Bolts
+PRODUCT_BUNDLE_IDENTIFIER = com.bolts.tvos
 
 MACH_O_TYPE = mh_dylib
 DYLIB_INSTALL_NAME_BASE = @rpath
diff --git a/Configurations/Bolts-tvOS.xcconfig b/Configurations/Bolts-tvOS.xcconfig
@@ -11,6 +11,7 @@
 #include "Shared/Product/Framework.xcconfig"
 
 PRODUCT_NAME = Bolts
+PRODUCT_BUNDLE_IDENTIFIER = com.bolts.tvos
 
 MACH_O_TYPE = staticlib
 
diff --git a/Configurations/Bolts-watchOS-Dynamic.xcconfig b/Configurations/Bolts-watchOS-Dynamic.xcconfig
@@ -11,6 +11,7 @@
 #include "Shared/Product/Framework.xcconfig"
 
 PRODUCT_NAME = Bolts
+PRODUCT_BUNDLE_IDENTIFIER = com.bolts.watchos
 WATCHOS_DEPLOYMENT_TARGET = 2.0
 
 MACH_O_TYPE = mh_dylib
diff --git a/Configurations/Bolts-watchOS.xcconfig b/Configurations/Bolts-watchOS.xcconfig
@@ -11,6 +11,7 @@
 #include "Shared/Product/Framework.xcconfig"
 
 PRODUCT_NAME = Bolts
+PRODUCT_BUNDLE_IDENTIFIER = com.bolts.watchos
 WATCHOS_DEPLOYMENT_TARGET = 2.0
 
 MACH_O_TYPE = staticlib
diff --git a/Configurations/BoltsTests-OSX.xcconfig b/Configurations/BoltsTests-OSX.xcconfig
@@ -12,6 +12,8 @@
 
 PRODUCT_NAME = BoltsTests-OSX
 PRODUCT_MODULE_NAME = BoltsTests
+PRODUCT_BUNDLE_IDENTIFIER = com.bolts.osx.tests
+
 MACOSX_DEPLOYMENT_TARGET = 10.8
 
 INFOPLIST_FILE = BoltsTests/BoltsTests-Info.plist
diff --git a/Configurations/BoltsTests-iOS.xcconfig b/Configurations/BoltsTests-iOS.xcconfig
@@ -12,6 +12,7 @@
 
 PRODUCT_NAME = BoltsTests-iOS
 PRODUCT_MODULE_NAME = BoltsTests
+PRODUCT_BUNDLE_IDENTIFIER = com.bolts.ios.tests
 
 IPHONEOS_DEPLOYMENT_TARGET = 6.0
 
diff --git a/Configurations/BoltsTests-tvOS.xcconfig b/Configurations/BoltsTests-tvOS.xcconfig
@@ -12,6 +12,7 @@
 
 PRODUCT_NAME = BoltsTests-tvOS
 PRODUCT_MODULE_NAME = BoltsTests
+PRODUCT_BUNDLE_IDENTIFIER = com.bolts.tvos.tests
 
 INFOPLIST_FILE = BoltsTests/BoltsTests-Info.plist
 
