From a447dfd6a81b72b2bc80bbdfe7190f764b501d65 Mon Sep 17 00:00:00 2001 From: Pushpendra Date: Thu, 21 Nov 2019 15:36:00 +0530 Subject: [PATCH 1/2] Migrated to xcode 11.2.1 and Swift 5 --- .gitmodules | 2 +- .travis.yml | 8 ++++---- Cartfile.private | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/SwiftCheck | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5f41aa0..0573e82 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "Carthage/Checkouts/SwiftCheck"] path = Carthage/Checkouts/SwiftCheck - url = https://github.com/typelift/SwiftCheck.git + url = https://github.com/ShareCare/SwiftCheck.git [submodule "Carthage/Checkouts/Operadics"] path = Carthage/Checkouts/Operadics url = https://github.com/typelift/Operadics.git diff --git a/.travis.yml b/.travis.yml index 7236807..890dba3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ matrix: include: - os: osx language: objective-c - osx_image: xcode10.2 + osx_image: xcode11.2 before_install: - git submodule update --init --recursive script: @@ -13,14 +13,14 @@ matrix: - carthage build --no-skip-current - os: osx language: objective-c - osx_image: xcode10.2 + osx_image: xcode11.2 before_install: - git submodule update --init --recursive script: - set -o pipefail - xcodebuild test -scheme Swiftx | xcpretty -c - - xcodebuild build-for-testing -scheme Swiftx-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (2nd generation)" | xcpretty -c - - xcodebuild test -scheme Swiftx-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (2nd generation)" | xcpretty -c + - xcodebuild build-for-testing -scheme Swiftx-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (3rd generation)" | xcpretty -c + - xcodebuild test -scheme Swiftx-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (3rd generation)" | xcpretty -c - xcodebuild build-for-testing -scheme Swiftx-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p)' | xcpretty -c - xcodebuild test -scheme Swiftx-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p)' | xcpretty -c - os: linux diff --git a/Cartfile.private b/Cartfile.private index e065b60..bf0a7d1 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "typelift/Operadics" -github "typelift/SwiftCheck" +github "ShareCare/SwiftCheck" "feature/FEAT-6489" diff --git a/Cartfile.resolved b/Cartfile.resolved index 6ccf18e..581f073 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ +github "ShareCare/SwiftCheck" "c54463048ddd6134a88ee86dbf67a4f4e9a0a415" github "typelift/Operadics" "0.4.0" -github "typelift/SwiftCheck" "0.12.0" diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck index 077c096..c544630 160000 --- a/Carthage/Checkouts/SwiftCheck +++ b/Carthage/Checkouts/SwiftCheck @@ -1 +1 @@ -Subproject commit 077c096c3ddfc38db223ac8e525ad16ffb987138 +Subproject commit c54463048ddd6134a88ee86dbf67a4f4e9a0a415 From 76db27184940155fbb67563d25fb86d4ddaef759 Mon Sep 17 00:00:00 2001 From: Pushpendra Date: Thu, 21 Nov 2019 15:50:32 +0530 Subject: [PATCH 2/2] Updated cart file --- Cartfile.private | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/SwiftCheck | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index bf0a7d1..ebb054e 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "typelift/Operadics" -github "ShareCare/SwiftCheck" "feature/FEAT-6489" +github "ShareCare/SwiftCheck" "master" diff --git a/Cartfile.resolved b/Cartfile.resolved index 581f073..084baa6 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "ShareCare/SwiftCheck" "c54463048ddd6134a88ee86dbf67a4f4e9a0a415" +github "ShareCare/SwiftCheck" "c3bb2da15f0d9689eefd85394694d4f5057d5ea6" github "typelift/Operadics" "0.4.0" diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck index c544630..c3bb2da 160000 --- a/Carthage/Checkouts/SwiftCheck +++ b/Carthage/Checkouts/SwiftCheck @@ -1 +1 @@ -Subproject commit c54463048ddd6134a88ee86dbf67a4f4e9a0a415 +Subproject commit c3bb2da15f0d9689eefd85394694d4f5057d5ea6