From 934c28ee7b2835d1eb8e742a1fdc9fb73328d828 Mon Sep 17 00:00:00 2001 From: farees Date: Wed, 6 Oct 2021 17:45:07 +0530 Subject: [PATCH 1/3] Added local property condition for M1 Mac --- model/build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/model/build.gradle b/model/build.gradle index 5030ef8bebf..01715d8bab6 100644 --- a/model/build.gradle +++ b/model/build.gradle @@ -3,7 +3,11 @@ apply plugin: 'com.google.protobuf' protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.8.0' + if (project.rootProject.hasProperty('protobuf_platform')) { // Only for M1 Mac. + artifact = "com.google.protobuf:protoc:3.8.0:${project.rootProject.property("protobuf_platform")}" + } else { + artifact = "com.google.protobuf:protoc:3.8.0" + } } generateProtoTasks { all().each { task -> From 409e8458df700ddf822b98e7db85f15bec967af2 Mon Sep 17 00:00:00 2001 From: farees Date: Sat, 9 Oct 2021 09:04:32 +0530 Subject: [PATCH 2/3] Added comment --- model/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/model/build.gradle b/model/build.gradle index 01715d8bab6..5a7c0ae64f2 100644 --- a/model/build.gradle +++ b/model/build.gradle @@ -3,7 +3,9 @@ apply plugin: 'com.google.protobuf' protobuf { protoc { - if (project.rootProject.hasProperty('protobuf_platform')) { // Only for M1 Mac. + // To build protoc in M1 mac. For Context, see: + // https://github.com/grpc/grpc-java/issues/7690. + if (project.rootProject.hasProperty('protobuf_platform')) { artifact = "com.google.protobuf:protoc:3.8.0:${project.rootProject.property("protobuf_platform")}" } else { artifact = "com.google.protobuf:protoc:3.8.0" From 77ca3a164de2c55024d22679988f0353525a15f0 Mon Sep 17 00:00:00 2001 From: Farees Hussain Date: Tue, 12 Oct 2021 21:49:26 +0530 Subject: [PATCH 3/3] Update model/build.gradle Co-authored-by: Ben Henning --- model/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/model/build.gradle b/model/build.gradle index 5a7c0ae64f2..d0538e8224d 100644 --- a/model/build.gradle +++ b/model/build.gradle @@ -3,8 +3,7 @@ apply plugin: 'com.google.protobuf' protobuf { protoc { - // To build protoc in M1 mac. For Context, see: - // https://github.com/grpc/grpc-java/issues/7690. + // To build protoc in M1 mac. For context, see: #3912. if (project.rootProject.hasProperty('protobuf_platform')) { artifact = "com.google.protobuf:protoc:3.8.0:${project.rootProject.property("protobuf_platform")}" } else {