Skip to content

Commit 6569b97

Browse files
committed
Run Scalafmt
1 parent 62c2f8d commit 6569b97

File tree

3 files changed

+31
-21
lines changed

3 files changed

+31
-21
lines changed

build.sbt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,7 @@ lazy val cli = project
240240
// Pre-download Java 8, 11 and 17.
241241
run("coursier", "java-home", "--jvm", "8")
242242
run("coursier", "java-home", "--jvm", "11")
243-
run(
244-
"coursier",
245-
"java-home",
246-
"--jvm",
247-
"17"
248-
)
243+
run("coursier", "java-home", "--jvm", "17")
249244

250245
// Install `scip-java` binary.
251246
add(script, "/usr/local/bin/scip-java")

project/JavaToolchainPlugin.scala

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ object JavaToolchainPlugin extends AutoPlugin {
7878
(getJavaHome("8") / "jre" / "lib" / "rt.jar").toString
7979
}
8080

81-
8281
private val javaHomeCache: util.Map[String, File] = Collections
8382
.synchronizedMap(new util.HashMap[String, File]())
8483
private def getJavaHome(
@@ -93,19 +92,31 @@ object JavaToolchainPlugin extends AutoPlugin {
9392
.toList
9493
.flatMap(index => "--jvm-index" :: index :: Nil)
9594
val arguments =
96-
List("java", "-jar", coursier.toString, "java-home", "--jvm", v, "--architecture", jvmArchitecture(v)) ++
97-
index
95+
List(
96+
"java",
97+
"-jar",
98+
coursier.toString,
99+
"java-home",
100+
"--jvm",
101+
v,
102+
"--architecture",
103+
jvmArchitecture(v)
104+
) ++ index
98105
new File(Process(arguments).!!.trim)
99106
}
100107
)
101108
}
102109

103110
private def jvmArchitecture(jvmVersion: String): String =
104-
if (scala.util.Properties.isMac && sys.props("os.arch") == "aarch64") "amd64"
105-
else defaultCoursierJVMArchitecture
106-
def defaultCoursierJVMArchitecture: String =
107-
sys.props("os.arch") match{
108-
case "x86_64" => "amd64"
109-
case x => x
111+
if (scala.util.Properties.isMac && sys.props("os.arch") == "aarch64")
112+
"amd64"
113+
else
114+
defaultCoursierJVMArchitecture
115+
def defaultCoursierJVMArchitecture: String =
116+
sys.props("os.arch") match {
117+
case "x86_64" =>
118+
"amd64"
119+
case x =>
120+
x
110121
}
111122
}

scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -533,12 +533,16 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) {
533533
}
534534

535535
private def jvmArchitecture: String =
536-
if (scala.util.Properties.isMac && sys.props("os.arch") == "aarch64") "amd64"
537-
else defaultCoursierJVMArchitecture
538-
def defaultCoursierJVMArchitecture: String =
539-
sys.props("os.arch") match{
540-
case "x86_64" => "amd64"
541-
case x => x
536+
if (scala.util.Properties.isMac && sys.props("os.arch") == "aarch64")
537+
"amd64"
538+
else
539+
defaultCoursierJVMArchitecture
540+
def defaultCoursierJVMArchitecture: String =
541+
sys.props("os.arch") match {
542+
case "x86_64" =>
543+
"amd64"
544+
case x =>
545+
x
542546
}
543547

544548
private def clean(): Unit = {

0 commit comments

Comments
 (0)