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

Commit

Permalink
Merge pull request #668 from IBM-Swift/updateTo5.10.0
Browse files Browse the repository at this point in the history
Release 5.10.0
  • Loading branch information
Christian Compton authored Jan 3, 2019
2 parents 3530fdd + f70ec8d commit 35a528d
Show file tree
Hide file tree
Showing 7 changed files with 2,157 additions and 2,097 deletions.
6 changes: 3 additions & 3 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: xcode10
osx_image: xcode10.1
before_install:
- if [[ $TRAVIS_NODE_VERSION == "8" ]]; then npm install -g npm@4; fi
- git clone https://github.com/IBM-Swift/Package-Builder.git
Expand All @@ -27,7 +27,7 @@ script:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then osName="osx"; fi
- export projectFolder=`pwd`
- projectName="$(basename $projectFolder)"
- export SWIFT_SNAPSHOT=swift-4.2
- export SWIFT_SNAPSHOT=swift-4.2.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 All @@ -47,4 +47,4 @@ env:
notifications:
email:
recipients:
- nhardman@uk.ibm.com
- cbcompto@us.ibm.com
10 changes: 10 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

<a name="5.10.0"></a>
# [5.10.0](https://github.com/IBM-Swift/generator-swiftserver/compare/5.9.0...5.10.0) (2019-01-02)


### Features

* swift 4.2.1 support ([fe6cc80](https://github.com/IBM-Swift/generator-swiftserver/commit/fe6cc80))



<a name="5.9.0"></a>
# [5.9.0](https://github.com/IBM-Swift/generator-swiftserver/compare/5.8.1...5.9.0) (2018-12-21)

Expand Down
6 changes: 3 additions & 3 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.2 application.
This generator and the Yeoman library runs on Node.js and generates a Swift 4.2.1 application.

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

## Prerequisites
To use this module, you will need Node.js and Swift 4.2 installed on your Linux or macOS system. You can get Node.js from https://nodejs.org and Swift 4.2 from https://swift.org/download.
To use this module, you will need Node.js and Swift 4.2.1 installed on your Linux or macOS system. You can get Node.js from https://nodejs.org and Swift 4.2.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.

Expand Down Expand Up @@ -56,7 +56,7 @@ To add a data model to your generated project, `cd` to the new project directory
yo swiftserver:<model>
```

For more information on data models, check out [this guide on Kitura.io](http://www.kitura.io/en/starter/generator/model_definition_json_file.html).
For more information on data models, check out [this guide on Kitura.io](https://www.kitura.io/guides/kituracli/model_definition.html).

### Options
You can also change how generator-swiftserver is invoked by choosing options:
Expand Down
Loading

0 comments on commit 35a528d

Please sign in to comment.