Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ build/
Pods

# Carthage
Carthage/Build
Carthage/
Cartfile.resolved
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should be ignoring this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm uncertain myself, but thought it probably made sense to ignore it for the same reason you ignore Gemfile.lock when writing a rubygem.


# AppCode specific files
.idea/
Expand Down
12 changes: 0 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
4 changes: 0 additions & 4 deletions Cartfile.resolved

This file was deleted.

1 change: 0 additions & 1 deletion Carthage/Checkouts/Argo
Submodule Argo deleted from be127e
1 change: 0 additions & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble deleted from 0cf129
1 change: 0 additions & 1 deletion Carthage/Checkouts/Quick
Submodule Quick deleted from dc2b4b
1 change: 0 additions & 1 deletion Carthage/Checkouts/Result
Submodule Result deleted from 5dec9c
19 changes: 0 additions & 19 deletions Swish.xcworkspace/contents.xcworkspacedata

This file was deleted.

2 changes: 1 addition & 1 deletion bin/setup
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion bin/update
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ machine:

dependencies:
override:
- git submodule update --init --recursive
- bin/setup

test:
override:
Expand Down