Skip to content

Commit b061d66

Browse files
authored
Merge pull request #33 from hyperoslo/feature/parse-result
Compass 3.0.0
2 parents b08b753 + 76d6af0 commit b061d66

28 files changed

+697
-738
lines changed

.mention-bot

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"maxReviewers": 2,
3+
"requiredOrgs": ["hyperoslo"]
4+
}

.swiftlint.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
included:
2+
- Sources
3+
excluded:
4+
- Carthage
5+
- Pods
6+
- Packages
7+
opt_in_rules:
8+
- empty_count
9+
disabled_rules:
10+
- valid_docs
11+
force_cast: warning
12+
force_try:
13+
severity: warning
14+
line_length: 120
15+
function_body_length:
16+
- 150
17+
type_body_length:
18+
warning: 300
19+
error: 400
20+
file_length:
21+
warning: 500
22+
error: 1200
23+
type_name:
24+
min_length: 3
25+
max_length:
26+
warning: 40
27+
error: 50
28+
variable_name:
29+
min_length: 2
30+
reporter: "xcode"

.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
os:
2+
- osx
13
osx_image: xcode7.3
24
language: objective-c
3-
4-
before_install:
5-
- brew update
6-
- if brew outdated | grep -qx xctool; then brew upgrade xctool; fi
7-
- carthage update --platform iOS,Mac
8-
5+
install:
6+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./swiftlint.sh; fi
97
script:
10-
- xctool clean build -project Compass.xcodeproj -scheme Compass-iOS -sdk iphonesimulator
11-
- xctool test -project Compass.xcodeproj -scheme Compass-iOS -sdk iphonesimulator
12-
- xctool clean build -project Compass.xcodeproj -scheme Compass-Mac -sdk macosx
13-
- xctool test -project Compass.xcodeproj -scheme Compass-Mac -sdk macosx
8+
- xcodebuild clean build -project Compass.xcodeproj -scheme Compass-iOS -sdk iphonesimulator
9+
- xcodebuild test -project Compass.xcodeproj -scheme Compass-iOS -sdk iphonesimulator
10+
- xcodebuild clean build -project Compass.xcodeproj -scheme Compass-Mac -sdk macosx
11+
- xcodebuild test -project Compass.xcodeproj -scheme Compass-Mac -sdk macosx
12+
notifications:
13+
email: false

Cartfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

Cartfile.resolved

Lines changed: 0 additions & 1 deletion
This file was deleted.

Compass.podspec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Pod::Spec.new do |s|
1313

1414
s.requires_arc = true
1515

16-
s.ios.source_files = 'Sources/{iOS,Shared}/**/*'
17-
s.osx.source_files = 'Sources/{Mac,Shared}/**/*'
18-
s.dependency 'Sugar'
16+
s.source_files = 'Sources/**/*'
17+
s.frameworks = 'Foundation'
1918
end

Compass.xcodeproj/project.pbxproj

Lines changed: 92 additions & 189 deletions
Large diffs are not rendered by default.

CompassTests/Shared/TestCompass.swift

Lines changed: 0 additions & 297 deletions
This file was deleted.

0 commit comments

Comments
 (0)