Merge pull request #152 from drmohundro/xcode9-compat

Add full Xcode9 compat
drmohundro · Sep 21, 2017 · b07d927 · b07d927
2 parents 591eaff + b9c4a74
commit b07d927
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 15 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -22,7 +22,6 @@ opt_in_rules:
   - redundant_nil_coalescing
   - sorted_imports
   - switch_case_on_newline
-  - valid_docs
 
 excluded:
   - Carthage

diff --git a/.travis.yml b/.travis.yml
@@ -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
@@ -35,7 +35,7 @@ matrix:
         - swift test
       env:
         - JOB=Linux
-        - SWIFT_VERSION=3.1
+        - SWIFT_VERSION=4.0
       sudo: required
       dist: trusty
       language: generic
@@ -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

diff --git a/Tests/SWXMLHashTests/LazyTypesConversionTests.swift b/Tests/SWXMLHashTests/LazyTypesConversionTests.swift
@@ -26,8 +26,6 @@
 import SWXMLHash
 import XCTest
 
-// swiftlint:disable force_try
-
 class LazyTypesConversionTests: XCTestCase {
     var parser: XMLIndexer?
     let xmlWithBasicTypes = "<root>" +

diff --git a/Tests/SWXMLHashTests/LazyXMLParsingTests.swift b/Tests/SWXMLHashTests/LazyXMLParsingTests.swift
@@ -26,7 +26,6 @@
 import SWXMLHash
 import XCTest
 
-// swiftlint:disable force_try
 // swiftlint:disable line_length
 
 class LazyXMLParsingTests: XCTestCase {

diff --git a/Tests/SWXMLHashTests/TypeConversionArrayOfNonPrimitiveTypesTests.swift b/Tests/SWXMLHashTests/TypeConversionArrayOfNonPrimitiveTypesTests.swift
@@ -26,7 +26,6 @@
 import SWXMLHash
 import XCTest
 
-// swiftlint:disable force_try
 // swiftlint:disable line_length
 // swiftlint:disable type_name
 

diff --git a/Tests/SWXMLHashTests/TypeConversionBasicTypesTests.swift b/Tests/SWXMLHashTests/TypeConversionBasicTypesTests.swift
@@ -26,7 +26,6 @@
 import SWXMLHash
 import XCTest
 
-// swiftlint:disable force_try
 // swiftlint:disable identifier_name
 // swiftlint:disable file_length
 // swiftlint:disable line_length

diff --git a/Tests/SWXMLHashTests/TypeConversionComplexTypesTests.swift b/Tests/SWXMLHashTests/TypeConversionComplexTypesTests.swift
@@ -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?

diff --git a/Tests/SWXMLHashTests/TypeConversionPrimitypeTypesTests.swift b/Tests/SWXMLHashTests/TypeConversionPrimitypeTypesTests.swift
@@ -26,7 +26,6 @@
 import SWXMLHash
 import XCTest
 
-// swiftlint:disable force_try
 // swiftlint:disable line_length
 
 class TypeConversionPrimitypeTypesTests: XCTestCase {

diff --git a/Tests/SWXMLHashTests/XMLParsingTests.swift b/Tests/SWXMLHashTests/XMLParsingTests.swift
@@ -26,7 +26,6 @@
 import SWXMLHash
 import XCTest
 
-// swiftlint:disable force_try
 // swiftlint:disable line_length
 
 class XMLParsingTests: XCTestCase {