diff --git a/.buildkite/pipeline.template.yml b/.ci/buildkite/pipeline.template.yml similarity index 56% rename from .buildkite/pipeline.template.yml rename to .ci/buildkite/pipeline.template.yml index 4ff8a2e..e7d0b9e 100755 --- a/.buildkite/pipeline.template.yml +++ b/.ci/buildkite/pipeline.template.yml @@ -1,23 +1,18 @@ steps: - - - name: ":bundler: Update Bundler" - command: .scripts/update-bundler.sh - agents: - name: "$BUILDKITE_AGENT_META_DATA_NAME" - name: ":fastlane: Test Mac OS X" - command: .scripts/test-osx.sh + command: .ci/scripts/test-osx agents: name: "$BUILDKITE_AGENT_META_DATA_NAME" - name: ":fastlane: Test iOS" - command: .scripts/test-ios.sh + command: .ci/scripts/test-ios agents: name: "$BUILDKITE_AGENT_META_DATA_NAME" - type: "waiter" - name: ":codecov: Send Coverage" - command: .scripts/send-coverage.sh + command: .ci/scripts/send-coverage agents: name: "$BUILDKITE_AGENT_META_DATA_NAME" diff --git a/.buildkite/pipeline.sh b/.ci/buildkite/upload similarity index 74% rename from .buildkite/pipeline.sh rename to .ci/buildkite/upload index d574f2a..508329a 100755 --- a/.buildkite/pipeline.sh +++ b/.ci/buildkite/upload @@ -3,4 +3,4 @@ set -eu # Makes sure all the steps run on this same agent -sed "s/\$BUILDKITE_AGENT_META_DATA_NAME/$BUILDKITE_AGENT_META_DATA_NAME/" .buildkite/pipeline.template.yml +sed "s/\$BUILDKITE_AGENT_META_DATA_NAME/$BUILDKITE_AGENT_META_DATA_NAME/" .ci/buildkite/pipeline.template.yml diff --git a/.scripts/send-coverage.sh b/.ci/scripts/send-coverage similarity index 100% rename from .scripts/send-coverage.sh rename to .ci/scripts/send-coverage diff --git a/.scripts/test-ios.sh b/.ci/scripts/test-ios similarity index 100% rename from .scripts/test-ios.sh rename to .ci/scripts/test-ios diff --git a/.scripts/test-osx.sh b/.ci/scripts/test-osx similarity index 100% rename from .scripts/test-osx.sh rename to .ci/scripts/test-osx diff --git a/.ci/xcodebuild-data/.gitkeep b/.ci/xcodebuild-data/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.fastlane/Fastfile b/.fastlane/Fastfile index bb5a153..ea124fc 100644 --- a/.fastlane/Fastfile +++ b/.fastlane/Fastfile @@ -4,11 +4,13 @@ platform :ios do desc "Runs all the tests" lane :test do - xctest scheme: 'ValueCoding-iOS', - sdk: 'iphonesimulator', - destination: 'platform=iOS Simulator,name=iPhone 6,OS=9.1', - destination_timeout: 120, - derivedDataPath: '.fastlane/xcodebuild-data' + + scan( + scheme: "ValueCoding-iOS", + output_directory: ".ci/xcodebuild-data/", + xcargs: "-derivedDataPath .ci/xcodebuild-data/" + ) + end end @@ -17,10 +19,13 @@ platform :mac do desc "Runs all the tests" lane :test do - xctest scheme: 'ValueCoding-OSX', - sdk: 'macosx', - destination: 'platform=OS X', - derivedDataPath: '.fastlane/xcodebuild-data' + + scan( + scheme: "ValueCoding-OSX", + output_directory: ".ci/xcodebuild-data/", + xcargs: "-derivedDataPath .ci/xcodebuild-data/" + ) + end end diff --git a/.scripts/update-bundler.sh b/.scripts/update-bundler.sh deleted file mode 100755 index a3c36a2..0000000 --- a/.scripts/update-bundler.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -source /usr/local/opt/chruby/share/chruby/chruby.sh -chruby ruby -bundle update && fastlane enable_crash_reporting diff --git a/Gemfile.lock b/Gemfile.lock index 37332e7..cca8e3a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.4) + activesupport (4.2.5) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -12,39 +12,25 @@ GEM addressable (>= 2.3.1) extlib (>= 0.9.15) multi_json (>= 1.0.0) - aws-sdk (1.66.0) - aws-sdk-v1 (= 1.66.0) - aws-sdk-v1 (1.66.0) - json (~> 1.4) - nokogiri (>= 1.4.4) babosa (1.0.2) - capybara (2.4.4) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - cert (1.0.0) + cert (1.2.3) fastlane_core (>= 0.19.0, < 1.0.0) spaceship (>= 0.6.0) claide (0.9.1) - cliver (0.3.2) coderay (1.1.0) colored (1.2) commander (4.3.5) highline (~> 1.7.2) - credentials_manager (0.10.0) + credentials_manager (0.11.0) colored highline (>= 1.7.1) security - deliver (1.3.3) + deliver (1.5.1) credentials_manager (>= 0.9.0) fastimage (~> 1.6.3) fastlane_core (>= 0.19.0, < 1.0.0) plist (~> 3.1.0) - spaceship (>= 0.11.4, <= 1.0.0) - domain_name (0.5.25) - unf (>= 0.0.5, < 1.0.0) + spaceship (>= 0.14.0, <= 1.0.0) dotenv (2.0.2) excon (0.45.4) extlib (0.9.16) @@ -54,49 +40,44 @@ GEM faraday (>= 0.7.4, < 0.10) fastimage (1.6.8) addressable (~> 2.3, >= 2.3.5) - fastlane (1.35.0) + fastlane (1.41.1) addressable (~> 2.3.8) - cert (>= 1.0.0, < 2.0.0) + cert (>= 1.2.3, < 2.0.0) credentials_manager (>= 0.10.0, < 1.0.0) - deliver (>= 1.3.3, < 2.0.0) - fastlane_core (>= 0.25.3, < 1.0.0) - frameit (>= 2.2.1, < 3.0.0) - gym (>= 1.0.0, < 2.0.0) - krausefx-shenzhen (>= 0.14.5) - nokogiri (~> 1.6) - pbxplorer (~> 1.0.0) - pem (>= 1.0.0, < 2.0.0) - pilot (>= 1.0.0, < 2.0.0) + deliver (>= 1.5.1, < 2.0.0) + fastlane_core (>= 0.26.3, < 1.0.0) + frameit (>= 2.3.0, < 3.0.0) + gym (>= 1.1.5, < 2.0.0) + krausefx-shenzhen (>= 0.14.6) + pem (>= 1.0.1, < 2.0.0) + pilot (>= 1.0.1, < 2.0.0) plist (~> 3.1.0) produce (>= 1.0.0, < 2.0.0) - rest-client (~> 1.8.0) - scan (>= 0.1.2, < 1.0.0) - sigh (>= 1.1.0, < 2.0.0) + scan (>= 0.3.0, < 1.0.0) + sigh (>= 1.1.3, < 2.0.0) slack-notifier (~> 1.3) - snapshot (>= 1.0.2, < 2.0.0) - spaceship (>= 0.12.2, < 1.0.0) - supply (>= 0.1.0, < 1.0.0) + snapshot (>= 1.1.1, < 2.0.0) + spaceship (>= 0.14.2, < 1.0.0) + supply (>= 0.2.1, < 1.0.0) terminal-notifier (~> 1.6.2) terminal-table (~> 1.4.5) + xcode-install (~> 1.0.1) xcodeproj (>= 0.20, < 1.0.0) - xcpretty (>= 0.1.11) - fastlane_core (0.25.3) + xcpretty (>= 0.2.1) + fastlane_core (0.26.6) babosa - capybara (~> 2.4.3) colored commander (>= 4.3.5) - credentials_manager (>= 0.8.2, < 1.0.0) + credentials_manager (>= 0.11.0, < 1.0.0) excon (~> 0.45.0) highline (>= 1.7.2) json multi_json - phantomjs (~> 1.9.8) plist (~> 3.1) - poltergeist (~> 1.5.1) rubyzip (~> 1.1.6) sentry-raven (~> 0.15) terminal-table (~> 1.4.5) - frameit (2.2.1) + frameit (2.4.0) deliver (> 0.3) fastimage (~> 1.6.3) fastlane_core (>= 0.16.0, < 1.0.0) @@ -119,20 +100,17 @@ GEM memoist (~> 0.12) multi_json (~> 1.11) signet (~> 0.6) - gym (1.1.0) + gym (1.1.6) fastlane_core (>= 0.25.0, < 1.0.0) plist rubyzip (>= 1.1.7) terminal-table - xcpretty (~> 0.1) + xcpretty (>= 0.2.1) highline (1.7.8) - http-cookie (1.0.2) - domain_name (~> 0.5) i18n (0.7.0) json (1.8.3) - jwt (1.5.1) - krausefx-shenzhen (0.14.5) - aws-sdk (~> 1.0) + jwt (1.5.2) + krausefx-shenzhen (0.14.6) commander (~> 4.3) dotenv (>= 0.7) faraday (~> 0.9) @@ -150,37 +128,25 @@ GEM logging (2.0.0) little-plugger (~> 1.1) multi_json (~> 1.10) - memoist (0.12.0) + memoist (0.13.0) method_source (0.8.2) - mime-types (2.6.2) mini_magick (4.0.4) - mini_portile (0.6.2) - minitest (5.8.2) + minitest (5.8.3) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) net-sftp (2.1.2) net-ssh (>= 2.6.5) net-ssh (3.0.1) - netrc (0.10.3) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - pbxplorer (1.0.0) - pem (1.0.0) + pem (1.0.1) fastlane_core (>= 0.21.0, < 1.0.0) spaceship (>= 0.12.0, < 1.0.0) - phantomjs (1.9.8.0) - pilot (1.0.0) + pilot (1.0.1) credentials_manager (>= 0.3.0) fastlane_core (>= 0.16.1, < 1.0.0) - spaceship (>= 0.12.0, < 1.0.0) + spaceship (>= 0.14.0, < 1.0.0) terminal-table (~> 1.4.5) plist (3.1.0) - poltergeist (1.5.1) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) produce (1.0.0) fastlane_core (>= 0.22.3, < 1.0.0) spaceship (>= 0.12.0) @@ -188,25 +154,19 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - rack (1.6.4) - rack-test (0.6.3) - rack (>= 1.0) - rest-client (1.8.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) retriable (1.4.1) + rouge (1.10.1) rubyzip (1.1.7) - scan (0.1.2) - fastlane_core (>= 0.25.3, < 1.0.0) + scan (0.3.2) + fastlane_core (>= 0.26.6, < 1.0.0) slack-notifier (~> 1.3) terminal-table - xcpretty (~> 0.1.12) - xcpretty-travis-formatter (~> 0.0.3) + xcpretty (>= 0.2.1) + xcpretty-travis-formatter (>= 0.0.3) security (0.1.3) sentry-raven (0.15.2) faraday (>= 0.7.6) - sigh (1.1.0) + sigh (1.1.3) fastlane_core (>= 0.19.0, < 1.0.0) plist (~> 3.1) spaceship (>= 0.12.3) @@ -218,12 +178,12 @@ GEM multi_json (~> 1.10) slack-notifier (1.4.0) slop (3.6.0) - snapshot (1.0.3) + snapshot (1.2.1) fastimage (~> 1.6.3) fastlane_core (>= 0.21.0, < 1.0.0) plist (~> 3.1.0) - xcpretty - spaceship (0.12.3) + xcpretty (>= 0.2.1) + spaceship (0.14.2) colored credentials_manager (>= 0.9.0) faraday (~> 0.9) @@ -232,8 +192,8 @@ GEM multi_xml (~> 0.5) plist (~> 3.1) pry - supply (0.1.0) - credentials_manager (>= 0.8.2) + supply (0.2.2) + credentials_manager (>= 0.10.0) fastlane_core (>= 0.19.0) google-api-client (~> 0.8.6) terminal-notifier (1.6.3) @@ -241,21 +201,17 @@ GEM thread_safe (0.3.5) tzinfo (1.2.2) thread_safe (~> 0.1) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.1) - websocket-driver (0.6.2) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + xcode-install (1.0.1) + claide (~> 0.9.1) + spaceship (>= 0.13.0, < 1.0.0) xcodeproj (0.28.2) activesupport (>= 3) claide (~> 0.9.1) colored (~> 1.2) - xcpretty (0.1.12) - xcpretty-travis-formatter (0.0.3) - xcpretty (~> 0.1, >= 0.0.7) - xpath (2.0.0) - nokogiri (~> 1.3) + xcpretty (0.2.1) + rouge (~> 1.8) + xcpretty-travis-formatter (0.0.4) + xcpretty (~> 0.2, >= 0.0.7) PLATFORMS ruby