From 42b37b16b7b7e8037358a025ee6e6fb5a88b5d4c Mon Sep 17 00:00:00 2001
From: Elad Ben-Israel <benisrae@amazon.com>
Date: Mon, 12 Nov 2018 17:52:12 +0200
Subject: [PATCH] chore: upgrade to jsii 0.7.10 (#1147)

- align "peerDependencies"
- added scripts/fix-peer-deps.sh
- fix peer dependencies when bumping
---
 bump.sh                                      |  5 +++++
 packages/@aws-cdk/app-delivery/package.json  |  6 +++++-
 packages/@aws-cdk/aws-appstream/package.json |  3 +++
 packages/@aws-cdk/aws-ecs/package.json       | 11 ++++++++++-
 scripts/fix-peer-deps.sh                     |  3 +++
 tools/cdk-build-tools/package.json           |  4 ++--
 6 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 scripts/fix-peer-deps.sh

diff --git a/bump.sh b/bump.sh
index a1916e7e0fed8..27bdd8a2584f1 100755
--- a/bump.sh
+++ b/bump.sh
@@ -8,8 +8,13 @@ fi
 
 /bin/bash ./install.sh
 
+
 lerna publish --force-publish=* --skip-npm --skip-git --repo-version ${ver}
 
+# align "peerDependencies" to actual dependencies after bump
+# this is technically only required for major version bumps, but in the meantime we shall do it in every bump
+/bin/bash scripts/fix-peer-deps.sh
+
 # Update CHANGELOG.md only at the root
 cat > /tmp/context.json <<HERE
 {
diff --git a/packages/@aws-cdk/app-delivery/package.json b/packages/@aws-cdk/app-delivery/package.json
index 4ca03ea7a9cc9..f172947b770e2 100644
--- a/packages/@aws-cdk/app-delivery/package.json
+++ b/packages/@aws-cdk/app-delivery/package.json
@@ -60,5 +60,9 @@
   "keywords": [
     "aws",
     "cdk"
-  ]
+  ],
+  "peerDependencies": {
+    "@aws-cdk/cdk": "^0.15.2",
+    "@aws-cdk/aws-codepipeline-api": "^0.15.2"
+  }
 }
diff --git a/packages/@aws-cdk/aws-appstream/package.json b/packages/@aws-cdk/aws-appstream/package.json
index 1e49e3243c685..7f9b6f1c57112 100644
--- a/packages/@aws-cdk/aws-appstream/package.json
+++ b/packages/@aws-cdk/aws-appstream/package.json
@@ -60,5 +60,8 @@
   },
   "dependencies": {
     "@aws-cdk/cdk": "^0.15.2"
+  },
+  "peerDependencies": {
+    "@aws-cdk/cdk": "^0.15.2"
   }
 }
diff --git a/packages/@aws-cdk/aws-ecs/package.json b/packages/@aws-cdk/aws-ecs/package.json
index bde03911bc472..2a3b07712601a 100644
--- a/packages/@aws-cdk/aws-ecs/package.json
+++ b/packages/@aws-cdk/aws-ecs/package.json
@@ -77,6 +77,15 @@
   },
   "homepage": "https://github.com/awslabs/aws-cdk",
   "peerDependencies": {
-    "@aws-cdk/cdk": "^0.15.1"
+    "@aws-cdk/cdk": "^0.15.1",
+    "@aws-cdk/aws-ec2": "^0.15.2",
+    "@aws-cdk/aws-logs": "^0.15.2",
+    "@aws-cdk/aws-elasticloadbalancingv2": "^0.15.2",
+    "@aws-cdk/aws-applicationautoscaling": "^0.15.2",
+    "@aws-cdk/aws-cloudwatch": "^0.15.2",
+    "@aws-cdk/aws-autoscaling": "^0.15.2",
+    "@aws-cdk/aws-iam": "^0.15.2",
+    "@aws-cdk/aws-ecr": "^0.15.2",
+    "@aws-cdk/aws-elasticloadbalancing": "^0.15.2"
   }
 }
diff --git a/scripts/fix-peer-deps.sh b/scripts/fix-peer-deps.sh
new file mode 100644
index 0000000000000..e62ce6ebab684
--- /dev/null
+++ b/scripts/fix-peer-deps.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+set -euo pipefail
+lerna exec "$PWD/tools/cdk-build-tools/node_modules/.bin/jsii-fix-peers 2>/dev/null || true"
\ No newline at end of file
diff --git a/tools/cdk-build-tools/package.json b/tools/cdk-build-tools/package.json
index 03bda6f886861..48554c07c89f3 100644
--- a/tools/cdk-build-tools/package.json
+++ b/tools/cdk-build-tools/package.json
@@ -32,8 +32,8 @@
   },
   "dependencies": {
     "fs-extra": "^7.0.0",
-    "jsii": "^0.7.8",
-    "jsii-pacmak": "^0.7.7",
+    "jsii": "^0.7.10",
+    "jsii-pacmak": "^0.7.10",
     "merkle-build": "^0.15.2",
     "nodeunit": "^0.11.3",
     "nyc": "^13.0.1",