diff --git a/polyglot/csharp/Wechaty.Grpc/proto/protoc-gen-openapiv2/options/annotations.proto b/polyglot/csharp/Wechaty.Grpc/proto/google/api/annotations.proto similarity index 100% rename from polyglot/csharp/Wechaty.Grpc/proto/protoc-gen-openapiv2/options/annotations.proto rename to polyglot/csharp/Wechaty.Grpc/proto/google/api/annotations.proto diff --git a/polyglot/csharp/Wechaty.Grpc/proto/protoc-gen-openapiv2/options/openapiv2.proto b/polyglot/csharp/Wechaty.Grpc/proto/google/api/openapiv2.proto similarity index 100% rename from polyglot/csharp/Wechaty.Grpc/proto/protoc-gen-openapiv2/options/openapiv2.proto rename to polyglot/csharp/Wechaty.Grpc/proto/google/api/openapiv2.proto diff --git a/scripts/install-protoc.sh b/scripts/install-protoc.sh index 1fbd1aec..3b5bbbae 100755 --- a/scripts/install-protoc.sh +++ b/scripts/install-protoc.sh @@ -32,14 +32,10 @@ function check_protoc_version () { majorVer=$(echo $protocVersion | cut -d. -f 1) minorVer=$(echo $protocVersion | cut -d. -f 2) - (($majorVer == 3)) || { - echo "protoc major version must >= 3 (the installed version is $protocVersion)" - exit 1 - } - # https://github.com/wechaty/grpc/issues/109 - (($minorVer >= 17)) || { - echo "protoc minor version must >= 17 (the installed version is $protocVersion)" + + ((($majorVer == 3 && $minorVer >= 17) || $majorVer > 3)) || { + echo "protoc version must >= 3.17 (the installed version is $protocVersion)" exit 1 } diff --git a/tsconfig.json b/tsconfig.json index ba146f79..ec760206 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,6 +2,9 @@ "extends": "@chatie/tsconfig", "compilerOptions": { "outDir": "dist/esm", + "verbatimModuleSyntax": false, + // See: https://github.com/wechaty/wechaty/issues/2551 + "ignoreDeprecations": "5.0" }, "exclude": [ "node_modules/",