diff --git a/.gitignore b/.gitignore index 401e4287..a6f72832 100644 --- a/.gitignore +++ b/.gitignore @@ -43,7 +43,7 @@ ocunit.xml *.xcbkptlist *.xcsettings -Examples/vendor/bundle/ +vendor/bundle/ .bundle/ Pods/ .build/ diff --git a/Examples/Gemfile b/Gemfile similarity index 100% rename from Examples/Gemfile rename to Gemfile diff --git a/Examples/Gemfile.lock b/Gemfile.lock similarity index 100% rename from Examples/Gemfile.lock rename to Gemfile.lock diff --git a/scripts/bootstrap b/scripts/bootstrap index 8525e5eb..7ca708cb 100755 --- a/scripts/bootstrap +++ b/scripts/bootstrap @@ -9,8 +9,9 @@ if ! command -v bundle > /dev/null; then exit 1 fi -cd "$(dirname "$0")/../Examples" +bundle config set path --local 'vendor/bundle' +bundle install + +cd "Examples" -bundle config set path 'vendor/bundle' -bundle install bundle exec pod install diff --git a/scripts/lint b/scripts/lint index c1bcd1ce..275a2a0a 100755 --- a/scripts/lint +++ b/scripts/lint @@ -1,12 +1,24 @@ #!/usr/bin/env sh +set -eu +set -o pipefail + +printf 'linting CocoaPods\n' + +if ! command -v bundle > /dev/null; then + printf 'bundler is not installed.\n' + printf 'install with $ gem install bundler\n' + exit 1 +fi + +bundle exec pod lib lint + +printf 'linting Carthage\n' + if ! command -v carthage > /dev/null; then printf 'Carthage is not installed.\n' printf 'See https://github.com/Carthage/Carthage for install instructions.\n' exit 1 fi - carthage build --platform iOS --no-use-binaries --no-skip-current - -pod lib lint