From f2e6bbc25904b5f0ab2f3e3fca0553e4cb393c58 Mon Sep 17 00:00:00 2001
From: jasonhawkins <hellojason@me.com>
Date: Mon, 27 Aug 2018 16:14:06 -0400
Subject: [PATCH 1/3] Add new CircleCI config

---
 .circleci/config.yml | 50 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..1aa23494
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,50 @@
+version: 2
+
+jobs:
+  build-and-test:
+    environment:
+      BUNDLE_PATH: vendor/bundle
+      FL_OUTPUT_DIR: output
+    macos:
+      xcode: "9.4.1"
+    working_directory: ~/VimeoUpload
+    shell: /bin/bash --login -o pipefail
+    
+    steps:
+      - checkout
+      
+      - restore_cache:
+          key: v1-gems-{{ checksum "Gemfile.lock" }}
+
+      - run: 
+          name: Set Ruby version
+          command: echo "ruby-2.4" > ~/.ruby-version
+
+      - run: 
+          name: Install bundler dependencies
+          command: bundle install --path vendor/bundle
+
+      - run: 
+          name: Build and run iOS tests
+          command: bundle exec fastlane scan
+          environment:
+            SCAN_DEVICE: iPhone 8
+            SCAN_SCHEME: VimeoUpload-iOS
+
+      - save_cache:
+          paths:
+            - vendor/bundle
+          key: v1-gems-{{ checksum "Gemfile.lock" }}
+
+      - store_artifacts:
+          path: output
+
+      - store_test_results:
+          path: output/scan
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - build-and-test
+      
\ No newline at end of file

From 57061065ce8561f44aed5b3a4e93873e70a0fd60 Mon Sep 17 00:00:00 2001
From: jasonhawkins <hellojason@me.com>
Date: Mon, 27 Aug 2018 16:14:17 -0400
Subject: [PATCH 2/3] Remove old CircleCI config

---
 circle.yml | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 circle.yml

diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index b63bcce9..00000000
--- a/circle.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-machine:
-  xcode:
-    version: 9.0.1
-
-dependencies:
-    override:
-        - bundle install --deployment
-    cache_directories:
-        - "vendor/bundle"
-
-test:
-  override:
-    - FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane test

From 4140a41a5e0d1d095729fd800ad979e048cf5f85 Mon Sep 17 00:00:00 2001
From: jasonhawkins <hellojason@me.com>
Date: Mon, 27 Aug 2018 16:27:55 -0400
Subject: [PATCH 3/3] Add OldUpload scheme to build-and-run job

---
 .circleci/config.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1aa23494..db6fc036 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,12 +25,19 @@ jobs:
           command: bundle install --path vendor/bundle
 
       - run: 
-          name: Build and run iOS tests
+          name: Build and run VimeoUpload-iOS tests
           command: bundle exec fastlane scan
           environment:
             SCAN_DEVICE: iPhone 8
             SCAN_SCHEME: VimeoUpload-iOS
 
+      - run: 
+          name: Build and run VimeoUpload-iOS-OldUpload tests
+          command: bundle exec fastlane scan
+          environment:
+            SCAN_DEVICE: iPhone 8
+            SCAN_SCHEME: VimeoUpload-iOS-OldUpload
+
       - save_cache:
           paths:
             - vendor/bundle