Swift 2.3

.ci/buildkite/pipeline.template.yml

@@ -1,11 +1,18 @@
 steps:
   -
-    name: ":fastlane: Test Mac OS X"
-    command: .ci/scripts/test-osx
+    name: "macOS"
+    command: "source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby ruby && bundle install --quiet && bundle exec fastlane test_mac"
     agents:
-      name: "$BUILDKITE_AGENT_META_DATA_NAME"
+      xcode: "$XCODE"
   -
-    name: ":fastlane: Test iOS"
-    command: .ci/scripts/test-ios
+    name: "iOS"
+    command: "source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby ruby && bundle install --quiet && bundle exec fastlane test_ios"
     agents:
-      name: "$BUILDKITE_AGENT_META_DATA_NAME"
+      iOS-Simulator: true
+      xcode: "$XCODE"
+  -
+    name: "tvOS"
+    command: "source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby ruby && bundle install --quiet && bundle exec fastlane test_tvos"
+    agents:
+      iOS-Simulator: true
+      xcode: "$XCODE"

.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/" .ci/buildkite/pipeline.template.yml
+sed "s/\$XCODE/$BUILDKITE_AGENT_META_DATA_XCODE/;s/\$COMMIT/$BUILDKITE_COMMIT/" .ci/buildkite/pipeline.template.yml

.fastlane/Fastfile

@@ -1,37 +1,14 @@
-platform :ios do
-
-  desc "Runs all the tests"
-  lane :test do
-
-    carthage(
-      platform: "iOS"
-    )
-
-    scan(
-      scheme: "Money-iOS",
-      output_directory: ".ci/xcodebuild-data/",
-      xcargs: "-derivedDataPath .ci/xcodebuild-data/"
-    )
-
-  end
-
+lane :test_ios do
+	carthage(platform: "iOS")
+	scan(scheme: "Money", destination: "platform=iOS Simulator,OS=10.0,name=iPhone 6s")	  
 end
 
-platform :mac do
-
-  desc "Runs all the tests"
-  lane :test do
-
-    carthage(
-      platform: "Mac"
-    )    
+lane :test_mac do
+	carthage(platform: "Mac")
+	scan(scheme: "Money", destination: "platform=macOS")	  
+end
 
-    scan(
-      scheme: "Money-OSX",
-      output_directory: ".ci/xcodebuild-data/",
-      xcargs: "-derivedDataPath .ci/xcodebuild-data/"
-    )
-
-  end
-
+lane :test_tvos do
+	carthage(platform: "tvOS")
+	scan(scheme: "Money", destination: "platform=tvOS Simulator,OS=10.0,name=Apple TV 1080p")
 end

Cartfile

@@ -1 +1 @@
-github "danthorpe/ValueCoding"
+github "danthorpe/ValueCoding" "1.5.0"

Cartfile.resolved

@@ -1 +1 @@
-github "danthorpe/ValueCoding" "1.3.0"
+github "danthorpe/ValueCoding" "1.5.0"