Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v2.3.4
- uses: actions/setup-node@v2.1.4
with:
node-version: 15
node-version: 16
- uses: actions/setup-java@v1
with:
java-version: 15
Expand Down
3 changes: 3 additions & 0 deletions examples/gradle-ts-protoc-gen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 8 additions & 4 deletions examples/gradle-ts-protoc-gen/build.gradle
Original file line number Diff line number Diff line change
@@ -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()
}

Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Loading