Merge pull request #694 from IBM-Swift/updateTo5.14.0

Release 5.14.0

.travis.yml

@@ -13,8 +13,8 @@ node_js:
 os:
 - linux
 - osx
-dist: trusty
-osx_image: xcode10.1
+dist: xenial
+osx_image: xcode10.2
 before_install:
 - if [[ $TRAVIS_NODE_VERSION == "8" ]]; then npm install -g npm@4; fi
 - git clone https://github.com/IBM-Swift/Package-Builder.git
@@ -25,9 +25,10 @@ before_install:
 script:
 - osName="linux"
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then osName="osx"; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libressl; fi
 - export projectFolder=`pwd`
 - projectName="$(basename $projectFolder)"
-- export SWIFT_SNAPSHOT=swift-4.2.3
+- export SWIFT_SNAPSHOT=swift-5.0
 - 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

CHANGES.md

@@ -2,11 +2,21 @@
 
 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.14.0"></a>
+# [5.14.0](https://github.com/IBM-Swift/generator-swiftserver/compare/5.13.0...5.14.0) (2019-05-07)
+
+
+### Features
+
+* swift 5 application generation ([337061c](https://github.com/IBM-Swift/generator-swiftserver/commit/337061c))
+* Swift 5.0 support ([a61ae2c](https://github.com/IBM-Swift/generator-swiftserver/commit/a61ae2c))
+
 <a name="5.13.1"></a>
 ## [5.13.1](https://github.com/IBM-Swift/generator-swiftserver/compare/5.13.0...5.13.1) (2019-04-25)
 
 
 
+
 <a name="5.13.0"></a>
 # [5.13.0](https://github.com/IBM-Swift/generator-swiftserver/compare/5.12.1...5.13.0) (2019-04-18)
 

README.md

@@ -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.3 application.
+This generator and the Yeoman library runs on Node.js and generates a Swift 5.0 application.
 
 ## Contents
 1. [Prerequisites](#prerequisites)
@@ -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.3 installed on your Linux or macOS system. You can get Node.js from https://nodejs.org and Swift 4.2.3 from https://swift.org/download.
+To use this module, you will need Node.js and Swift 5.0 installed on your Linux or macOS system. You can get Node.js from https://nodejs.org and Swift 5.0 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.
 

app/index.js

@@ -537,7 +537,6 @@ module.exports = Generator.extend({
         'MongoDB',
         'PostgreSQL',
         'ElephantSQL',
-        'Object Storage',
         'AppID',
         'Auto-scaling',
         'Watson Assistant, formerly Conversation',
@@ -567,9 +566,6 @@ module.exports = Generator.extend({
         if (answers.services.indexOf('ElephantSQL') !== -1) {
           this._addService('elephantsql', generateServiceName(this.appname, 'ElephantSQL'))
         }
-        if (answers.services.indexOf('Object Storage') !== -1) {
-          this._addService('objectStorage', generateServiceName(this.appname, 'ObjectStorage'))
-        }
         if (answers.services.indexOf('AppID') !== -1) {
           this._addService('appid', generateServiceName(this.appname, 'AppID'))
         }
@@ -651,7 +647,6 @@ module.exports = Generator.extend({
           case 'mongodb': return 'MongoDB'
           case 'postgresql': return 'PostgreSQL'
           case 'elephantsql': return 'ElephantSQL'
-          case 'objectStorage': return 'Object Storage'
           case 'appid': return 'AppID'
           case 'autoscaling': return 'Auto-scaling'
           case 'conversation': return 'Watson Assistant'
@@ -989,52 +984,6 @@ module.exports = Generator.extend({
       })
     },
 
-    promptConfigureObjectStorage: function () {
-      if (this.skipPrompting) return
-      if (!this.servicesToConfigure) return
-      if (!this.servicesToConfigure.objectStorage) return
-
-      this.log()
-      this.log('Configure Object Storage')
-      var prompts = [
-        /*
-        { name: 'objectstorageAuth_url'    message: 'Enter auth url:' },
-        { name: 'objectstorageDomainId',   message: 'Enter domain ID:' },
-        { name: 'objectstorageDomainName', message: 'Enter domain name:' },
-        { name: 'objectstorageProject',    message: 'Enter project:' },
-        { name: 'objectstorageRole',       message: 'Enter role:' },
-        { name: 'objectstorageUsername',   message: 'Enter username:' },
-        */
-        { name: 'objectstorageName', message: 'Enter name (blank for default):' },
-        { name: 'objectstorageRegion', message: 'Enter region:' },
-        { name: 'objectstorageProjectId', message: 'Enter project ID:' },
-        { name: 'objectstorageUserId', message: 'Enter user ID:' },
-        { name: 'objectstoragePassword', message: 'Enter password:', type: 'password' }
-      ]
-      return this.prompt(prompts).then((answers) => {
-        var objectStorageService = this.services.objectStorage[0]
-        this.services.objectStorage[0] = {
-          /*
-          auth_url:   answers.objectstorageAuth_url || undefined,
-          domainId:   answers.objectstorageDomainId || undefined,
-          domainName: answers.objectstorageDomainName || undefined,
-          project:    answers.objectstorageProject || undefined,
-          role:       answers.objectstorageRole || undefined,
-          username:   answers.objectstorageUsername || undefined,
-          */
-          region: answers.objectstorageRegion || undefined,
-          projectId: answers.objectstorageProjectId || undefined,
-          userId: answers.objectstorageUserId || undefined,
-          password: answers.objectstoragePassword || undefined,
-          serviceInfo: {
-            label: objectStorageService.serviceInfo.label,
-            name: answers.objectstorageName || objectStorageService.serviceInfo.name,
-            plan: objectStorageService.serviceInfo.plan
-          }
-        }
-      })
-    },
-
     promptConfigureAppID: function () {
       if (this.skipPrompting) return
       if (!this.servicesToConfigure) return

lib/actions.js

@@ -52,8 +52,8 @@ exports.ensureRequiredSwiftInstalled = function () {
         reject(new Error(chalk.red('Could not determine swift version')))
         return
       }
-      if (version !== '4') {
-        reject(new Error(chalk.red('Swift version 4 is required for Swift Server Generator.')))
+      if (version !== '5') {
+        reject(new Error(chalk.red('Swift version 5 is required for Swift Server Generator.')))
         return
       }
       resolve()

lib/helpers.js

@@ -447,20 +447,6 @@ function sanitizeCredentialsAndFillInDefaults (serviceType, service) {
       return {
         uri: service.uri || url.format(defaultElephantSqlURI)
       }
-    case 'objectStorage':
-      var defaultAuthURL = 'https://identity.open.softlayer.com'
-      return {
-        auth_url: service.auth_url || defaultAuthURL,
-        project: service.project || '',
-        projectId: service.projectId || '',
-        region: service.region || '',
-        userId: service.userId || '',
-        username: service.username || '',
-        password: service.password || '',
-        domainId: service.domainId || '',
-        domainName: service.domainName || '',
-        role: service.role || ''
-      }
     case 'appid':
       return {
         clientId: service.clientId || '',
@@ -519,7 +505,6 @@ exports.getBluemixServiceLabel = function (serviceType) {
     case 'redis': return 'compose-for-redis'
     case 'mongodb': return 'compose-for-mongodb'
     case 'postgresql': return 'compose-for-postgresql'
-    case 'objectStorage': return 'Object-Storage'
     case 'appid': return 'AppID'
     case 'conversation': return 'conversation'
     case 'alertNotification': return 'AlertNotification'
@@ -535,7 +520,6 @@ exports.getBluemixDefaultPlan = function (serviceType) {
     case 'redis': return 'Standard'
     case 'mongodb': return 'Standard'
     case 'postgresql': return 'Standard'
-    case 'objectStorage': return 'Free'
     case 'appid': return 'Graduated tier'
     case 'conversation': return 'free'
     case 'alertNotification': return 'authorizedusers'
@@ -717,7 +701,7 @@ exports.routeMethodVariant = function (detail) {
 }
 
 exports.isThisServiceAnArray = function (serviceType) {
-  return (serviceType === 'cloudant' || serviceType === 'objectStorage')
+  return (serviceType === 'cloudant')
 }
 
 exports.validateServiceFields = function (serviceType, service) {