Merge pull request #270 from BoltsFramework/nlutsenko.dylib.compatibi…

…lity Fix breaking change in DYLIB_COMPATIBILITY_VERSION.
BoltsFramework · Jul 13, 2016 · 2ed4648 · 2ed4648
2 parents 648e7ea + b630af3
commit 2ed4648
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 3 deletions.
diff --git a/Bolts.xcodeproj/project.pbxproj b/Bolts.xcodeproj/project.pbxproj
@@ -268,6 +268,7 @@
 		814916E11AD5D46600EE7C63 /* iOS.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; name = iOS.modulemap; path = Resources/iOS.modulemap; sourceTree = "<group>"; };
 		8178F99C1BB0F87700AD289D /* Bolts.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Bolts.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		819573F11C2B8ECB00BFCA39 /* Bolts.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Bolts.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		81AB8BB11D36D7BD00066F63 /* Version.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
 		81CD06291CEED28A00497F47 /* BFTask+Exceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "BFTask+Exceptions.h"; sourceTree = "<group>"; };
 		81CD06321CEED2BC00497F47 /* BFTask+Exceptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "BFTask+Exceptions.m"; sourceTree = "<group>"; };
 		81CF83061D0B559700633946 /* BFAppLink_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BFAppLink_Internal.h; sourceTree = "<group>"; };
@@ -507,6 +508,7 @@
 				81D646EA1D2CA0E000690609 /* BoltsTests-iOS.xcconfig */,
 				81D646EB1D2CA0E000690609 /* BoltsTests-OSX.xcconfig */,
 				81D646EC1D2CA0E000690609 /* BoltsTests-tvOS.xcconfig */,
+				81AB8BB11D36D7BD00066F63 /* Version.xcconfig */,
 				81D646ED1D2CA0E000690609 /* Shared */,
 			);
 			path = Configurations;

diff --git a/Bolts/Resources/Info.plist b/Bolts/Resources/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8.3</string>
+	<string>$(BOLTS_OBJC_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.8.3</string>
+	<string>$(BOLTS_OBJC_VERSION)</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/Configurations/Bolts-iOS-Dynamic.xcconfig b/Configurations/Bolts-iOS-Dynamic.xcconfig
@@ -9,6 +9,7 @@
 
 #include "Shared/Platform/iOS.xcconfig"
 #include "Shared/Product/DynamicFramework.xcconfig"
+#include "Version.xcconfig"
 
 PRODUCT_NAME = Bolts
 PRODUCT_BUNDLE_IDENTIFIER = com.bolts.ios
@@ -18,3 +19,6 @@ MODULEMAP_FILE = $(SRCROOT)/Bolts/Resources/iOS.modulemap
 INFOPLIST_FILE = $(SRCROOT)/Bolts/Resources/Info.plist
 
 OTHER_LDFLAGS = $(inherited) -framework CoreGraphics -framework UIKit
+
+// Use the 1.0.0 to avoid breaking changes with older version of Bolts.
+DYLIB_COMPATIBILITY_VERSION = 1
diff --git a/Configurations/Bolts-iOS.xcconfig b/Configurations/Bolts-iOS.xcconfig
@@ -9,6 +9,7 @@
 
 #include "Shared/Platform/iOS.xcconfig"
 #include "Shared/Product/StaticFramework.xcconfig"
+#include "Version.xcconfig"
 
 PRODUCT_NAME = Bolts
 PRODUCT_BUNDLE_IDENTIFIER = com.bolts.ios

diff --git a/Configurations/Bolts-macOS.xcconfig b/Configurations/Bolts-macOS.xcconfig
@@ -9,9 +9,13 @@
 
 #include "Shared/Platform/macOS.xcconfig"
 #include "Shared/Product/DynamicFramework.xcconfig"
+#include "Version.xcconfig"
 
 PRODUCT_NAME = Bolts
 PRODUCT_BUNDLE_IDENTIFIER = com.bolts.macos
 MACOSX_DEPLOYMENT_TARGET = 10.8
 
 INFOPLIST_FILE = $(SRCROOT)/Bolts/Resources/Info.plist
+
+// Use the 1.0.0 to avoid breaking changes with older version of Bolts.
+DYLIB_COMPATIBILITY_VERSION = 1
diff --git a/Configurations/Bolts-tvOS-Dynamic.xcconfig b/Configurations/Bolts-tvOS-Dynamic.xcconfig
@@ -9,8 +9,12 @@
 
 #include "Shared/Platform/tvOS.xcconfig"
 #include "Shared/Product/DynamicFramework.xcconfig"
+#include "Version.xcconfig"
 
 PRODUCT_NAME = Bolts
 PRODUCT_BUNDLE_IDENTIFIER = com.bolts.tvos
 
 INFOPLIST_FILE = $(SRCROOT)/Bolts/Resources/Info.plist
+
+// Use the 1.0.0 to avoid breaking changes with older version of Bolts.
+DYLIB_COMPATIBILITY_VERSION = 1
diff --git a/Configurations/Bolts-tvOS.xcconfig b/Configurations/Bolts-tvOS.xcconfig
@@ -9,6 +9,7 @@
 
 #include "Shared/Platform/tvOS.xcconfig"
 #include "Shared/Product/StaticFramework.xcconfig"
+#include "Version.xcconfig"
 
 PRODUCT_NAME = Bolts
 PRODUCT_BUNDLE_IDENTIFIER = com.bolts.tvos

diff --git a/Configurations/Bolts-watchOS-Dynamic.xcconfig b/Configurations/Bolts-watchOS-Dynamic.xcconfig
@@ -9,6 +9,7 @@
 
 #include "Shared/Platform/watchOS.xcconfig"
 #include "Shared/Product/DynamicFramework.xcconfig"
+#include "Version.xcconfig"
 
 PRODUCT_NAME = Bolts
 PRODUCT_BUNDLE_IDENTIFIER = com.bolts.watchos
@@ -17,3 +18,6 @@ WATCHOS_DEPLOYMENT_TARGET = 2.0
 APPLICATION_EXTENSION_API_ONLY = YES
 
 INFOPLIST_FILE = $(SRCROOT)/Bolts/Resources/Info.plist
+
+// Use the 1.0.0 to avoid breaking changes with older version of Bolts.
+DYLIB_COMPATIBILITY_VERSION = 1
diff --git a/Configurations/Bolts-watchOS.xcconfig b/Configurations/Bolts-watchOS.xcconfig
@@ -9,6 +9,7 @@
 
 #include "Shared/Platform/watchOS.xcconfig"
 #include "Shared/Product/StaticFramework.xcconfig"
+#include "Version.xcconfig"
 
 PRODUCT_NAME = Bolts
 PRODUCT_BUNDLE_IDENTIFIER = com.bolts.watchos

diff --git a/Configurations/Version.xcconfig b/Configurations/Version.xcconfig
@@ -0,0 +1,10 @@
+//
+// Copyright (c) 2014, Facebook, Inc.
+// All rights reserved.
+//
+// This source code is licensed under the BSD-style license found in the
+// LICENSE file in the root directory of this source tree. An additional grant
+// of patent rights can be found in the PATENTS file in the same directory.
+//
+
+BOLTS_OBJC_VERSION = 1.8.3
diff --git a/Vendor/xctoolchain b/Vendor/xctoolchain