diff --git a/.gitignore b/.gitignore index 922780e..267875a 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,8 @@ build/ Pods # Carthage -Carthage/Build +Carthage/ +Cartfile.resolved # AppCode specific files .idea/ diff --git a/.gitmodules b/.gitmodules index e88a9f6..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +0,0 @@ -[submodule "Carthage/Checkouts/Result"] - path = Carthage/Checkouts/Result - url = https://github.com/antitypical/Result.git -[submodule "Carthage/Checkouts/Nimble"] - path = Carthage/Checkouts/Nimble - url = https://github.com/Quick/Nimble.git -[submodule "Carthage/Checkouts/Quick"] - path = Carthage/Checkouts/Quick - url = https://github.com/Quick/Quick.git -[submodule "Carthage/Checkouts/Argo"] - path = Carthage/Checkouts/Argo - url = https://github.com/thoughtbot/Argo.git diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index 677768a..0000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,4 +0,0 @@ -github "thoughtbot/Argo" "v3.0.1" -github "Quick/Nimble" "v4.0.1" -github "Quick/Quick" "v0.9.2" -github "antitypical/Result" "2.0.0" diff --git a/Carthage/Checkouts/Argo b/Carthage/Checkouts/Argo deleted file mode 160000 index be127e5..0000000 --- a/Carthage/Checkouts/Argo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit be127e583674ff8e92653c9bbd0328ab55daebc7 diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble deleted file mode 160000 index 0cf1291..0000000 --- a/Carthage/Checkouts/Nimble +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0cf12916a276ba7bc7a66ded95bd8f7e77ca7f6b diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick deleted file mode 160000 index dc2b4b7..0000000 --- a/Carthage/Checkouts/Quick +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dc2b4b75d2f718518acbdef289a72fad77975a8a diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result deleted file mode 160000 index 5dec9cf..0000000 --- a/Carthage/Checkouts/Result +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5dec9cf225d5fa3b0602679fb2638e40191da46b diff --git a/Swish.xcworkspace/contents.xcworkspacedata b/Swish.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 48b4239..0000000 --- a/Swish.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/bin/setup b/bin/setup index b948c6e..08d919d 100755 --- a/bin/setup +++ b/bin/setup @@ -1,4 +1,4 @@ #!/usr/bin/env bash brew install carthage 2> /dev/null -carthage bootstrap --use-submodules --no-build --no-use-binaries +carthage bootstrap --no-build --no-use-binaries diff --git a/bin/update b/bin/update index a408e48..8055648 100755 --- a/bin/update +++ b/bin/update @@ -1,4 +1,4 @@ #!/usr/bin/env bash brew install carthage 2> /dev/null -carthage update --use-submodules --no-build --no-use-binaries +carthage update --no-build --no-use-binaries diff --git a/circle.yml b/circle.yml index 5c7fe38..0f9b32d 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: dependencies: override: - - git submodule update --init --recursive + - bin/setup test: override: