Skip to content
This repository has been archived by the owner on Jun 11, 2018. It is now read-only.

Commit

Permalink
Merge branch 'release/1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
danthorpe committed Mar 22, 2016
2 parents 5d1cc86 + bb238fe commit ac08b3a
Show file tree
Hide file tree
Showing 18 changed files with 230 additions and 130 deletions.
5 changes: 4 additions & 1 deletion .ci/buildkite/pipeline.template.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
steps:
-
name: ":muscle: Lint"
command: .ci/scripts/lint
-
name: ":fastlane: Test Mac OS X"
command: .ci/scripts/test-osx
Expand All @@ -12,7 +15,7 @@ steps:
-
type: "waiter"
-
name: ":codecov: Send Coverage"
name: ":muscle: Send Coverage"
command: .ci/scripts/send-coverage
agents:
name: "$BUILDKITE_AGENT_META_DATA_NAME"
4 changes: 4 additions & 0 deletions .ci/scripts/lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
source /usr/local/opt/chruby/share/chruby/chruby.sh
chruby ruby
bundle exec fastlane lint
4 changes: 3 additions & 1 deletion .ci/scripts/send-coverage
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
#!/usr/bin/env bash
bash <(curl -s https://codecov.io/bash) -D .fastlane/xcodebuild-data
source /usr/local/opt/chruby/share/chruby/chruby.sh
chruby ruby
bundle exec slather coverage --scheme "ValueCoding-iOS" --buildkite --coveralls --build-directory .ci/xcodebuild-data
9 changes: 8 additions & 1 deletion .fastlane/Fastfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
default_platform :ios
lane :lint do

swiftLint(
mode: :lint,
config_file: '.swiftlint.yml'
)
end


platform :ios do

Expand Down
4 changes: 2 additions & 2 deletions .jazzy.yaml → .jazzy.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
author_name: Daniel Thorpe
author_url: http://danthorpe.me
module_name: ValueCoding
module_version: 1.2.0
module_version: 1.3.0
github_url: https://github.com/danthorpe/ValueCoding
readme: README.md
podspec: ValueCoding.podspec

swift_version: 2.1.1
swift_version: 2.2
xcodebuild-arguments: -scheme,ValueCoding-iOS

custom_categories:
Expand Down
6 changes: 6 additions & 0 deletions .slather.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
coverage_service: coveralls
xcodeproj: ValueCoding.xcodeproj
build_directory: .ci/xcodebuild-data
ignore:
- Tests/*
- Supporting Files/*
3 changes: 3 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
disabled_rules:
- line_length

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 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. :)

# 1.2.0
1. [[VCD-9, VCD-10](https://github.com/danthorpe/ValueCoding/pull/10)]: Adds support for a single level of nesting inside SequenceType values. For example it is now possible to encode and decode `[[Foo]]` structures where `Foo` conforms to `ValueCoding`.

Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
source 'https://rubygems.org'

gem 'slather'
gem 'scan'
gem 'fastlane', '>= 1.35'
gem 'xcpretty'
Loading

0 comments on commit ac08b3a

Please sign in to comment.