Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix breaking change in DYLIB_COMPATIBILITY_VERSION. #270

Merged
merged 3 commits into from
Jul 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Bolts.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>"; };
Expand Down Expand Up @@ -507,6 +508,7 @@
81D646EA1D2CA0E000690609 /* BoltsTests-iOS.xcconfig */,
81D646EB1D2CA0E000690609 /* BoltsTests-OSX.xcconfig */,
81D646EC1D2CA0E000690609 /* BoltsTests-tvOS.xcconfig */,
81AB8BB11D36D7BD00066F63 /* Version.xcconfig */,
81D646ED1D2CA0E000690609 /* Shared */,
);
path = Configurations;
Expand Down
4 changes: 2 additions & 2 deletions Bolts/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions Configurations/Bolts-iOS-Dynamic.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
1 change: 1 addition & 0 deletions Configurations/Bolts-iOS.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Configurations/Bolts-macOS.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions Configurations/Bolts-tvOS-Dynamic.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions Configurations/Bolts-tvOS.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Configurations/Bolts-watchOS-Dynamic.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
1 change: 1 addition & 0 deletions Configurations/Bolts-watchOS.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions Configurations/Version.xcconfig
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Vendor/xctoolchain