Skip to content

Commit

Permalink
Merge branch 'release/0.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
bcylin committed Sep 20, 2016
2 parents 4fbb9a1 + daf7623 commit 5bd27ef
Show file tree
Hide file tree
Showing 49 changed files with 783 additions and 140 deletions.
12 changes: 12 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
coverage:
ignore:
- Carthage/*
- Example/*
- QuickTableViewControllerTests/*
- Pods/*
status:
project:
default:
enabled: yes
target: 80%
threshold: 3%
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ xcuserdata
*.moved-aside
*.xcuserstate
*.xcscmblueprint
test_output
docs

## Obj-C/Swift specific
*.hmap
Expand Down
11 changes: 11 additions & 0 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
clean: true
author: bcylin
author_url: https://github.com/bcylin
github_url: https://github.com/bcylin/QuickTableViewController
github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/develop
xcodebuild_arguments: [-scheme, QuickTableViewController-iOS]
module: QuickTableViewController
module_version: 0.3.0
swift_version: 2.2
output: docs/output
theme: fullwidth
11 changes: 11 additions & 0 deletions .slather.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
coverage_service: cobertura_xml
workspace: QuickTableViewController.xcworkspace
xcodeproj: QuickTableViewController.xcodeproj
scheme: QuickTableViewController-iOS
source_directory: Source
output_directory: test_output/xml_report
ignore:
- Carthage/*
- Example/*
- QuickTableViewControllerTests/*
- Pods/*
1 change: 1 addition & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ disabled_rules:
- cyclomatic_complexity
- force_cast
- function_body_length
- valid_docs
included:
- Example
- QuickTableViewControllerTests
Expand Down
19 changes: 14 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,32 @@
language: objective-c
osx_image: xcode7.3
osx_image: xcode8
matrix:
include:
- env: SCHEME=Example
- env: SCHEME=QuickTableViewController-iOS
before_script:
- bundle exec danger
cache:
bundler: true
directories:
- vendor/bundle
- Pods
before_install:
- export LANG=en_US.UTF-8
- brew update
- brew tap homebrew/bundle
- brew bundle
install:
- bundle install --without development --deployment --jobs=3 --retry=3
- bundle exec pod install --no-repo-update
- carthage bootstrap --no-use-binaries --platform ios
- bundle exec pod repo update
- bundle exec pod install
script:
- set -o pipefail && xcodebuild -project QuickTableViewController.xcodeproj -scheme QuickTableViewController-iOS -sdk iphonesimulator -destination "name=iPhone 6,OS=latest" -enableCodeCoverage YES clean test GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
- xctool -workspace QuickTableViewController.xcworkspace -scheme Example -sdk iphonesimulator clean build
- bundle exec scan --scheme $SCHEME
after_success:
- bash <(curl -s https://codecov.io/bash)
- make coverage
notifications:
email: false
slack:
rooms:
secure: OBqhJVYItWtvqHFhgpGm0aJBzfiBQpCbP/Ak0/2OH9HZNA0jAWGEFcipdzpsHCSNpDHlsSC2lq8CD+Py1rgQDfG/pgoVSY9Da+OLwXHoSaEA61qQMkAmXFEv5KfMcCXG+L4L5vatIVo3BvKbTWifGfNY4ZgcqGRK6n+emiJLGhkdDvdj8TX+jJ3TbRE7uUCpwjh6tuj0icvz65ve7kRSBTKrMOynxZGpjZ+Ur0gUnilJIV8k8/jdTg0oxzk1BueYsOw3aV33R59Jn8Dwm4IhLFlzkdW8LxfXGbOSV9bvxYSV8ZzD+PecwpSc3j92eZZomLgLLCyOT/ato2X454asMhyE+drtu3dlY6NTiKXuVQYAZ0Zm1kreHwSdUyupO1L8LplHNzF2BIDWqOdr+EtsAsHbQpilA2O/KjDnLiD6EQsWbzi0/Y3Nqeo3adAd+q2LWJAHvdRPcrYJuuC2lE/KW+lnzL4NhCOht95vTnnbCzTsmnPBLzTIYen3DRcu4/jQ/jzhy/qCgdexUIwmam73iGPeH4CVdnyfTV0YIQuJOi2bbllSWm0qIxAJ7P9UGIKCI9nCE5TfmmUP60SW6hm7o4UE1xOfyLaPEf9v9/CZ92EHecStftBbK+wsTrJqy4NmZlRVSw9nsR26mqOm2R9wf5oWxKaMMQTD8dSQ0F293n8=
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Change Log

## Next Release

## v0.4.0

#### Changes

* Swift 2.3
* CocoaPods 1.1.0.rc.2
* Improved documentation
* Run tests with fastlane scan
* Integrate with [danger.systems](https://github.com/danger/danger)
* Make the images of `Icon` readonly

## v0.3.0

#### Changes
Expand Down
25 changes: 25 additions & 0 deletions Dangerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/usr/bin/env ruby

# Sometimes it's a README fix, or something like that - which isn't relevant for
# including in a project's CHANGELOG for example
declared_trivial = pr_title.include? "#trivial"

# Make it more obvious that a PR is a work in progress and shouldn't be merged yet
warn("PR is classed as Work in Progress") if pr_title.include? "[WIP]"

# Warn when there is a big PR
warn("Big PR") if lines_of_code > 500

# Don't let testing shortcuts get into master by accident
fail("fdescribe left in tests") if `grep -r fdescribe specs/`.length > 1
fail("fit left in tests") if `grep -r "fit specs/ `.length > 1

# Add a CHANGELOG entry for app changes
if git.lines_of_code > 50 && !github.modified_files.include?("CHANGELOG.md") && !declared_trivial
fail("Please include a CHANGELOG entry. \nYou can find it at [CHANGELOG.md](https://github.com/bcylin/QuickTableViewController/blob/develop/CHANGELOG.md).")
end

# Ensure a clean commits history
if git.commits.any? { |c| c.message =~ /^Merge branch '#{github.branch_for_base}'/ }
fail('Please rebase to get rid of the merge commits in this PR')
end
Loading

0 comments on commit 5bd27ef

Please sign in to comment.