Skip to content
This repository has been archived by the owner on Feb 28, 2020. It is now read-only.

Commit

Permalink
feat: swift 4.1 migration
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Compton committed Apr 26, 2018
1 parent 467047b commit 2505e4b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ os:
- linux
- osx
dist: trusty
osx_image: xcode9.2
osx_image: xcode9.3
before_install:
- if [[ $TRAVIS_NODE_VERSION == "8" ]]; then npm install -g npm@4; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get head; fi
Expand All @@ -28,7 +28,7 @@ script:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then osName="osx"; fi
- export projectFolder=`pwd`
- projectName="$(basename $projectFolder)"
- export SWIFT_SNAPSHOT=swift-4.0.3
- export SWIFT_SNAPSHOT=swift-4.1
- source ./Package-Builder/install-swift.sh
- if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then npm run testsdkgen; fi
- if [[ $TRAVIS_EVENT_TYPE != "cron" ]]; then npm run coverage && npm run report-coverage; fi
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

This module is a [Yeoman](http://yeoman.io) generator for creating REST webservices based on the [Kitura web framework](http://kitura.io) with the [Swift](https://swift.org/) language.

This generator and the Yeoman library runs on Node.js and generates a Swift 4 application.
This generator and the Yeoman library runs on Node.js and generates a Swift 4.1 application.

## Contents
1. [Prerequisites](#prerequisites)
Expand All @@ -26,10 +26,10 @@ This generator and the Yeoman library runs on Node.js and generates a Swift 4 ap
1. [Contributing](#contributing)

## Prerequisites
To use this module, you will need Node.js and Swift 4 installed on your Linux or macOS system. You can get Node.js from https://nodejs.org and Swift 4 from https://swift.org/download.
To use this module, you will need Node.js and Swift 4.1 installed on your Linux or macOS system. You can get Node.js from https://nodejs.org and Swift 4.1 from https://swift.org/download.

You will also need the Yeoman command line utility [yo](https://github.com/yeoman/yo) installed in your global Node.js module directory.

To install `yo`, run:

```bash
Expand Down Expand Up @@ -122,4 +122,4 @@ Make sure to follow the [conventional commit specification](https://conventional

Once you are finished with your changes, run `npm test` to make sure all tests pass. Then, create a pull request against `develop`, and a team member will review and merge your pull request.

Once the pull request is merged, an auto generated pull request will be created against `master` to update the changelog and increase the versioning. After the auto-generated pull request has been merged to `master`, the version will be bumped and published to npm.
Once the pull request is merged, an auto generated pull request will be created against `master` to update the changelog and increase the versioning. After the auto-generated pull request has been merged to `master`, the version will be bumped and published to npm.
2 changes: 1 addition & 1 deletion refresh/templates/common/swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.3
4.1

0 comments on commit 2505e4b

Please sign in to comment.