Skip to content

Commit

Permalink
Merge pull request #33 from hyperoslo/feature/parse-result
Browse files Browse the repository at this point in the history
Compass 3.0.0
  • Loading branch information
onmyway133 authored Aug 23, 2016
2 parents b08b753 + 76d6af0 commit b061d66
Show file tree
Hide file tree
Showing 28 changed files with 697 additions and 738 deletions.
4 changes: 4 additions & 0 deletions .mention-bot
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"maxReviewers": 2,
"requiredOrgs": ["hyperoslo"]
}
30 changes: 30 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
included:
- Sources
excluded:
- Carthage
- Pods
- Packages
opt_in_rules:
- empty_count
disabled_rules:
- valid_docs
force_cast: warning
force_try:
severity: warning
line_length: 120
function_body_length:
- 150
type_body_length:
warning: 300
error: 400
file_length:
warning: 500
error: 1200
type_name:
min_length: 3
max_length:
warning: 40
error: 50
variable_name:
min_length: 2
reporter: "xcode"
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
os:
- osx
osx_image: xcode7.3
language: objective-c

before_install:
- brew update
- if brew outdated | grep -qx xctool; then brew upgrade xctool; fi
- carthage update --platform iOS,Mac

install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./swiftlint.sh; fi
script:
- xctool clean build -project Compass.xcodeproj -scheme Compass-iOS -sdk iphonesimulator
- xctool test -project Compass.xcodeproj -scheme Compass-iOS -sdk iphonesimulator
- xctool clean build -project Compass.xcodeproj -scheme Compass-Mac -sdk macosx
- xctool test -project Compass.xcodeproj -scheme Compass-Mac -sdk macosx
- xcodebuild clean build -project Compass.xcodeproj -scheme Compass-iOS -sdk iphonesimulator
- xcodebuild test -project Compass.xcodeproj -scheme Compass-iOS -sdk iphonesimulator
- xcodebuild clean build -project Compass.xcodeproj -scheme Compass-Mac -sdk macosx
- xcodebuild test -project Compass.xcodeproj -scheme Compass-Mac -sdk macosx
notifications:
email: false
1 change: 0 additions & 1 deletion Cartfile

This file was deleted.

1 change: 0 additions & 1 deletion Cartfile.resolved

This file was deleted.

5 changes: 2 additions & 3 deletions Compass.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Pod::Spec.new do |s|

s.requires_arc = true

s.ios.source_files = 'Sources/{iOS,Shared}/**/*'
s.osx.source_files = 'Sources/{Mac,Shared}/**/*'
s.dependency 'Sugar'
s.source_files = 'Sources/**/*'
s.frameworks = 'Foundation'
end
281 changes: 92 additions & 189 deletions Compass.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

297 changes: 0 additions & 297 deletions CompassTests/Shared/TestCompass.swift

This file was deleted.

Loading

0 comments on commit b061d66

Please sign in to comment.