Skip to content

Commit

Permalink
Merge branch 'mac-m1-compatibility' into 'dev'
Browse files Browse the repository at this point in the history
mac m1 compatibility

See merge request waves-enterprise/java-sdk/we-node-client!15
  • Loading branch information
Daniil Georgiev committed Oct 7, 2022
2 parents ce204da + 984dc44 commit 606fa86
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions we-node-client-grpc/we-node-client-grpc-java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.google.protobuf.gradle.protoc
val protobufVersion: String by project
val ioGrpcVersion: String by project
val ioGrpcKotlinVersion: String by project
val osxArch: String? by project

plugins {
id("com.google.protobuf")
Expand All @@ -34,13 +35,15 @@ val grpcJavaPlugin = "grpc"
protobuf {
generatedFilesBaseDir = "$buildDir/generated-sources"

val archPostFix = if (osxArch == "m1") ":osx-x86_64" else ""

protoc {
artifact = "com.google.protobuf:protoc:$protobufVersion"
artifact = "com.google.protobuf:protoc:$protobufVersion$archPostFix"
}

plugins {
id(grpcJavaPlugin) {
artifact = "io.grpc:protoc-gen-grpc-java:$ioGrpcVersion"
artifact = "io.grpc:protoc-gen-grpc-java:$ioGrpcVersion$archPostFix"
}
}

Expand Down

0 comments on commit 606fa86

Please sign in to comment.