From 0217a74a0fa397f6c56837c19d2b011722db14e2 Mon Sep 17 00:00:00 2001 From: Haruki Okada Date: Wed, 9 Mar 2022 23:47:08 +0900 Subject: [PATCH] After protobuf plugin upgrade, workaround is no longer necessary --- protocol/build.gradle | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/protocol/build.gradle b/protocol/build.gradle index e9c9dd85..54ce320c 100644 --- a/protocol/build.gradle +++ b/protocol/build.gradle @@ -6,18 +6,9 @@ dependencies { shade "com.google.protobuf:protobuf-java:$protobufVersion" } -// As of Dec 2020, protoc binary for Apple silicon hasn't been published yet. -// (refs: https://github.com/protocolbuffers/protobuf/issues/8062) -// To workaround that, override the classifier to x86_64 explicitly on arm64 mac. -// (Should work thanks to Rosetta 2) -def classifier = '' -if ('osx-aarch_64'.equals(osdetector.classifier)) { - classifier = 'osx-x86_64' -} - protobuf { protoc { - artifact = "com.google.protobuf:protoc:$protobufVersion:$classifier" + artifact = "com.google.protobuf:protoc:$protobufVersion" } }