Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add full Xcode9 compat #152

Merged
merged 2 commits into from
Sep 21, 2017
Merged

Add full Xcode9 compat #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8677443
Tweak travis build for Xcode9
drmohundro Sep 21, 2017
b9c4a74
Swiftlint fixes
drmohundro Sep 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .swiftlint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ opt_in_rules:
- redundant_nil_coalescing
- sorted_imports
- switch_case_on_newline
- valid_docs

excluded:
- Carthage
Expand Down
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ matrix:
- swiftlint lint --strict
- set -o pipefail
- xcodebuild $XCODE_ACTION $WORKSPACE -scheme "SWXMLHash OSX" | xcpretty
- xcodebuild $XCODE_ACTION $WORKSPACE -scheme "SWXMLHash iOS" -sdk iphonesimulator -destination "OS=10.0,name=iPhone 6S" | xcpretty
- xcodebuild $XCODE_ACTION $WORKSPACE -scheme "SWXMLHash iOS" -sdk iphonesimulator -destination "OS=11.0,name=iPhone 7" | xcpretty
- xcodebuild $XCODE_ACTION $WORKSPACE -scheme "SWXMLHash tvOS" -sdk appletvsimulator -destination "name=Apple TV 1080p" | xcpretty
- xcodebuild build $WORKSPACE -scheme "SWXMLHash watchOS" -sdk watchsimulator | xcpretty
env:
- JOB=Xcode
- WORKSPACE="-workspace SWXMLHash.xcworkspace"
- XCODE_ACTION="build-for-testing test-without-building"
os: osx
osx_image: xcode8.3
osx_image: xcode9
language: objective-c
- script:
- swift build
- swift test
env: JOB=SPM
os: osx
osx_image: xcode8.3
osx_image: xcode9
language: objective-c
- script:
- swift build
Expand All @@ -35,7 +35,7 @@ matrix:
- swift test
env:
- JOB=Linux
- SWIFT_VERSION=3.1
- SWIFT_VERSION=4.0
sudo: required
dist: trusty
language: generic
Expand All @@ -46,7 +46,7 @@ matrix:
- swift test
env:
- JOB=Linux
- SWIFT_VERSION=4.0-DEVELOPMENT-SNAPSHOT-2017-05-29-a
- SWIFT_VERSION=4.0
sudo: required
dist: trusty
language: generic
Expand Down
2 changes: 0 additions & 2 deletions Tests/SWXMLHashTests/LazyTypesConversionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
import SWXMLHash
import XCTest

// swiftlint:disable force_try

class LazyTypesConversionTests: XCTestCase {
var parser: XMLIndexer?
let xmlWithBasicTypes = "<root>" +
Expand Down
1 change: 0 additions & 1 deletion Tests/SWXMLHashTests/LazyXMLParsingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import SWXMLHash
import XCTest

// swiftlint:disable force_try
// swiftlint:disable line_length

class LazyXMLParsingTests: XCTestCase {
Expand Down
1 change: 0 additions & 1 deletion Tests/SWXMLHashTests/TypeConversionArrayOfNonPrimitiveTypesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import SWXMLHash
import XCTest

// swiftlint:disable force_try
// swiftlint:disable line_length
// swiftlint:disable type_name

Expand Down
1 change: 0 additions & 1 deletion Tests/SWXMLHashTests/TypeConversionBasicTypesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import SWXMLHash
import XCTest

// swiftlint:disable force_try
// swiftlint:disable identifier_name
// swiftlint:disable file_length
// swiftlint:disable line_length
Expand Down
2 changes: 0 additions & 2 deletions Tests/SWXMLHashTests/TypeConversionComplexTypesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
import SWXMLHash
import XCTest

// swiftlint:disable force_try
// swiftlint:disable identifier_name
// swiftlint:disable line_length

class TypeConversionComplexTypesTests: XCTestCase {
var parser: XMLIndexer?
Expand Down
1 change: 0 additions & 1 deletion Tests/SWXMLHashTests/TypeConversionPrimitypeTypesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import SWXMLHash
import XCTest

// swiftlint:disable force_try
// swiftlint:disable line_length

class TypeConversionPrimitypeTypesTests: XCTestCase {
Expand Down
1 change: 0 additions & 1 deletion Tests/SWXMLHashTests/XMLParsingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import SWXMLHash
import XCTest

// swiftlint:disable force_try
// swiftlint:disable line_length

class XMLParsingTests: XCTestCase {
Expand Down