Remove carve out for protoc on aarch64 now that the akka grpc plugin has been updated (#4384)

This commit is contained in:
Chris Stewart 2022-06-13 12:14:11 -05:00 committed by GitHub
parent c2d8735dd7
commit cbeae5cdbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -56,17 +56,6 @@ object CommonSettings {
Test / console / scalacOptions ++= (Compile / console / scalacOptions).value,
Test / scalacOptions ++= testCompilerOpts(scalaVersion.value),
licenses += ("MIT", url("http://opensource.org/licenses/MIT")),
//you need to build protoc manually to get it working on the new
//mac m1 chip. For instructions on how to do so see
//see: https://github.com/scalapb/ScalaPB/issues/1024
PB.protocExecutable := (
if (protocbridge.SystemDetector.detectedClassifier() == "osx-aarch_64")
file(
"/usr/local/bin/protoc"
) // to change if needed, this is where protobuf manual compilation put it for me
else
PB.protocExecutable.value
),
assembly / test := {}
)