Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 32ba6c3

Browse files
authored
Re-enable bitcode for the dynamic framework (#374)
* Re-enable bitcode for the dynamic framework * Remove linker flags * Bump MBXCore.framework * Fixed deleted dependency * Add Cartfile.resolved
1 parent 758da7e commit 32ba6c3

File tree

3 files changed

+11
-29
lines changed

3 files changed

+11
-29
lines changed

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" == 3.0.0-rc.1
1+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" == 3.1.0
22
github "mapbox/mapbox-events-ios" ~> 0.10

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" "3.0.0-rc.1"
1+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" "3.1.0"
22
github "mapbox/mapbox-events-ios" "v0.10.2"

platform/ios/ios.xcodeproj/project.pbxproj

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3769,7 +3769,7 @@
37693769
isa = XCBuildConfiguration;
37703770
baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */;
37713771
buildSettings = {
3772-
BITCODE_GENERATION_MODE = "";
3772+
BITCODE_GENERATION_MODE = bitcode;
37733773
CODE_SIGN_IDENTITY = "Apple Development";
37743774
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
37753775
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
@@ -3778,19 +3778,13 @@
37783778
DYLIB_COMPATIBILITY_VERSION = 1;
37793779
DYLIB_CURRENT_VERSION = 15262;
37803780
DYLIB_INSTALL_NAME_BASE = "@rpath";
3781-
ENABLE_BITCODE = NO;
3781+
ENABLE_BITCODE = YES;
37823782
GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
37833783
INFOPLIST_FILE = framework/Info.plist;
37843784
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
37853785
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
37863786
LLVM_LTO = YES;
3787-
OTHER_LDFLAGS = (
3788-
"-Wl,-U,_mapbox_common_get_version_string",
3789-
"-Wl,-U,_mapbox_common_offline_service_register_observer",
3790-
"-Wl,-U,_mapbox_common_get_major_version",
3791-
"-Wl,-U,_mapbox_common_get_minor_version",
3792-
"-Wl,-U,_mapbox_common_offline_service_unregister_observer",
3793-
);
3787+
OTHER_LDFLAGS = "";
37943788
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.Mapbox;
37953789
PRODUCT_NAME = Mapbox;
37963790
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4063,7 +4057,7 @@
40634057
isa = XCBuildConfiguration;
40644058
baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */;
40654059
buildSettings = {
4066-
BITCODE_GENERATION_MODE = "";
4060+
BITCODE_GENERATION_MODE = bitcode;
40674061
CODE_SIGN_IDENTITY = "Apple Development";
40684062
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
40694063
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
@@ -4072,17 +4066,11 @@
40724066
DYLIB_COMPATIBILITY_VERSION = 1;
40734067
DYLIB_CURRENT_VERSION = 15262;
40744068
DYLIB_INSTALL_NAME_BASE = "@rpath";
4075-
ENABLE_BITCODE = NO;
4069+
ENABLE_BITCODE = YES;
40764070
INFOPLIST_FILE = framework/Info.plist;
40774071
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
40784072
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
4079-
OTHER_LDFLAGS = (
4080-
"-Wl,-U,_mapbox_common_get_version_string",
4081-
"-Wl,-U,_mapbox_common_offline_service_register_observer",
4082-
"-Wl,-U,_mapbox_common_get_major_version",
4083-
"-Wl,-U,_mapbox_common_get_minor_version",
4084-
"-Wl,-U,_mapbox_common_offline_service_unregister_observer",
4085-
);
4073+
OTHER_LDFLAGS = "";
40864074
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.Mapbox;
40874075
PRODUCT_NAME = Mapbox;
40884076
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4096,7 +4084,7 @@
40964084
isa = XCBuildConfiguration;
40974085
baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */;
40984086
buildSettings = {
4099-
BITCODE_GENERATION_MODE = "";
4087+
BITCODE_GENERATION_MODE = bitcode;
41004088
CODE_SIGN_IDENTITY = "Apple Development";
41014089
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
41024090
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
@@ -4106,19 +4094,13 @@
41064094
DYLIB_COMPATIBILITY_VERSION = 1;
41074095
DYLIB_CURRENT_VERSION = 15262;
41084096
DYLIB_INSTALL_NAME_BASE = "@rpath";
4109-
ENABLE_BITCODE = NO;
4097+
ENABLE_BITCODE = YES;
41104098
GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
41114099
INFOPLIST_FILE = framework/Info.plist;
41124100
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
41134101
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
41144102
LLVM_LTO = YES;
4115-
OTHER_LDFLAGS = (
4116-
"-Wl,-U,_mapbox_common_get_version_string",
4117-
"-Wl,-U,_mapbox_common_offline_service_register_observer",
4118-
"-Wl,-U,_mapbox_common_get_major_version",
4119-
"-Wl,-U,_mapbox_common_get_minor_version",
4120-
"-Wl,-U,_mapbox_common_offline_service_unregister_observer",
4121-
);
4103+
OTHER_LDFLAGS = "";
41224104
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.Mapbox;
41234105
PRODUCT_NAME = Mapbox;
41244106
PROVISIONING_PROFILE_SPECIFIER = "";

0 commit comments

Comments
 (0)