Update examples. Fixes #18

Author: badsyntax

examples/gradle-ts-protoc-gen/README.md

@@ -20,6 +20,9 @@ Install dependencies:
 
 ```sh
 npm install
+
+# Apple M1 users should install for x64 due to grpc-tools not supporting arm64
+npm i --target_arch=x64
 ```
 
 Use Gradle & [`ts-protoc-gen`](https://www.npmjs.com/package/ts-protoc-gen) to generate the TypeScript files:

examples/gradle-ts-protoc-gen/build.gradle

@@ -1,17 +1,16 @@
 
 plugins {
   id 'java'
-  id 'com.google.protobuf' version '0.8.13'
+  id 'com.google.protobuf' version '0.8.16'
   id 'com.github.jlouns.cpe' version '0.5.0'
 }
 
-project.ext.set('protobufVersion', '3.12.0')
+project.ext.set('protobufVersion', '3.16.0')
 project.ext.set('protocVersion', project.protobufVersion)
 
 def isWindows = System.getProperty('os.name').toLowerCase().contains('windows')
 
 repositories {
-  jcenter()
   mavenCentral()
 }
 
@@ -25,7 +24,12 @@ sourceSets {
 
 protobuf {
   protoc {
-    artifact = "com.google.protobuf:protoc:${protocVersion}"
+    if (osdetector.os == 'osx') {
+      // Required for arm64 support on MacOS
+      artifact = "com.google.protobuf:protoc:${protocVersion}:osx-x86_64"
+    } else {
+      artifact = "com.google.protobuf:protoc:${protocVersion}"
+    }
   }
   plugins {
     grpc {

examples/gradle-ts-protoc-gen/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

examples/gradle-ts-protoc-gen/package-lock.json

@@ -22,23 +22,23 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@grpc/grpc-js": "^1.2.2",
-    "google-protobuf": "^3.14.0"
+    "@grpc/grpc-js": "^1.3.1",
+    "google-protobuf": "^3.17.0"
   },
   "devDependencies": {
     "@tsconfig/node12": "^1.0.7",
-    "@types/google-protobuf": "^3.7.4",
-    "@types/node": "^14.14.14",
-    "@typescript-eslint/eslint-plugin": "^4.10.0",
-    "@typescript-eslint/parser": "^4.10.0",
-    "eslint": "^7.15.0",
-    "eslint-config-prettier": "^7.0.0",
+    "@types/google-protobuf": "^3.15.2",
+    "@types/node": "^15.0.3",
+    "@typescript-eslint/eslint-plugin": "^4.23.0",
+    "@typescript-eslint/parser": "^4.23.0",
+    "eslint": "^7.26.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.3.0",
-    "grpc-tools": "^1.10.0",
-    "prettier": "^2.2.1",
-    "ts-protoc-gen": "^0.14.0",
-    "typescript": "^4.1.3"
+    "eslint-plugin-prettier": "^3.4.0",
+    "grpc-tools": "^1.11.1",
+    "prettier": "^2.3.0",
+    "ts-protoc-gen": "^0.15.0",
+    "typescript": "^4.2.4"
   },
   "eslintConfig": {
     "ignorePatterns": [
@@ -57,7 +57,6 @@
     },
     "extends": [
       "plugin:@typescript-eslint/recommended",
-      "prettier/@typescript-eslint",
       "plugin:prettier/recommended"
     ]
   },

examples/gradle-ts-protoc-gen/package.json

@@ -2,11 +2,14 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;

examples/gradle-ts-protoc-gen/proto/example_pb.js

@@ -19,6 +19,9 @@ Install dependencies:
 
 ```sh
 npm install
+
+# Apple M1 users should install for x64 due to grpc-tools not supporting arm64
+npm i --target_arch=x64
 ```
 
 Use [`@grpc/proto-loader`](https://www.npmjs.com/package/@grpc/proto-loader) to generate the TypeScript files:

examples/grpc-proto-loader/README.md

@@ -5,9 +5,9 @@ import { ServerMessage } from './proto/example_package/ServerMessage';
 
 const host = '0.0.0.0:9090';
 const packageDefinition = protoLoader.loadSync('./proto/example.proto');
-const proto = (grpc.loadPackageDefinition(
+const proto = grpc.loadPackageDefinition(
   packageDefinition
-) as unknown) as ProtoGrpcType;
+) as unknown as ProtoGrpcType;
 
 const client = new proto.example_package.Example(
   host,