diff --git a/.travis.yml b/.travis.yml index cbe59f9..a88a657 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: - LANGUAGE=en_US.UTF-8 install: - - bundle install + - script/bootstrap script: - script/build diff --git a/script/bootstrap b/script/bootstrap index 9548df3..d003d9b 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -2,33 +2,9 @@ main() { bundle install - bundle exec seed install + bundle exec pod install script/sort - - echo "==> Removing CocoaSeed imports" - remove_seed_imports -} - -remove_seed_imports() { - pushd Seeds/ > /dev/null - # Build a list of the seeded modules - MODULES=( ) - for i in */; do - MODULES+=(${i%%/}) - done - - # Construct a pattern for module imports to remove - local pattern - pattern="/import ($(join "|" "${MODULES[@]}"))/d" - - find . -name "*.swift" -type f -exec sed -E -i '' "${pattern}" {} \; - popd > /dev/null -} - -join() { - local IFS="$1"; shift - echo "$*" } main diff --git a/script/build b/script/build index d33e292..1cb6db4 100755 --- a/script/build +++ b/script/build @@ -12,7 +12,7 @@ main() { build() { set -o pipefail && \ - xcodebuild -project "mas-cli.xcodeproj" \ + xcodebuild -workspace "mas-cli.xcworkspace" \ -scheme "mas-cli Release" \ -configuration Release \ clean build \ @@ -21,7 +21,7 @@ build() { archive() { set -o pipefail && \ - xcodebuild -project "mas-cli.xcodeproj" \ + xcodebuild -workspace "mas-cli.xcworkspace" \ -scheme "mas-cli Release" \ -archivePath mas.xcarchive \ archive \