From eac408ca17a936ec6b77ff2c7091a1b7dc7c04ac Mon Sep 17 00:00:00 2001 From: pushp1989 <54930194+pushp1989@users.noreply.github.com> Date: Wed, 11 Sep 2019 19:07:50 +0530 Subject: [PATCH 1/8] Update Cartfile.private --- Cartfile.private | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index b49b1bf..2fd4853 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ -github "typelift/Swiftx" -github "typelift/SwiftCheck" +github "typelift/Swiftx" ~> "https://github.com/pushp1989/Swiftx.git" +github "typelift/SwiftCheck" ~> "https://github.com/typelift/SwiftCheck.git" github "typelift/Operadics" From 63617fcdb0c4920104f4aa90fd96f7bf44ba8754 Mon Sep 17 00:00:00 2001 From: pushp1989 <54930194+pushp1989@users.noreply.github.com> Date: Wed, 11 Sep 2019 19:08:36 +0530 Subject: [PATCH 2/8] Update Cartfile.private change it my git urls --- Cartfile.private | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile.private b/Cartfile.private index 2fd4853..329d6c8 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "typelift/Swiftx" ~> "https://github.com/pushp1989/Swiftx.git" -github "typelift/SwiftCheck" ~> "https://github.com/typelift/SwiftCheck.git" +github "typelift/SwiftCheck" ~> "https://github.com/pushp1989/SwiftCheck.git" github "typelift/Operadics" From 8b3280ede853db72319d7fa52916671054b4acdb Mon Sep 17 00:00:00 2001 From: pushp1989 <54930194+pushp1989@users.noreply.github.com> Date: Wed, 11 Sep 2019 19:25:02 +0530 Subject: [PATCH 3/8] Update .travis.yml build system support for Xcode 11 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 30cb210..0cdf4f9 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 before_install: - git submodule update --init --recursive script: @@ -13,7 +13,7 @@ matrix: - carthage build --no-skip-current - os: osx language: objective-c - osx_image: xcode10.2 + osx_image: xcode11 before_install: - git submodule update --init --recursive script: From f3ea48a1e75e98276b937fcd8138f747a3b07428 Mon Sep 17 00:00:00 2001 From: Pushpendra Date: Thu, 12 Sep 2019 15:45:48 +0530 Subject: [PATCH 4/8] added cartfile changes --- Cartfile.private | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index 329d6c8..0e884e1 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ -github "typelift/Swiftx" ~> "https://github.com/pushp1989/Swiftx.git" -github "typelift/SwiftCheck" ~> "https://github.com/pushp1989/SwiftCheck.git" +github "pushp1989/Swiftx" +github "pushp1989/SwiftCheck" github "typelift/Operadics" From 723427adbfaca7dd5e333a34c0da6cfe78b38908 Mon Sep 17 00:00:00 2001 From: Pushpendra Date: Thu, 12 Sep 2019 16:14:50 +0530 Subject: [PATCH 5/8] Changed git urls --- Cartfile.resolved | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index 0ae3264..f0d0d33 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ +github "pushp1989/SwiftCheck" "0.12.0" +github "pushp1989/Swiftx" "0.8.0" github "typelift/Operadics" "0.4.0" -github "typelift/SwiftCheck" "0.12.0" -github "typelift/Swiftx" "0.8.0" From 62983529453167743047c6911ad5d40e9cd87014 Mon Sep 17 00:00:00 2001 From: Pushpendra Date: Tue, 17 Sep 2019 19:38:00 +0530 Subject: [PATCH 6/8] Updated the simulator version --- .travis.yml | 4 ++-- Cartfile.resolved | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cdf4f9..40127b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ matrix: script: - set -o pipefail - xcodebuild test -scheme Swiftz | xcpretty -c - - xcodebuild build-for-testing -scheme Swiftz-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (2nd generation)" | xcpretty -c - - xcodebuild test -scheme Swiftz-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (2nd generation)" | xcpretty -c + - xcodebuild build-for-testing -scheme Swiftz-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (3rd generation)" | xcpretty -c + - xcodebuild test -scheme Swiftz-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (3rd generation)" | xcpretty -c - xcodebuild build-for-testing -scheme Swiftz-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p)' | xcpretty -c - xcodebuild test -scheme Swiftz-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p)' | xcpretty -c - os: linux diff --git a/Cartfile.resolved b/Cartfile.resolved index f0d0d33..bd4bf1c 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ -github "pushp1989/SwiftCheck" "0.12.0" -github "pushp1989/Swiftx" "0.8.0" +github "pushp1989/SwiftCheck" +github "pushp1989/Swiftx" github "typelift/Operadics" "0.4.0" From f5b9278eeaaeb2b4ef181616c15e03fdc6070771 Mon Sep 17 00:00:00 2001 From: Pushpendra Date: Wed, 18 Sep 2019 13:10:52 +0530 Subject: [PATCH 7/8] Upddate Swiftcheck and Swiftx --- Cartfile.private | 4 ++-- Cartfile.resolved | 4 ++-- Carthage/Checkouts/SwiftCheck | 2 +- Carthage/Checkouts/Swiftx | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index 0e884e1..1a171f3 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ -github "pushp1989/Swiftx" -github "pushp1989/SwiftCheck" +github "pushp1989/Swiftx" "0167622512a15d53f2c0852a64f2c03b9d6cfe8b" +github "pushp1989/SwiftCheck" "cfe6eb2a27097ff071f278d3c0f40fa11e42b0aa" github "typelift/Operadics" diff --git a/Cartfile.resolved b/Cartfile.resolved index bd4bf1c..87ac925 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ -github "pushp1989/SwiftCheck" -github "pushp1989/Swiftx" +github "pushp1989/SwiftCheck" "cfe6eb2a27097ff071f278d3c0f40fa11e42b0aa" +github "pushp1989/Swiftx" "0167622512a15d53f2c0852a64f2c03b9d6cfe8b" github "typelift/Operadics" "0.4.0" diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck index 077c096..cfe6eb2 160000 --- a/Carthage/Checkouts/SwiftCheck +++ b/Carthage/Checkouts/SwiftCheck @@ -1 +1 @@ -Subproject commit 077c096c3ddfc38db223ac8e525ad16ffb987138 +Subproject commit cfe6eb2a27097ff071f278d3c0f40fa11e42b0aa diff --git a/Carthage/Checkouts/Swiftx b/Carthage/Checkouts/Swiftx index 4affb64..0167622 160000 --- a/Carthage/Checkouts/Swiftx +++ b/Carthage/Checkouts/Swiftx @@ -1 +1 @@ -Subproject commit 4affb6451b6981cf56c2ec1287aaee3406a5e5e0 +Subproject commit 0167622512a15d53f2c0852a64f2c03b9d6cfe8b From f6c693a7a5caa77628b561be366808e9bc438caa Mon Sep 17 00:00:00 2001 From: Pushpendra Date: Wed, 18 Sep 2019 14:29:55 +0530 Subject: [PATCH 8/8] added git module --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4827716..b7a7f70 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "Carthage/Checkouts/Swiftx"] - url = https://github.com/typelift/Swiftx.git + url = https://github.com/pushp1989/Swiftx.git path = Carthage/Checkouts/Swiftx [submodule "Carthage/Checkouts/FileCheck"] path = Carthage/Checkouts/FileCheck @@ -9,4 +9,4 @@ url = https://github.com/typelift/Operadics.git [submodule "Carthage/Checkouts/SwiftCheck"] path = Carthage/Checkouts/SwiftCheck - url = https://github.com/typelift/SwiftCheck.git + url = https://github.com/pushp1989/SwiftCheck.git