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.

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

fix: Updating to swift 4 #10

Merged
merged 7 commits into from Mar 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swift-version
@@ -1 +1 @@
3.1
4.0.3
15 changes: 5 additions & 10 deletions .travis.yml
Expand Up @@ -20,17 +20,12 @@ matrix:
- os: linux
dist: trusty
sudo: required
- os: linux
dist: trusty
sudo: required
env: SWIFT_SNAPSHOT=$SWIFT_4_DEV_SNAPSHOT
- os: osx
osx_image: xcode8.3
osx_image: xcode9.2
sudo: required
- os: osx
osx_image: xcode9
sudo: required
env: SWIFT_SNAPSHOT=$SWIFT_4_DEV_SNAPSHOT

before_install:
- git clone https://github.com/IBM-Swift/Package-Builder.git

script:
- ./build.sh
- ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand the only difference between build.sh and invoking build-package.sh directly was in the Docker case, and we've already removed the docker build, so this seems okay.

7 changes: 0 additions & 7 deletions Package.pins

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -16,7 +16,7 @@ To use Swift-Kuery-SQLite you must install SQLite.

### macOS

You can install SQLite with Homebrew:
You can install SQLite with [Homebrew](https://brew.sh/):

```
$ brew install sqlite
Expand Down
4 changes: 2 additions & 2 deletions Tests/LinuxMain.swift
Expand Up @@ -25,12 +25,12 @@ extension MutableCollection where Indices.Iterator.Element == Index {
mutating func shuffle() {
let c = count
guard c > 1 else { return }

for (firstUnshuffled, unshuffledCount) in zip(indices, stride(from: c, to: 1, by: -1)) {
let d: IndexDistance = numericCast(random() % numericCast(unshuffledCount))
guard d != 0 else { continue }
let i = index(firstUnshuffled, offsetBy: d)
swap(&self[firstUnshuffled], &self[i])
self.swapAt(firstUnshuffled, i)
}
}
}
Expand Down
11 changes: 0 additions & 11 deletions build.sh

This file was deleted.