Merge branch 'feature/golang-runtime' of github.com:aws/jsii into fea…

…ture/golang-runtime
aws · Sep 16, 2020 · 959f714 · 959f714
2 parents cd7e5d2 + 72bb0b8
commit 959f714
Show file tree

Hide file tree

Showing 26 changed files with 381 additions and 119 deletions.
diff --git a/package.json b/package.json
@@ -15,16 +15,16 @@
     "test:update": "lerna run test:update --concurrency=1 --stream"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.1.0",
-    "@typescript-eslint/parser": "^4.1.0",
+    "@typescript-eslint/eslint-plugin": "^4.1.1",
+    "@typescript-eslint/parser": "^4.1.1",
     "eslint": "^7.9.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-import-resolver-node": "^0.3.4",
     "eslint-import-resolver-typescript": "^2.3.0",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-prettier": "^3.1.4",
     "lerna": "^3.22.1",
-    "prettier": "^2.1.1",
+    "prettier": "^2.1.2",
     "standard-version": "^9.0.0",
     "typescript": "~3.9.7"
   },

diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@jsii/dotnet-runtime": "^0.0.0",
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "jsii-calc": "^0.0.0",
     "jsii-pacmak": "^0.0.0",
     "typescript": "~3.9.7"

diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json
@@ -39,8 +39,8 @@
   },
   "devDependencies": {
     "@jsii/runtime": "^0.0.0",
-    "@types/node": "^10.17.32",
-    "@types/semver": "^7.3.3",
+    "@types/node": "^10.17.34",
+    "@types/semver": "^7.3.4",
     "jsii-build-tools": "^0.0.0",
     "semver": "^7.3.2",
     "typescript": "~3.9.7"

diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json
@@ -30,10 +30,10 @@
     "@types/dotenv": "^8.2.0",
     "@types/fs-extra": "^8.1.1",
     "@types/jest": "^26.0.13",
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "@types/tar": "^4.0.3",
     "eslint": "^7.9.0",
-    "prettier": "^2.1.1",
+    "prettier": "^2.1.2",
     "typescript": "~3.9.7"
   },
   "jest": {

diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@jsii/runtime": "^0.0.0",
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "jsii-build-tools": "^0.0.0",
     "typescript": "~3.9.7"
   }

diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json
@@ -42,14 +42,14 @@
     "@types/fs-extra": "^8.1.1",
     "@types/jest": "^26.0.13",
     "@types/jest-expect-message": "^1.0.2",
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "@types/tar": "^4.0.3",
     "eslint": "^7.9.0",
     "jest": "^26.4.2",
     "jest-expect-message": "^1.0.2",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^0.0.0",
-    "prettier": "^2.1.1",
+    "prettier": "^2.1.2",
     "ts-jest": "^26.3.0",
     "typescript": "~3.9.7"
   },

diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json
@@ -41,12 +41,12 @@
     "@scope/jsii-calc-base": "^0.0.0",
     "@scope/jsii-calc-lib": "^0.0.0",
     "@types/jest": "^26.0.13",
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "eslint": "^7.9.0",
     "jest": "^26.4.2",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^0.0.0",
-    "prettier": "^2.1.1",
+    "prettier": "^2.1.2",
     "source-map": "^0.7.3",
     "source-map-loader": "^1.1.0",
     "ts-jest": "^26.3.0",

diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json
@@ -35,11 +35,11 @@
   },
   "devDependencies": {
     "@types/jest": "^26.0.13",
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "eslint": "^7.9.0",
     "jest": "^26.4.2",
     "jsii-build-tools": "^0.0.0",
-    "prettier": "^2.1.1",
+    "prettier": "^2.1.2",
     "typescript": "~3.9.7",
     "typescript-json-schema": "^0.43.0"
   },

diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json
@@ -30,11 +30,11 @@
     "test:update": "npm run build && UPDATE_DIFF=1 npm run test"
   },
   "devDependencies": {
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
-    "prettier": "^2.1.1"
+    "prettier": "^2.1.2"
   },
   "jsii": {
     "outdir": "dist",

diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json
@@ -35,11 +35,11 @@
     "@scope/jsii-calc-base-of-base": "^0.0.0"
   },
   "devDependencies": {
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
-    "prettier": "^2.1.1"
+    "prettier": "^2.1.2"
   },
   "jsii": {
     "outdir": "dist",

diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json
@@ -39,11 +39,11 @@
     "@scope/jsii-calc-base-of-base": "^0.0.0"
   },
   "devDependencies": {
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
-    "prettier": "^2.1.1"
+    "prettier": "^2.1.2"
   },
   "jsii": {
     "outdir": "dist",

diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json
@@ -38,10 +38,10 @@
   "devDependencies": {
     "@types/fs-extra": "^8.1.1",
     "@types/jest": "^26.0.13",
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "eslint": "^7.9.0",
     "jest": "^26.4.2",
-    "prettier": "^2.1.1",
+    "prettier": "^2.1.2",
     "typescript": "~3.9.7"
   },
   "jest": {

diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json
@@ -49,12 +49,12 @@
     "@scope/jsii-calc-lib": "^0.0.0"
   },
   "devDependencies": {
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "eslint": "^7.9.0",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
-    "prettier": "^2.1.1"
+    "prettier": "^2.1.2"
   },
   "jsii": {
     "outdir": "dist",

diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json
@@ -22,12 +22,12 @@
     "@types/inquirer": "^7.3.1",
     "@types/jest": "^26.0.13",
     "@types/jest-expect-message": "^1.0.2",
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "@types/yargs": "^15.0.5",
     "eslint": "^7.9.0",
     "jest": "^26.4.2",
     "jest-expect-message": "^1.0.2",
-    "prettier": "^2.1.1",
+    "prettier": "^2.1.2",
     "typescript": "~3.9.7"
   },
   "dependencies": {

diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json
@@ -44,15 +44,15 @@
     "@types/fs-extra": "^8.1.1",
     "@types/jest": "^26.0.13",
     "@types/jest-expect-message": "^1.0.2",
-    "@types/node": "^10.17.32",
+    "@types/node": "^10.17.34",
     "@types/tar-fs": "^2.0.0",
     "@types/yargs": "^15.0.5",
     "eslint": "^7.9.0",
     "jest": "^26.4.2",
     "jest-expect-message": "^1.0.2",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
-    "prettier": "^2.1.1"
+    "prettier": "^2.1.2"
   },
   "jest": {
     "collectCoverage": true,

diff --git a/packages/jsii-pacmak/lib/targets/dotnet.ts b/packages/jsii-pacmak/lib/targets/dotnet.ts
@@ -58,6 +58,7 @@ export class DotnetBuilder implements TargetBuilder {
         ['build', '--force', '--configuration', 'Release'],
         {
           cwd: tempSourceDir.directory,
+          retry: { maxAttempts: 5 },
         },
       );
 

diff --git a/packages/jsii-pacmak/lib/targets/java.ts b/packages/jsii-pacmak/lib/targets/java.ts
@@ -449,6 +449,7 @@ export default class Java extends Target {
             process.env.MAVEN_OPTS ?? ''
           } -XX:+TieredCompilation -XX:TieredStopAtLevel=1`,
         },
+        retry: { maxAttempts: 5 },
       },
     );
   }
@@ -1547,7 +1548,11 @@ class JavaGenerator extends Generator {
     this.code.line();
     this.code.line('/**');
     // eslint-disable-next-line prettier/prettier
-    this.code.line(` * ${stabilityPrefixFor(cls.initializer)}A fluent builder for {@link ${builtType}}.`);
+    this.code.line(
+      ` * ${stabilityPrefixFor(
+        cls.initializer,
+      )}A fluent builder for {@link ${builtType}}.`,
+    );
     this.code.line(' */');
     this.emitStabilityAnnotations(cls.initializer);
     this.code.openBlock(

diff --git a/packages/jsii-pacmak/lib/targets/python.ts b/packages/jsii-pacmak/lib/targets/python.ts
@@ -66,13 +66,15 @@ export default class Python extends Target {
       VIRTUAL_ENV: venv,
     };
     const python = path.join(venvBin, 'python');
+
     // Install the necessary things
     await shell(
       python,
       ['-m', 'pip', 'install', '--no-input', ...pythonBuildTools, 'twine~=3.2'],
       {
         cwd: sourceDir,
         env,
+        retry: { maxAttempts: 5 },
       },
     );
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,7 @@ export class DotnetBuilder implements TargetBuilder { @@
             ['build', '--force', '--configuration', 'Release'],
             {
               cwd: tempSourceDir.directory,
+              retry: { maxAttempts: 5 },
             },
           );
@@ Expand Down @@