diff --git a/.circleci/config.yml b/.circleci/config.yml index 8d3fc33..794bc43 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: macos: - xcode: "9.3.0" + xcode: "10.0.0" steps: - checkout diff --git a/.swift-version b/.swift-version index c71be7b..bf77d54 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -swift-4.2-CONVERGENCE +4.2 diff --git a/.travis.yml b/.travis.yml index 7bfc9fb..5c650d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ -os: - - osx -osx_image: xcode10 +-os: + - linux env: language: generic +dist: trusty install: - if [ $TRAVIS_OS_NAME = linux ]; then eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"; diff --git a/Dockerfile b/Dockerfile index f014b23..6d99731 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM norionomura/swift:412 +FROM norionomura/swift:42 WORKDIR /package diff --git a/Makefile b/Makefile index ad1ff5c..b101b27 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ test-ios: set -o pipefail && \ xcodebuild test \ -scheme NonEmpty-Package \ - -destination platform="iOS Simulator,name=iPhone 8,OS=11.3" \ + -destination platform="iOS Simulator,name=iPhone XR,OS=12.0" \ | xcpretty test-swift: diff --git a/Sources/NonEmpty/NonEmpty+RandomAccessCollection.swift b/Sources/NonEmpty/NonEmpty+RandomAccessCollection.swift index 3b78599..b48d48d 100644 --- a/Sources/NonEmpty/NonEmpty+RandomAccessCollection.swift +++ b/Sources/NonEmpty/NonEmpty+RandomAccessCollection.swift @@ -1 +1,2 @@ -extension NonEmpty: RandomAccessCollection where C: RandomAccessCollection {} +// https://bugs.swift.org/browse/SR-8985 +//extension NonEmpty: RandomAccessCollection where C: RandomAccessCollection {} diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift index c06533a..8c0849a 100644 --- a/Tests/LinuxMain.swift +++ b/Tests/LinuxMain.swift @@ -1,4 +1,4 @@ -// Generated using Sourcery 0.11.2 — https://github.com/krzysztofzablocki/Sourcery +// Generated using Sourcery 0.13.1 — https://github.com/krzysztofzablocki/Sourcery // DO NOT EDIT import XCTest