From 9c54a40f75a00c773b9e1e226d887ec097f10d22 Mon Sep 17 00:00:00 2001 From: Tristan Himmelman Date: Mon, 11 Sep 2017 15:56:10 -0400 Subject: [PATCH 1/8] swift 4 support --- AlamofireObjectMapper.xcodeproj/project.pbxproj | 14 +++++++++++++- .../xcschemes/AlamofireObjectMapper OSX.xcscheme | 4 +++- .../xcschemes/AlamofireObjectMapper iOS.xcscheme | 4 +++- .../xcschemes/AlamofireObjectMapper tvOS.xcscheme | 4 +++- .../AlamofireObjectMapper watchOS.xcscheme | 4 +++- Cartfile | 2 +- Cartfile.resolved | 4 ++-- Carthage/Checkouts/Alamofire | 2 +- Carthage/Checkouts/ObjectMapper | 2 +- 9 files changed, 30 insertions(+), 10 deletions(-) diff --git a/AlamofireObjectMapper.xcodeproj/project.pbxproj b/AlamofireObjectMapper.xcodeproj/project.pbxproj index dd7921d..396bf2a 100644 --- a/AlamofireObjectMapper.xcodeproj/project.pbxproj +++ b/AlamofireObjectMapper.xcodeproj/project.pbxproj @@ -493,7 +493,7 @@ CLASSPREFIX = ""; LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0710; - LastUpgradeCheck = 0820; + LastUpgradeCheck = 0900; ORGANIZATIONNAME = "Tristan Himmelman"; TargetAttributes = { 6AB2A0101AF26C36001EBB20 = { @@ -779,14 +779,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = 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_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -830,14 +836,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = 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_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; diff --git a/AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper OSX.xcscheme b/AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper OSX.xcscheme index 9a88fff..48a1335 100644 --- a/AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper OSX.xcscheme +++ b/AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper OSX.xcscheme @@ -1,6 +1,6 @@ @@ -36,6 +37,7 @@ 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 aea9781..b8ea588 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ github "Alamofire/Alamofire" ~> 4.1 -github "Hearst-DD/ObjectMapper" ~> 2.0 +github "Hearst-DD/ObjectMapper" "swift-4" diff --git a/Cartfile.resolved b/Cartfile.resolved index 7fa985d..fc41a90 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "Alamofire/Alamofire" "4.3.0" -github "Hearst-DD/ObjectMapper" "2.2.3" +github "Alamofire/Alamofire" "4.5.1" +github "Hearst-DD/ObjectMapper" "57459cfbff5097ab29c5b1dadac3320dea7f3865" diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire index c9c9d09..b899544 160000 --- a/Carthage/Checkouts/Alamofire +++ b/Carthage/Checkouts/Alamofire @@ -1 +1 @@ -Subproject commit c9c9d091b308a57ff9a744be4f2537ac9c5b4c0b +Subproject commit b8995447518fd57af14c88a47f27434a16f60403 diff --git a/Carthage/Checkouts/ObjectMapper b/Carthage/Checkouts/ObjectMapper index 4cde0b3..57459cf 160000 --- a/Carthage/Checkouts/ObjectMapper +++ b/Carthage/Checkouts/ObjectMapper @@ -1 +1 @@ -Subproject commit 4cde0b3690869533e4da101157cab5d0adb167b3 +Subproject commit 57459cfbff5097ab29c5b1dadac3320dea7f3865 From acc71cd43851f7bf9138a1955dff61daed89335b Mon Sep 17 00:00:00 2001 From: Tristan Himmelman Date: Mon, 11 Sep 2017 16:00:15 -0400 Subject: [PATCH 2/8] fixed migration issues in tests --- .../AlamofireObjectMapperTests.swift | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/AlamofireObjectMapperTests/AlamofireObjectMapperTests.swift b/AlamofireObjectMapperTests/AlamofireObjectMapperTests.swift index 0f94f64..1a06fc9 100644 --- a/AlamofireObjectMapperTests/AlamofireObjectMapperTests.swift +++ b/AlamofireObjectMapperTests/AlamofireObjectMapperTests.swift @@ -66,7 +66,7 @@ class AlamofireObjectMapperTests: XCTestCase { } waitForExpectations(timeout: 10) { error in - XCTAssertNil(error, "\(error)") + XCTAssertNil(error, "\(String(describing: error))") } } @@ -96,7 +96,7 @@ class AlamofireObjectMapperTests: XCTestCase { } waitForExpectations(timeout: 10) { error in - XCTAssertNil(error, "\(error)") + XCTAssertNil(error, "\(String(describing: error))") } } @@ -122,7 +122,7 @@ class AlamofireObjectMapperTests: XCTestCase { } waitForExpectations(timeout: 10) { error in - XCTAssertNil(error, "\(error)") + XCTAssertNil(error, "\(String(describing: error))") } } @@ -148,7 +148,7 @@ class AlamofireObjectMapperTests: XCTestCase { } waitForExpectations(timeout: 10) { error in - XCTAssertNil(error, "\(error)") + XCTAssertNil(error, "\(String(describing: error))") } } @@ -174,7 +174,7 @@ class AlamofireObjectMapperTests: XCTestCase { } waitForExpectations(timeout: 10) { error in - XCTAssertNil(error, "\(error)") + XCTAssertNil(error, "\(String(describing: error))") } } @@ -199,7 +199,7 @@ class AlamofireObjectMapperTests: XCTestCase { } waitForExpectations(timeout: 10) { error in - XCTAssertNil(error, "\(error)") + XCTAssertNil(error, "\(String(describing: error))") } } @@ -224,7 +224,7 @@ class AlamofireObjectMapperTests: XCTestCase { } waitForExpectations(timeout: 10) { error in - XCTAssertNil(error, "\(error)") + XCTAssertNil(error, "\(String(describing: error))") } } @@ -252,7 +252,7 @@ class AlamofireObjectMapperTests: XCTestCase { } waitForExpectations(timeout: 10) { error in - XCTAssertNil(error, "\(error)") + XCTAssertNil(error, "\(String(describing: error))") } } @@ -278,7 +278,7 @@ class AlamofireObjectMapperTests: XCTestCase { } waitForExpectations(timeout: 10) { error in - XCTAssertNil(error, "\(error)") + XCTAssertNil(error, "\(String(describing: error))") } } From 9ecc7de150d83644489a8bf65e5f96fb47774db4 Mon Sep 17 00:00:00 2001 From: Den Date: Thu, 21 Sep 2017 14:01:57 +0200 Subject: [PATCH 3/8] Update AlamofireObjectMapper.podspec Changed ObjectMapper dependency to 3.0 (which supports swift 4) --- AlamofireObjectMapper.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AlamofireObjectMapper.podspec b/AlamofireObjectMapper.podspec index f84165d..4946db4 100644 --- a/AlamofireObjectMapper.podspec +++ b/AlamofireObjectMapper.podspec @@ -16,5 +16,5 @@ Pod::Spec.new do |s| s.requires_arc = 'true' s.source_files = 'AlamofireObjectMapper/**/*.swift' s.dependency 'Alamofire', '~> 4.1' - s.dependency 'ObjectMapper', '~> 2.0' + s.dependency 'ObjectMapper', '~> 3.0' end From f17c956c1be10d6530d836ac653bd83f27719e9d Mon Sep 17 00:00:00 2001 From: Tristan Himmelman Date: Fri, 22 Sep 2017 09:31:29 -0700 Subject: [PATCH 4/8] - travis update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2c51b33..fcbc83e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode8 +osx_image: xcode9 env: global: From 9bc79c6e077536114e911eba582747d85659a431 Mon Sep 17 00:00:00 2001 From: Tristan Himmelman Date: Fri, 22 Sep 2017 09:32:37 -0700 Subject: [PATCH 5/8] updated carthage ObjectMapper dependency --- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/ObjectMapper | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cartfile b/Cartfile index b8ea588..1c824e1 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ github "Alamofire/Alamofire" ~> 4.1 -github "Hearst-DD/ObjectMapper" "swift-4" +github "Hearst-DD/ObjectMapper" ~> 3.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index fc41a90..4e7b981 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ github "Alamofire/Alamofire" "4.5.1" -github "Hearst-DD/ObjectMapper" "57459cfbff5097ab29c5b1dadac3320dea7f3865" +github "Hearst-DD/ObjectMapper" "3.0.0" diff --git a/Carthage/Checkouts/ObjectMapper b/Carthage/Checkouts/ObjectMapper index 57459cf..950675d 160000 --- a/Carthage/Checkouts/ObjectMapper +++ b/Carthage/Checkouts/ObjectMapper @@ -1 +1 @@ -Subproject commit 57459cfbff5097ab29c5b1dadac3320dea7f3865 +Subproject commit 950675da53170582b9ff3263cfc88f12b60c24b2 From 04fa226119b8e8b72342318d6da5921af7ab3d1a Mon Sep 17 00:00:00 2001 From: Tristan Himmelman Date: Fri, 22 Sep 2017 09:42:03 -0700 Subject: [PATCH 6/8] updated podspec version --- AlamofireObjectMapper.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AlamofireObjectMapper.podspec b/AlamofireObjectMapper.podspec index 4946db4..7fc4ad2 100644 --- a/AlamofireObjectMapper.podspec +++ b/AlamofireObjectMapper.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "AlamofireObjectMapper" - s.version = "4.1.0" + s.version = "5.0.0" s.license = { :type => "MIT", :file => "LICENSE" } s.summary = "An extension to Alamofire which automatically converts JSON response data into swift objects using ObjectMapper" s.homepage = "https://github.com/tristanhimmelman/AlamofireObjectMapper" From 9304efad0c1f68d6fc25cf565bd30ff862501664 Mon Sep 17 00:00:00 2001 From: Tristan Himmelman Date: Fri, 22 Sep 2017 09:45:18 -0700 Subject: [PATCH 7/8] - project settings after migration --- AlamofireObjectMapper.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AlamofireObjectMapper.xcodeproj/project.pbxproj b/AlamofireObjectMapper.xcodeproj/project.pbxproj index a74d06e..1ee0172 100644 --- a/AlamofireObjectMapper.xcodeproj/project.pbxproj +++ b/AlamofireObjectMapper.xcodeproj/project.pbxproj @@ -498,11 +498,11 @@ TargetAttributes = { 6AB2A0101AF26C36001EBB20 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; 6AB2A01B1AF26C36001EBB20 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; 6AB2A0841AF27DF1001EBB20 = { CreatedOnToolsVersion = 6.3.1; From 8899a3df674cfd71edb121765ebcbe0762a92519 Mon Sep 17 00:00:00 2001 From: Tristan Himmelman Date: Sat, 30 Sep 2017 22:08:04 -0400 Subject: [PATCH 8/8] travis build fix --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fcbc83e..ae21af5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,8 @@ before_install: script: - set -o pipefail - - xcodebuild -workspace "$XCODE_WORKSPACE" -scheme "$SCHEME" -configuration Debug clean build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c; - - xcodebuild -workspace "$XCODE_WORKSPACE" -scheme "$SCHEME" -configuration Release clean build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c; + - xcodebuild -workspace "$XCODE_WORKSPACE" -scheme "$SCHEME" -configuration Debug clean build CODE_SIGN_IDENTITY="" BITCODE_GENERATION_MODE=marker CODE_SIGNING_REQUIRED=NO | xcpretty -c; + - xcodebuild -workspace "$XCODE_WORKSPACE" -scheme "$SCHEME" -configuration Release clean build CODE_SIGN_IDENTITY="" BITCODE_GENERATION_MODE=bitcode CODE_SIGNING_REQUIRED=NO | xcpretty -c; notifications: - email: false + email: false \ No newline at end of file