Skip to content

Commit

Permalink
Merge branch 'release/0.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jjochen committed Nov 16, 2017
2 parents cbcffc4 + ba1b67c commit c9405a9
Show file tree
Hide file tree
Showing 56 changed files with 1,283 additions and 1,138 deletions.
30 changes: 30 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
codecov:
branch: develop

coverage:
precision: 2
round: nearest
range: "60...100"

status:
project:
default:
target: auto
threshold: 2.0
branches:
- master
- develop

patch:
default:
target: auto
branches:
- master
- develop

comment:
layout: "header, diff, changes, sunburst, uncovered"
branches:
- master
- develop
behavior: default
105 changes: 88 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,92 @@

# Created by https://www.gitignore.io/api/swift,cocoapods,ruby,fastlane

### CocoaPods ###
## CocoaPods GitIgnore Template

# CocoaPods - Only use to conserve bandwidth / Save time on Pushing
# - Also handy if you have a lage number of dependant pods
# - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGONRE THE LOCK FILE
Pods/

### fastlane ###
# fastlane - A streamlined workflow tool for Cocoa deployment
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

# fastlane specific
fastlane/report.xml

# deliver temporary files
fastlane/Preview.html

# snapshot generated screenshots
fastlane/screenshots/**/*.png
fastlane/screenshots/screenshots.html

# scan temporary files
fastlane/test_output
### Ruby ###
*.gem
*.rbc
/.config
/coverage/
/InstalledFiles
/pkg/
/spec/reports/
/spec/examples.txt
/test/tmp/
/test/version_tmp/
/tmp/

# Used by dotenv library to load environment variables.
# .env

## Specific to RubyMotion:
.dat*
.repl_history
build/
*.bridgesupport
build-iPhoneOS/
build-iPhoneSimulator/

## Specific to RubyMotion (use of CocoaPods):
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# vendor/Pods/

## Documentation cache and generated files:
/.yardoc/
/_yardoc/
/doc/
/rdoc/

## Environment normalization:
/.bundle/
/vendor/bundle
/lib/bundler/man/

# for a library or gem, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# Gemfile.lock
# .ruby-version
# .ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

### Swift ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
Expand Down Expand Up @@ -39,20 +122,9 @@ playground.xcworkspace
# Package.pins
.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts
# CocoaPods - Refactored to standalone file

Carthage/Build
# Carthage - Refactored to standalone file

# fastlane
#
Expand All @@ -61,7 +133,6 @@ Carthage/Build
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output

# End of https://www.gitignore.io/api/swift,cocoapods,ruby,fastlane
32 changes: 21 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,33 @@
language: objective-c
osx_image: xcode9
branches:
only:
- develop
- master
- /^release.*$/
language: objective-c
osx_image: xcode9.1
cache:
- cocoapods
podfile: Example/Podfile
xcode_workspace: Example/FloatingActionButton.xcworkspace
xcode_scheme: FloatingActionButton
xcode_sdk: iphonesimulator
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
install:
- gem install cocoapods
- WORKSPACE="Example/JJFloatingActionButton.xcworkspace"
- SCHEME="JJFloatingActionButton_Example"
- SDK="iphonesimulator11.0"
matrix:
- DESTINATION="OS=11.0,name=iPhone X"
- DESTINATION="OS=10.3.1,name=iPhone 7 Plus"
- DESTINATION="OS=9.3,name=iPhone 6"
cache:
- cocoapods
podfile: Example/Podfile
before_install:
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
- pod install --repo-update --project-directory=Example
script:
- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/FloatingActionButton.xcworkspace -scheme FloatingActionButton -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone X,OS=11.1' ONLY_ACTIVE_ARCH=NO | xcpretty
- set -o pipefail
- xcodebuild -version
- xcodebuild -showsdks
- xcodebuild test -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug -enableCodeCoverage YES ONLY_ACTIVE_ARCH=YES ENABLE_TESTABILITY=YES CODE_SIGNING_REQUIRED=NO
- pod lib lint

after_success:
- bash <(curl -s https://codecov.io/bash) -J 'JJFloatingActionButton'
Loading

0 comments on commit c9405a9

Please sign in to comment.