From 006620852158b87cb020be97d8b816bb692fc343 Mon Sep 17 00:00:00 2001 From: Tristan Himmelman Date: Fri, 19 Feb 2016 10:04:09 -0400 Subject: [PATCH] - ran carthage update - added BITCODE_GENERATION_MODE flags to targets --- AlamofireObjectMapper.xcodeproj/project.pbxproj | 8 ++++++++ Cartfile.resolved | 2 +- Carthage/Checkouts/ObjectMapper | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/AlamofireObjectMapper.xcodeproj/project.pbxproj b/AlamofireObjectMapper.xcodeproj/project.pbxproj index 16879a3..d5712e2 100644 --- a/AlamofireObjectMapper.xcodeproj/project.pbxproj +++ b/AlamofireObjectMapper.xcodeproj/project.pbxproj @@ -652,6 +652,7 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; + BITCODE_GENERATION_MODE = marker; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -680,6 +681,7 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; + BITCODE_GENERATION_MODE = bitcode; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -742,6 +744,7 @@ 6AB2A0991AF27DF1001EBB20 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + BITCODE_GENERATION_MODE = marker; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = dwarf; @@ -774,6 +777,7 @@ 6AB2A09A1AF27DF1001EBB20 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + BITCODE_GENERATION_MODE = bitcode; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -844,6 +848,7 @@ 6AC458111BA34C5600054758 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + BITCODE_GENERATION_MODE = marker; CODE_SIGN_IDENTITY = "iPhone Developer"; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; @@ -871,6 +876,7 @@ 6AC458121BA34C5600054758 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + BITCODE_GENERATION_MODE = bitcode; CODE_SIGN_IDENTITY = "iPhone Developer"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -898,6 +904,7 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; + BITCODE_GENERATION_MODE = marker; CODE_SIGN_IDENTITY = "iPhone Developer"; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; @@ -925,6 +932,7 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; + BITCODE_GENERATION_MODE = bitcode; CODE_SIGN_IDENTITY = "iPhone Developer"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; diff --git a/Cartfile.resolved b/Cartfile.resolved index b6a5de6..a4b6308 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ github "Alamofire/Alamofire" "3.2.0" -github "Hearst-DD/ObjectMapper" "1.1.2" +github "Hearst-DD/ObjectMapper" "1.1.5" diff --git a/Carthage/Checkouts/ObjectMapper b/Carthage/Checkouts/ObjectMapper index 31a2617..78cf498 160000 --- a/Carthage/Checkouts/ObjectMapper +++ b/Carthage/Checkouts/ObjectMapper @@ -1 +1 @@ -Subproject commit 31a26172f2cec51da92c7e6d4bccce5057f72cea +Subproject commit 78cf49821d6ff3553f8d7275cb09ff4ec8857c16