Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

After protobuf plugin upgrade, workaround is no longer necessary #148

Merged
merged 1 commit into from Mar 10, 2022
Merged

After protobuf plugin upgrade, workaround is no longer necessary #148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 1 addition & 10 deletions protocol/build.gradle
View file
Open in desktop
Expand Up @@ -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"
}
}