Skip to content

Commit

Permalink
Merge branch 'prototype'
Browse files Browse the repository at this point in the history
  • Loading branch information
joejcon1 committed Oct 9, 2016
2 parents d22038f + 4db55c5 commit 8450151
Show file tree
Hide file tree
Showing 19 changed files with 1,472 additions and 26 deletions.
33 changes: 7 additions & 26 deletions .gitignore
@@ -1,6 +1,8 @@
# Created by https://www.gitignore.io/api/swift

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

## Build generated
build/
Expand Down Expand Up @@ -33,33 +35,12 @@ playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
.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

Carthage/Checkouts
Carthage/Build

# fastlane
#
# 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://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
*_failed_*
Generated.swift
.DS_Store
32 changes: 32 additions & 0 deletions .swiftlint.yml
@@ -0,0 +1,32 @@
disabled_rules: # rule identifiers to exclude from running
- function_body_length
- leading_whitespace
- line_length
- return_arrow_whitespace
- trailing_newline
- trailing_whitespace
- type_name
- valid_docs
- variable_name
- nesting
- file_length

# Find all the available rules by running:
# swiftlint rules
included: # paths to include during linting. `--path` is ignored if present.
# - Source
excluded: # paths to ignore during linting. Takes precedence over `included`.
- Carthage
- Pods
- Source/ExcludedFolder
- Source/ExcludedFile.swift
# parameterized rules can be customized from this configuration file
# line_length: 110
# parameterized rules are first parameterized as a warning level, then error level.
type_body_length:
- 300 # warning
- 400 # error
cyclomatic_complexity:
- 10 # warning
- 30 # error
reporter: "xcode" # reporter type (xcode, json, csv, checkstyle)
10 changes: 10 additions & 0 deletions rakefile
@@ -0,0 +1,10 @@
task :make do
system("xcodebuild | xcpretty -c")
end
task :install do
system("mv ./build/Release/snapdiff /usr/local/bin/snapdiff")
end

task :test do
system("xcodebuild test -scheme snapdiff_tests | xcpretty -c")
end

0 comments on commit 8450151

Please sign in to comment.