Release Candidate: 1.4.0

.ci/buildkite/pipeline.template.yml

@@ -1,21 +1,23 @@
 steps:
   -
-    name: ":muscle: Lint"
+    name: "Lint"
     command: .ci/scripts/lint
+    agents:
+      iOS-Simulator: false       
+      swift: "$BUILDKITE_AGENT_META_DATA_SWIFT"
+
   -
-    name: ":fastlane: Test Mac OS X"
+    name: "Mac"
     command: .ci/scripts/test-osx
     agents:
-      name: "$BUILDKITE_AGENT_META_DATA_NAME"
+      iOS-Simulator: false       
+      swift: "$BUILDKITE_AGENT_META_DATA_SWIFT"
   -
-    name: ":fastlane: Test iOS"
+    name: "iOS"
     command: .ci/scripts/test-ios
     agents:
-      name: "$BUILDKITE_AGENT_META_DATA_NAME"
-  -
-    type: "waiter"
-  -
-    name: ":muscle: Send Coverage"
-    command: .ci/scripts/send-coverage
-    agents:
-      name: "$BUILDKITE_AGENT_META_DATA_NAME"
+      iOS-Simulator: true
+      swift: "$BUILDKITE_AGENT_META_DATA_SWIFT"
+    env:
+      FL_SLATHER_BUILDKITE_ENABLED: true
+      FL_SLATHER_COVERALLS_ENABLED: true

.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/\$BUILDKITE_AGENT_META_DATA_SWIFT/$BUILDKITE_AGENT_META_DATA_SWIFT/" .ci/buildkite/pipeline.template.yml

.ci/scripts/lint

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 source /usr/local/opt/chruby/share/chruby/chruby.sh
 chruby ruby
-bundle exec fastlane lint
+bundle install --quiet && bundle exec fastlane lint

.ci/scripts/test-ios

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 source /usr/local/opt/chruby/share/chruby/chruby.sh
 chruby ruby
-bundle exec fastlane ios test
+bundle install --quiet && bundle exec fastlane ios test
 

.ci/scripts/test-osx

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 source /usr/local/opt/chruby/share/chruby/chruby.sh
 chruby ruby
-bundle exec fastlane mac test
+bundle install --quiet && bundle exec fastlane mac test

.codecov.yml

@@ -0,0 +1,7 @@
+comment:
+  layout: header, changes, diff
+coverage:
+  ignore:
+  - Tests/.*
+  status:
+    patch: false

.fastlane/Fastfile

@@ -9,30 +9,29 @@ end
 
 platform :ios do
 
-  desc "Runs all the tests"
-  lane :test do
+	desc "Runs all the tests"
+	lane :test do
 
-    scan(
-      scheme: "ValueCoding-iOS",
-      output_directory: ".ci/xcodebuild-data/",
-      xcargs: "-derivedDataPath .ci/xcodebuild-data/"
-    )
-
-  end
-
+    	scan(
+    		project: "ValueCoding.xcodeproj",
+			scheme: "ValueCoding",
+      		destination: "platform=iOS Simulator,OS=9.3,name=iPhone 6s",
+      		code_coverage: true
+	    )
+
+	end
 end
 
 platform :mac do
 
-  desc "Runs all the tests"
-  lane :test do
+	desc "Runs all the tests"
+	lane :test do
 
-    scan(
-      scheme: "ValueCoding-OSX",
-      output_directory: ".ci/xcodebuild-data/",
-      xcargs: "-derivedDataPath .ci/xcodebuild-data/"
-    )
+    	scan(
+    		project: "ValueCoding.xcodeproj",
+			scheme: "ValueCoding",
+			device: "My Mac"
+	    )
 
-  end
-
+	end
 end

.jazzy.json

@@ -0,0 +1,14 @@
+{
+	"author": "Daniel Thorpe",
+	"author_url": "http://danthorpe.me",
+	"github_url": "https://github.com/danthorpe/ValueCoding",
+	"module": "ValueCoding",
+	"module_version": "1.4.0",
+	"readme": "README.md",
+	"swift_version": "2.2",	
+	"xcodebuild_arguments": [
+		"-project", "ValueCoding.xcodeproj", 
+		"-scheme", "ValueCoding"
+	],
+	"exclude": ["Tests"]
+}

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.4.0
+1. [[VCD-19](https://github.com/danthorpe/ValueCoding/pull/19)]: Recreates the project to use a single multi-platform framework target.
+
 # 1.3.0
 1. [[VCD-13](https://github.com/danthorpe/ValueCoding/pull/13)]: Switches test coverage reporting to Coveralls. Also adds SwiftLint rules into the project and CI.
 2. [[VCD-14](https://github.com/danthorpe/ValueCoding/pull/14)]: Updates to Swift 2.2 syntax. :)