From 723c7b948fde99beb08fbcc2dadf91cff1491730 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 20 Mar 2023 12:10:01 +0100 Subject: [PATCH 1/2] Copy files from #301 --- .travis.yml | 2 +- AlamofireObjectMapper.podspec | 4 ++-- AlamofireObjectMapper.xcodeproj/project.pbxproj | 4 ++-- Cartfile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index e15825e..9a0960e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode10.3 +osx_image: xcode11.7 env: global: diff --git a/AlamofireObjectMapper.podspec b/AlamofireObjectMapper.podspec index aa63048..1a51995 100644 --- a/AlamofireObjectMapper.podspec +++ b/AlamofireObjectMapper.podspec @@ -17,6 +17,6 @@ Pod::Spec.new do |s| s.requires_arc = true s.source_files = 'AlamofireObjectMapper/**/*.swift' - s.dependency 'Alamofire', '5.0.0-rc.3' - s.dependency 'ObjectMapper', '~> 3.5.1' + s.dependency 'Alamofire', '~> 5.2' + s.dependency 'ObjectMapper', '~> 4.2' end diff --git a/AlamofireObjectMapper.xcodeproj/project.pbxproj b/AlamofireObjectMapper.xcodeproj/project.pbxproj index ed0a2b9..a381206 100644 --- a/AlamofireObjectMapper.xcodeproj/project.pbxproj +++ b/AlamofireObjectMapper.xcodeproj/project.pbxproj @@ -836,7 +836,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - MACOSX_DEPLOYMENT_TARGET = 10.0; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -890,7 +890,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - MACOSX_DEPLOYMENT_TARGET = 10.0; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; diff --git a/Cartfile b/Cartfile index 88c4fed..295d576 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "Alamofire/Alamofire" "5.0.0-rc.3" -github "tristanhimmelman/ObjectMapper" ~> 3.5.1 +github "Alamofire/Alamofire" ~> 5.4 +github "tristanhimmelman/ObjectMapper" ~> 4.2 From b77474d6631c2ad5492aa5dcc295135b67c1fc4e Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 21 Mar 2023 15:49:11 +0100 Subject: [PATCH 2/2] Resolved --- Cartfile.resolved | 4 ++-- Carthage/Checkouts/Alamofire | 2 +- Carthage/Checkouts/ObjectMapper | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index ecd9252..c65c8cb 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "Alamofire/Alamofire" "5.0.0-rc.3" -github "tristanhimmelman/ObjectMapper" "3.5.1" +github "Alamofire/Alamofire" "5.6.4" +github "tristanhimmelman/ObjectMapper" "4.2.0" diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire index 2cbf599..78424be 160000 --- a/Carthage/Checkouts/Alamofire +++ b/Carthage/Checkouts/Alamofire @@ -1 +1 @@ -Subproject commit 2cbf59935fbb1f26e352ce4db53f1cf9408d5313 +Subproject commit 78424be314842833c04bc3bef5b72e85fff99204 diff --git a/Carthage/Checkouts/ObjectMapper b/Carthage/Checkouts/ObjectMapper index 19d499c..0b96a73 160000 --- a/Carthage/Checkouts/ObjectMapper +++ b/Carthage/Checkouts/ObjectMapper @@ -1 +1 @@ -Subproject commit 19d499c65b8240f1220d7cf155ccd309857f8018 +Subproject commit 0b96a734de3ea1c87374ae677064f86adb0716ec