From 8df22eb1e524d4baa17295fdb4445e87691bcc96 Mon Sep 17 00:00:00 2001 From: Zigii Wong Date: Thu, 27 Sep 2018 23:40:29 +0800 Subject: [PATCH 1/8] Bump version to 3.1.0 --- Alamofire-SwiftyJSON.podspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Alamofire-SwiftyJSON.podspec b/Alamofire-SwiftyJSON.podspec index 5447dc7..abdf59d 100644 --- a/Alamofire-SwiftyJSON.podspec +++ b/Alamofire-SwiftyJSON.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Alamofire-SwiftyJSON" - s.version = "3.0.0" + s.version = "3.1.0" s.summary = "Alamofire extension for serialize NSData to SwiftyJSON " s.homepage = "https://github.com/SwiftyJSON/Alamofire-SwiftyJSON" s.license = { :type => "MIT" } @@ -11,6 +11,6 @@ Pod::Spec.new do |s| s.ios.deployment_target = "9.0" s.source = { :git => "https://github.com/SwiftyJSON/Alamofire-SwiftyJSON.git", :tag => s.version } s.source_files = "Source/*.swift" - s.dependency 'Alamofire', '~> 4.5' - s.dependency 'SwiftyJSON', '~> 4.0.0' + s.dependency 'Alamofire', '~> 4.7.3' + s.dependency 'SwiftyJSON', '~> 4.2.0' end From 9f712cc439e0d5634febd7bbeb21dd6ba51601e5 Mon Sep 17 00:00:00 2001 From: Zigii Wong Date: Thu, 27 Sep 2018 23:43:14 +0800 Subject: [PATCH 2/8] Update travis ci image --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index de64906..a3c78d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: objective-c -osx_image: xcode9 -xcode_sdk: iphonesimulator10.0 +osx_image: xcode10 +xcode_sdk: iphonesimulator12.0 env: - - PLATFORM="ios" SCHEME="AlamofireSwiftyJSON" DESTINATION="platform=iOS Simulator,name=iPhone SE,OS=10.0" + - PLATFORM="ios" SCHEME="AlamofireSwiftyJSON" DESTINATION="platform=iOS Simulator,name=iPhone XS" script: - set -o pipefail && xcodebuild -project Alamofire-SwiftyJSON.xcodeproj -scheme $SCHEME -destination "$DESTINATION" build-for-testing test | xcpretty From a5c69a25943b412976740b7a8f339c9fa9c5b338 Mon Sep 17 00:00:00 2001 From: Zigii Wong Date: Thu, 27 Sep 2018 23:55:01 +0800 Subject: [PATCH 3/8] Update submodule --- Alamofire | 2 +- SwiftyJSON | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Alamofire b/Alamofire index 7fe7b91..a5cd9e2 160000 --- a/Alamofire +++ b/Alamofire @@ -1 +1 @@ -Subproject commit 7fe7b918b746fbb4b7a7c2146bef7a88c7ddc54e +Subproject commit a5cd9e233f24df3583f4b02f7e4722c076ab9032 diff --git a/SwiftyJSON b/SwiftyJSON index 6b9f11e..3f6f1d3 160000 --- a/SwiftyJSON +++ b/SwiftyJSON @@ -1 +1 @@ -Subproject commit 6b9f11e2bbd277f199b1c09fa65631bfc52d4a5d +Subproject commit 3f6f1d32df6e5f334593682b20bb829e48bffbee From 58a094e579bbf6d8dda9e53c029816b2892e110e Mon Sep 17 00:00:00 2001 From: Zigii Wong Date: Thu, 27 Sep 2018 23:59:02 +0800 Subject: [PATCH 4/8] fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a3c78d2..84fa35d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,6 @@ language: objective-c osx_image: xcode10 xcode_sdk: iphonesimulator12.0 env: - - PLATFORM="ios" SCHEME="AlamofireSwiftyJSON" DESTINATION="platform=iOS Simulator,name=iPhone XS" + - PLATFORM="ios" SCHEME="AlamofireSwiftyJSON" DESTINATION="platform=iOS Simulator,name=iPhone 6" script: - set -o pipefail && xcodebuild -project Alamofire-SwiftyJSON.xcodeproj -scheme $SCHEME -destination "$DESTINATION" build-for-testing test | xcpretty From 977bfe9d397ea8f233635a5939de56e7646c26b0 Mon Sep 17 00:00:00 2001 From: Zigii Wong Date: Fri, 28 Sep 2018 09:47:03 +0800 Subject: [PATCH 5/8] fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 84fa35d..b9a7041 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,6 @@ language: objective-c osx_image: xcode10 xcode_sdk: iphonesimulator12.0 env: - - PLATFORM="ios" SCHEME="AlamofireSwiftyJSON" DESTINATION="platform=iOS Simulator,name=iPhone 6" + - PLATFORM="ios" SCHEME="AlamofireSwiftyJSON" DESTINATION="platform=iOS Simulator,name=iPhone SE,OS=12.0" script: - set -o pipefail && xcodebuild -project Alamofire-SwiftyJSON.xcodeproj -scheme $SCHEME -destination "$DESTINATION" build-for-testing test | xcpretty From 02ec349158e7d1e5868388fa20054b45cbcf11f9 Mon Sep 17 00:00:00 2001 From: Zigii Wong Date: Fri, 28 Sep 2018 09:52:57 +0800 Subject: [PATCH 6/8] fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b9a7041..84fa35d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,6 @@ language: objective-c osx_image: xcode10 xcode_sdk: iphonesimulator12.0 env: - - PLATFORM="ios" SCHEME="AlamofireSwiftyJSON" DESTINATION="platform=iOS Simulator,name=iPhone SE,OS=12.0" + - PLATFORM="ios" SCHEME="AlamofireSwiftyJSON" DESTINATION="platform=iOS Simulator,name=iPhone 6" script: - set -o pipefail && xcodebuild -project Alamofire-SwiftyJSON.xcodeproj -scheme $SCHEME -destination "$DESTINATION" build-for-testing test | xcpretty From faadc7572cd700a15bd36b15d49e980b1a668655 Mon Sep 17 00:00:00 2001 From: Zigii Wong Date: Wed, 3 Apr 2019 12:30:14 +0800 Subject: [PATCH 7/8] Update ci --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84fa35d..e1472c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: objective-c osx_image: xcode10 xcode_sdk: iphonesimulator12.0 -env: - - PLATFORM="ios" SCHEME="AlamofireSwiftyJSON" DESTINATION="platform=iOS Simulator,name=iPhone 6" script: - - set -o pipefail && xcodebuild -project Alamofire-SwiftyJSON.xcodeproj -scheme $SCHEME -destination "$DESTINATION" build-for-testing test | xcpretty +- set -o pipefail +- travis_retry xcodebuild -project Alamofire-SwiftyJSON.xcodeproj -scheme "AlamofireSwiftyJSON" -destination "platform=iOS Simulator,name=iPhone 6" build-for-testing test | xcpretty From 23ce753f4c954f1c188c0c2636c53ef034d0398f Mon Sep 17 00:00:00 2001 From: Zigii Wong Date: Wed, 3 Apr 2019 12:36:40 +0800 Subject: [PATCH 8/8] Fix build error --- Alamofire-SwiftyJSON.xcodeproj/project.pbxproj | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Alamofire-SwiftyJSON.xcodeproj/project.pbxproj b/Alamofire-SwiftyJSON.xcodeproj/project.pbxproj index e703136..f302a4f 100644 --- a/Alamofire-SwiftyJSON.xcodeproj/project.pbxproj +++ b/Alamofire-SwiftyJSON.xcodeproj/project.pbxproj @@ -375,6 +375,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = A8AFB70519D1401D0070765E; @@ -430,7 +431,7 @@ 4BC5EA061BB7E15600A393DD /* SwiftyJSON OSX Tests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "SwiftyJSON OSX Tests.xctest"; + path = "SwiftyJSON macOS Tests.xctest"; remoteRef = 4BC5EA051BB7E15600A393DD /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -713,7 +714,7 @@ "$(inherited)", ); INFOPLIST_FILE = Tests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 3.0; @@ -724,7 +725,7 @@ isa = XCBuildConfiguration; buildSettings = { INFOPLIST_FILE = Tests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 3.0;