Skip to content

Commit e9a0087

Browse files
maltekmalteharness
andauthored
enforce consistent scala syntax (curly braces) and fix proto build on aarch64 (#1837)
* enforce consistent scala syntax (curly braces) * fix protoc download for aarch64 --------- Co-authored-by: Malte Kraus <malte.kraus@harness.io>
1 parent a494515 commit e9a0087

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ ThisBuild / scalacOptions ++= Seq(
6262
// "-explain",
6363
// "-Xfatal-warnings",
6464
// "-Wconf:cat=deprecation:w,any:e",
65-
"-language:implicitConversions"
65+
"-language:implicitConversions",
66+
"-old-syntax",
67+
"-no-indent"
6668
)
6769

6870
ThisBuild / javacOptions ++= Seq(

proto-bindings/build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ enablePlugins(ProtobufPlugin)
66
val protocLocalDir = "protoc"
77
val protocBinaryPath = s"$protocLocalDir/bin/protoc"
88
ProtobufConfig / protobufProtoc := protocBinaryPath
9-
ProtobufConfig / version := "3.18.0"
9+
ProtobufConfig / version := "3.20.1"
1010
ProtobufConfig / sourceDirectories += (ProtobufConfig / protobufExternalIncludePath).value
1111
ProtobufConfig / protobufGenerate := (ProtobufConfig / protobufGenerate)
1212
.dependsOn(copyLatestCpgProto)
@@ -35,7 +35,9 @@ installProtoc := {
3535
if (!isAlreadyInstalled) {
3636
val platform = (System.getProperty("os.name"), System.getProperty("os.arch")) match {
3737
case ("Linux", "amd64") => "linux-x86_64"
38+
case ("Linux", "aarch64") => "linux-aarch_64"
3839
case (name, "amd64") if name.startsWith("Windows") => "win64"
40+
case ("Mac OS X", "aarch64") => "osx-aarch_64"
3941
case (name, arch) if name.toLowerCase.contains("mac") && arch.contains("64") => "osx-x86_64"
4042
case (name, arch) =>
4143
throw new AssertionError(

0 commit comments

Comments
 (0)