From bfb21ba7618534d98d6e29f17c7757652660ee82 Mon Sep 17 00:00:00 2001 From: Tristan Himmelman Date: Thu, 15 Nov 2018 15:28:48 -0500 Subject: [PATCH] - renamed OSX target to macOS - udpated to swift 4.2 - updated dependencies --- .gitmodules | 2 +- .swift-version | 2 +- AlamofireObjectMapper.podspec | 6 +- .../project.pbxproj | 81 ++++++++++++------- .../AlamofireObjectMapper OSX.xcscheme | 20 +++-- .../AlamofireObjectMapper iOS.xcscheme | 4 +- .../AlamofireObjectMapper tvOS.xcscheme | 4 +- .../AlamofireObjectMapper watchOS.xcscheme | 4 +- Cartfile | 4 +- Cartfile.resolved | 4 +- Carthage/Checkouts/Alamofire | 2 +- Carthage/Checkouts/ObjectMapper | 2 +- 12 files changed, 73 insertions(+), 62 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2336e2f..fa7ea3f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "Carthage/Checkouts/ObjectMapper"] path = Carthage/Checkouts/ObjectMapper - url = https://github.com/Hearst-DD/ObjectMapper.git + url = https://github.com/tristanhimmelman/ObjectMapper.git [submodule "Carthage/Checkouts/Alamofire"] path = Carthage/Checkouts/Alamofire url = https://github.com/Alamofire/Alamofire.git diff --git a/.swift-version b/.swift-version index 389f774..8012ebb 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 \ No newline at end of file +4.2 \ No newline at end of file diff --git a/AlamofireObjectMapper.podspec b/AlamofireObjectMapper.podspec index f79a430..2421b38 100644 --- a/AlamofireObjectMapper.podspec +++ b/AlamofireObjectMapper.podspec @@ -13,10 +13,10 @@ Pod::Spec.new do |s| s.watchos.deployment_target = '2.0' s.tvos.deployment_target = '9.0' - s.swift_version = '4.0' + s.swift_version = '4.2' s.requires_arc = true s.source_files = 'AlamofireObjectMapper/**/*.swift' - s.dependency 'Alamofire', '~> 4.1' - s.dependency 'ObjectMapper', '~> 3.3' + s.dependency 'Alamofire', '~> 4.7' + s.dependency 'ObjectMapper', '~> 3.4' end diff --git a/AlamofireObjectMapper.xcodeproj/project.pbxproj b/AlamofireObjectMapper.xcodeproj/project.pbxproj index bde48b3..1d1b23d 100644 --- a/AlamofireObjectMapper.xcodeproj/project.pbxproj +++ b/AlamofireObjectMapper.xcodeproj/project.pbxproj @@ -32,6 +32,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 6A20983B219CDEA5009AB4DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E89A900C1D6F5F520023C364 /* ObjectMapper.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = DBB9B41F2142A25100078E5A; + remoteInfo = "ObjectMapper-Mac-Static"; + }; 6AB2A01E1AF26C36001EBB20 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 6AB2A0081AF26C36001EBB20 /* Project object */; @@ -162,7 +169,7 @@ 6AB2A0231AF26C36001EBB20 /* AlamofireObjectMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireObjectMapperTests.swift; sourceTree = ""; }; 6AB2A02D1AF2746D001EBB20 /* AlamofireObjectMapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlamofireObjectMapper.swift; sourceTree = ""; }; 6AB2A0851AF27DF1001EBB20 /* AlamofireObjectMapper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AlamofireObjectMapper.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 6AB2A08F1AF27DF1001EBB20 /* AlamofireObjectMapperTests OSX.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AlamofireObjectMapperTests OSX.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6AB2A08F1AF27DF1001EBB20 /* AlamofireObjectMapperTests macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AlamofireObjectMapperTests macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 6AC4580C1BA34C5600054758 /* AlamofireObjectMapper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AlamofireObjectMapper.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6AC692061BE3F69E004C119A /* AlamofireObjectMapper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AlamofireObjectMapper.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6AC692121BE3F7F5004C119A /* AlamofireObjectMapperTests tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AlamofireObjectMapperTests tvOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -251,7 +258,7 @@ 6AB2A0111AF26C36001EBB20 /* AlamofireObjectMapper.framework */, 6AB2A01C1AF26C36001EBB20 /* AlamofireObjectMapperTests iOS.xctest */, 6AB2A0851AF27DF1001EBB20 /* AlamofireObjectMapper.framework */, - 6AB2A08F1AF27DF1001EBB20 /* AlamofireObjectMapperTests OSX.xctest */, + 6AB2A08F1AF27DF1001EBB20 /* AlamofireObjectMapperTests macOS.xctest */, 6AC4580C1BA34C5600054758 /* AlamofireObjectMapper.framework */, 6AC692061BE3F69E004C119A /* AlamofireObjectMapper.framework */, 6AC692121BE3F7F5004C119A /* AlamofireObjectMapperTests tvOS.xctest */, @@ -318,6 +325,7 @@ E89A901F1D6F5F520023C364 /* ObjectMapper-iOSTests.xctest */, E89A90211D6F5F520023C364 /* ObjectMapper-MacTests.xctest */, E89A90231D6F5F520023C364 /* ObjectMapper-tvOSTests.xctest */, + 6A20983C219CDEA5009AB4DF /* libObjectMapper.a */, ); name = Products; sourceTree = ""; @@ -395,9 +403,9 @@ productReference = 6AB2A01C1AF26C36001EBB20 /* AlamofireObjectMapperTests iOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 6AB2A0841AF27DF1001EBB20 /* AlamofireObjectMapper OSX */ = { + 6AB2A0841AF27DF1001EBB20 /* AlamofireObjectMapper macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 6AB2A0981AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapper OSX" */; + buildConfigurationList = 6AB2A0981AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapper macOS" */; buildPhases = ( 6AB2A0801AF27DF1001EBB20 /* Sources */, 6AB2A0811AF27DF1001EBB20 /* Frameworks */, @@ -407,14 +415,14 @@ ); dependencies = ( ); - name = "AlamofireObjectMapper OSX"; + name = "AlamofireObjectMapper macOS"; productName = "AlamofireObjectMapper OSX"; productReference = 6AB2A0851AF27DF1001EBB20 /* AlamofireObjectMapper.framework */; productType = "com.apple.product-type.framework"; }; - 6AB2A08E1AF27DF1001EBB20 /* AlamofireObjectMapperTests OSX */ = { + 6AB2A08E1AF27DF1001EBB20 /* AlamofireObjectMapperTests macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 6AB2A09B1AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapperTests OSX" */; + buildConfigurationList = 6AB2A09B1AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapperTests macOS" */; buildPhases = ( 6AB2A08B1AF27DF1001EBB20 /* Sources */, 6AB2A08C1AF27DF1001EBB20 /* Frameworks */, @@ -425,9 +433,9 @@ dependencies = ( 6AB2A0921AF27DF1001EBB20 /* PBXTargetDependency */, ); - name = "AlamofireObjectMapperTests OSX"; + name = "AlamofireObjectMapperTests macOS"; productName = "AlamofireObjectMapper OSXTests"; - productReference = 6AB2A08F1AF27DF1001EBB20 /* AlamofireObjectMapperTests OSX.xctest */; + productReference = 6AB2A08F1AF27DF1001EBB20 /* AlamofireObjectMapperTests macOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; 6AC4580B1BA34C5600054758 /* AlamofireObjectMapper watchOS */ = { @@ -493,7 +501,7 @@ CLASSPREFIX = ""; LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0710; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = "Tristan Himmelman"; TargetAttributes = { 6AB2A0101AF26C36001EBB20 = { @@ -545,8 +553,8 @@ targets = ( 6AB2A0101AF26C36001EBB20 /* AlamofireObjectMapper iOS */, 6AB2A01B1AF26C36001EBB20 /* AlamofireObjectMapperTests iOS */, - 6AB2A0841AF27DF1001EBB20 /* AlamofireObjectMapper OSX */, - 6AB2A08E1AF27DF1001EBB20 /* AlamofireObjectMapperTests OSX */, + 6AB2A0841AF27DF1001EBB20 /* AlamofireObjectMapper macOS */, + 6AB2A08E1AF27DF1001EBB20 /* AlamofireObjectMapperTests macOS */, 6AC692051BE3F69E004C119A /* AlamofireObjectMapper tvOS */, 6AC692111BE3F7F5004C119A /* AlamofireObjectMapperTests tvOS */, 6AC4580B1BA34C5600054758 /* AlamofireObjectMapper watchOS */, @@ -555,6 +563,13 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + 6A20983C219CDEA5009AB4DF /* libObjectMapper.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libObjectMapper.a; + remoteRef = 6A20983B219CDEA5009AB4DF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; E89A8FFF1D6F5F480023C364 /* Alamofire.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -760,7 +775,7 @@ }; 6AB2A0921AF27DF1001EBB20 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 6AB2A0841AF27DF1001EBB20 /* AlamofireObjectMapper OSX */; + target = 6AB2A0841AF27DF1001EBB20 /* AlamofireObjectMapper macOS */; targetProxy = 6AB2A0911AF27DF1001EBB20 /* PBXContainerItemProxy */; }; 6AC692191BE3F7F6004C119A /* PBXTargetDependency */ = { @@ -783,12 +798,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -823,7 +840,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -842,12 +859,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -873,7 +892,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -901,7 +920,7 @@ PRODUCT_NAME = AlamofireObjectMapper; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -925,7 +944,7 @@ PRODUCT_NAME = AlamofireObjectMapper; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -946,7 +965,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -964,7 +983,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -991,7 +1010,7 @@ PRODUCT_NAME = AlamofireObjectMapper; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -1014,7 +1033,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -1037,7 +1056,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -1056,7 +1075,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -1079,7 +1098,7 @@ PRODUCT_NAME = AlamofireObjectMapper; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; @@ -1104,7 +1123,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; @@ -1129,7 +1148,7 @@ PRODUCT_NAME = AlamofireObjectMapper; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -1154,7 +1173,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -1173,7 +1192,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; @@ -1191,7 +1210,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; @@ -1226,7 +1245,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 6AB2A0981AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapper OSX" */ = { + 6AB2A0981AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapper macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 6AB2A0991AF27DF1001EBB20 /* Debug */, @@ -1235,7 +1254,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 6AB2A09B1AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapperTests OSX" */ = { + 6AB2A09B1AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapperTests macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 6AB2A09C1AF27DF1001EBB20 /* Debug */, diff --git a/AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper OSX.xcscheme b/AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper OSX.xcscheme index 48a1335..cd5b73f 100644 --- a/AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper OSX.xcscheme +++ b/AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper OSX.xcscheme @@ -1,6 +1,6 @@ @@ -29,8 +29,8 @@ @@ -40,7 +40,6 @@ buildConfiguration = "Release" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -59,7 +58,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "6AB2A0841AF27DF1001EBB20" BuildableName = "AlamofireObjectMapper.framework" - BlueprintName = "AlamofireObjectMapper OSX" + BlueprintName = "AlamofireObjectMapper macOS" ReferencedContainer = "container:AlamofireObjectMapper.xcodeproj"> @@ -70,7 +69,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -82,7 +80,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "6AB2A0841AF27DF1001EBB20" BuildableName = "AlamofireObjectMapper.framework" - BlueprintName = "AlamofireObjectMapper OSX" + BlueprintName = "AlamofireObjectMapper macOS" ReferencedContainer = "container:AlamofireObjectMapper.xcodeproj"> @@ -100,7 +98,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "6AB2A0841AF27DF1001EBB20" BuildableName = "AlamofireObjectMapper.framework" - BlueprintName = "AlamofireObjectMapper OSX" + BlueprintName = "AlamofireObjectMapper macOS" ReferencedContainer = "container:AlamofireObjectMapper.xcodeproj"> diff --git a/AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper iOS.xcscheme b/AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper iOS.xcscheme index c79faf1..37a7596 100644 --- a/AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper iOS.xcscheme +++ b/AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper iOS.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Cartfile b/Cartfile index 20deaa1..662080e 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "Alamofire/Alamofire" ~> 4.1 -github "Hearst-DD/ObjectMapper" ~> 3.3 +github "Alamofire/Alamofire" ~> 4.7 +github "tristanhimmelman/ObjectMapper" ~> 3.4 diff --git a/Cartfile.resolved b/Cartfile.resolved index 5e496f3..1462415 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "Alamofire/Alamofire" "4.7.2" -github "Hearst-DD/ObjectMapper" "3.3.0" +github "Alamofire/Alamofire" "4.7.3" +github "tristanhimmelman/ObjectMapper" "3.4.1" diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire index 2fb881a..61a780f 160000 --- a/Carthage/Checkouts/Alamofire +++ b/Carthage/Checkouts/Alamofire @@ -1 +1 @@ -Subproject commit 2fb881a1702cb1976c36192aceb54dcedab6fdc2 +Subproject commit 61a780f3b58ee0d2bb76fdb7b89dbc9751d521d7 diff --git a/Carthage/Checkouts/ObjectMapper b/Carthage/Checkouts/ObjectMapper index 7de160d..feb763a 160000 --- a/Carthage/Checkouts/ObjectMapper +++ b/Carthage/Checkouts/ObjectMapper @@ -1 +1 @@ -Subproject commit 7de160dbc8a9a03ad4c39167e63cc2b7361e4cc5 +Subproject commit feb763a93755b5b576e09a9db2cb8d380fd65ba2