From f22b16746424d521b034d78edffd10bdb01d6cff Mon Sep 17 00:00:00 2001 From: Mike Tunnicliffe Date: Fri, 27 Oct 2017 23:23:45 +0100 Subject: [PATCH] feat: update to kitura 2 with related changes (#364) * feat: update to Kitura 2.0 * fix: update package-lock.json * feat(deps): update to SwiftMetrics 2 * fix: disable AppID service from prompting BREAKING CHANGE: Support for AppID service disabled (temporarily), major version update in dependency Kitura --- app/index.js | 2 +- package-lock.json | 16 ++++++++-------- refresh/index.js | 2 +- refresh/templates/common/Package.swift | 2 +- test/integration/app/prompted_build.js | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/index.js b/app/index.js index e6649cdf..6280cdc5 100644 --- a/app/index.js +++ b/app/index.js @@ -419,7 +419,7 @@ module.exports = Generator.extend({ 'MongoDB', 'PostgreSQL', 'Object Storage', - 'AppID', + // 'AppID', 'Auto-scaling', 'Watson Conversation', 'Alert Notification', diff --git a/package-lock.json b/package-lock.json index 466a97e8..97603000 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "generator-swiftserver", - "version": "3.1.0", + "version": "3.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2010,9 +2010,9 @@ } }, "generator-ibm-cloud-enablement": { - "version": "0.0.109", - "resolved": "https://registry.npmjs.org/generator-ibm-cloud-enablement/-/generator-ibm-cloud-enablement-0.0.109.tgz", - "integrity": "sha512-twv0FsK8MSvs4bio1yABSNDoh+QngELbjKMQMHPQlRaDgCXQoRSFWp4XYUStBhOTULfqa1PGkGGRmTo0aNfzNA==", + "version": "0.0.114", + "resolved": "https://registry.npmjs.org/generator-ibm-cloud-enablement/-/generator-ibm-cloud-enablement-0.0.114.tgz", + "integrity": "sha512-mSdjSmtTq21KrGyX/48TWOT64EtFU2/l17TBMruKGo8K2YuE/ok/hMI1CEhRkQeEOHG0fh6iQw+yrNYKeGzfTQ==", "requires": { "fs-extra": "2.1.2", "handlebars": "4.0.10", @@ -2212,7 +2212,7 @@ "growl": { "version": "1.10.3", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", - "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", + "integrity": "sha1-GSa6kM8+3+KttJJ/WIC8IsZseQ8=", "dev": true }, "handlebars": { @@ -2302,7 +2302,7 @@ "ibm-openapi-support": { "version": "0.0.9", "resolved": "https://registry.npmjs.org/ibm-openapi-support/-/ibm-openapi-support-0.0.9.tgz", - "integrity": "sha512-S/eW0nhQmOlrelvt/wFUNYP/KVqFoPAbF1oZV8ZwTJOlQEiEdlEBdkPYVafjgt+jSyMnHxYsKkw3iXXSYu6Srg==", + "integrity": "sha1-wdErchCKXD0mjCA1W5Mnq3HkLyA=", "requires": { "bluebird": "3.5.1", "debug": "2.6.9", @@ -3297,7 +3297,7 @@ "mocha": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz", - "integrity": "sha512-evDmhkoA+cBNiQQQdSKZa2b9+W2mpLoj50367lhy+Klnx9OV8XlCIhigUnn1gaTFLQCa0kdNhEGDr0hCXOQFDw==", + "integrity": "sha1-Cu5alc9ppGGIIPXlH6MXFxF9rxs=", "dev": true, "requires": { "browser-stdout": "1.3.0", @@ -3315,7 +3315,7 @@ "diff": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz", - "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==", + "integrity": "sha1-qoVnpu7QPFMfyJ0/cRzQ5SWd7HU=", "dev": true } } diff --git a/refresh/index.js b/refresh/index.js index bcd91157..a8196d81 100644 --- a/refresh/index.js +++ b/refresh/index.js @@ -364,7 +364,7 @@ module.exports = Generator.extend({ if (this.metrics) { this.modules.push('"SwiftMetrics"') this.appInitCode.capabilities.push('initializeMetrics(app: self)') - this.dependencies.push('.package(url: "https://github.com/RuntimeTools/SwiftMetrics.git", from: "1.0.0"),') + this.dependencies.push('.package(url: "https://github.com/RuntimeTools/SwiftMetrics.git", from: "2.0.0"),') } }, diff --git a/refresh/templates/common/Package.swift b/refresh/templates/common/Package.swift index 4eb8a27d..12c3c6c7 100644 --- a/refresh/templates/common/Package.swift +++ b/refresh/templates/common/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( name: "<%- executableModule %>", dependencies: [ - .package(url: "https://github.com/IBM-Swift/Kitura.git", .branch("issue.swift4")), + .package(url: "https://github.com/IBM-Swift/Kitura.git", .upToNextMinor(from: "2.0.0")), .package(url: "https://github.com/IBM-Swift/HeliumLogger.git", .upToNextMinor(from: "1.7.1")), .package(url: "https://github.com/IBM-Swift/CloudEnvironment.git", .upToNextMinor(from: "4.0.5")), .package(url: "https://github.com/IBM-Swift/Configuration.git", .upToNextMinor(from: "1.0.0")), diff --git a/test/integration/app/prompted_build.js b/test/integration/app/prompted_build.js index cf877db3..9dfd58f8 100644 --- a/test/integration/app/prompted_build.js +++ b/test/integration/app/prompted_build.js @@ -117,7 +117,7 @@ describe('Integration tests (prompt build) for swiftserver:app', function () { // TODO with endpoints from swagger file @full var servicesToTest = [ 'cloudant', 'redis', 'mongodb', 'postgresql', - 'objectstorage', 'appid', 'watsonconversation', 'alertnotification', + 'objectstorage', /* 'appid', */ 'watsonconversation', 'alertnotification', 'pushnotifications', 'autoscaling' ] servicesToTest.forEach(service => { var serviceDisplayName = commonTest.serviceDisplayNames[service] @@ -215,7 +215,7 @@ describe('Integration tests (prompt build) for swiftserver:app', function () { 'Redis', 'MongoDB', 'Object Storage', - 'AppID', + // 'AppID', 'Auto-scaling', 'Watson Conversation', 'Alert Notification',