Skip to content

Commit d2bb1b6

Browse files
committed
Revert tvOS quick fix
1 parent ca84620 commit d2bb1b6

File tree

5 files changed

+8
-12
lines changed

5 files changed

+8
-12
lines changed

.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
url = https://github.com/antitypical/Result.git
44
[submodule "Carthage/Checkouts/Nimble"]
55
path = Carthage/Checkouts/Nimble
6-
url = https://github.com/yonekawa/Nimble.git
6+
url = https://github.com/Quick/Nimble.git
77
[submodule "Carthage/Checkouts/Quick"]
88
path = Carthage/Checkouts/Quick
9-
url = https://github.com/yonekawa/Quick.git
9+
url = https://github.com/Quick/Quick.git

Cartfile.private

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1-
# FIXME:
2-
# Quick & Nimble builds are failed caused by tvOS's XCTest does not contain bitcode.
3-
# https://github.com/Quick/Quick/issues/422
4-
# https://github.com/Quick/Nimble/pull/210
5-
github "yonekawa/Quick" "v0.8.0-tvos-disabled"
6-
github "yonekawa/Nimble" "v3.0.0-tvos-disabled"
1+
github "Quick/Quick" "v0.8.0"
2+
github "Quick/Nimble" "v3.0.0"

Cartfile.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "yonekawa/Nimble" "105e1bd0bb8ba1f2b06d0f43193725edde762017"
2-
github "yonekawa/Quick" "b799df399b48281633103ea5b2c46fd6eeff5e1d"
1+
github "Quick/Nimble" "v3.0.0"
2+
github "Quick/Quick" "v0.8.0"
33
github "antitypical/Result" "0.6.0-beta.6"

Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ end
55
namespace :carthage do
66
desc 'Update depndencies by carthage'
77
task :update do |t|
8-
run 'carthage update --use-submodules --verbose'
8+
run 'carthage update --use-submodules --platform iOS,Mac,watchOS --verbose'
99
end
1010
end
1111

0 commit comments

Comments
 (0)