Make the build work on Apple M1 chips

Previously, the build failed to load on M1 computers because Coursier
failed to fetch Java home for JVM version 8. Now, we force Coursier to
use amd64 instead of aarch64. This may result in slightly slower builds,
but it's a big improvement by the fact that the build loads and works
correctly now.

Author: olafurpg

bin/coursier

@@ -8,7 +8,7 @@ import scala.util.control.NoStackTrace
 
 lazy val V =
   new {
-    val protobuf = "3.15.6"
+    val protobuf = "3.21.4"
     val coursier = "2.0.8"
     val bloop = "1.4.7"
     val bsp = "2.0.0-M13"
@@ -37,6 +37,7 @@ inThisBuild(
     organization := "com.sourcegraph",
     homepage := Some(url("https://github.com/sourcegraph/scip-java")),
     dynverSeparator := "-",
+    PB.protocVersion := V.protobuf,
     licenses :=
       List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
     developers :=
@@ -243,9 +244,7 @@ lazy val cli = project
           "coursier",
           "java-home",
           "--jvm",
-          "temurin:17",
-          "--jvm-index",
-          "https://github.com/coursier/jvm-index/blob/master/index.json"
+          "17"
         )
 
         // Install `scip-java` binary.
@@ -332,9 +331,7 @@ lazy val minimized17 = project
   .in(file("tests/minimized/.j17"))
   .settings(
     minimizedSettings,
-    javaToolchainJvmIndex :=
-      Some("https://github.com/coursier/jvm-index/blob/master/index.json"),
-    javaToolchainVersion := "temurin:17",
+    javaToolchainVersion := "17",
     javacOptions ++= javacModuleOptions
   )
   .dependsOn(agent, plugin)

build.sbt

@@ -67,7 +67,7 @@ object JavaToolchainPlugin extends AutoPlugin {
     // The tools.jar file includes the bytecode for the Java compiler in the com.sun.source package.
     // The Java compiler is available by default in Java 9+, so we only need to add tools.jar to the
     // bootclasspath for Java 8.
-    if (home.toString.contains("1.8") && toolsJar.isFile) {
+    if (version == "8" && toolsJar.isFile) {
       List(s"-Xbootclasspath/p:$toolsJar")
     } else {
       List()
@@ -78,6 +78,7 @@ object JavaToolchainPlugin extends AutoPlugin {
     (getJavaHome("8") / "jre" / "lib" / "rt.jar").toString
   }
 
+
   private val javaHomeCache: util.Map[String, File] = Collections
     .synchronizedMap(new util.HashMap[String, File]())
   private def getJavaHome(
@@ -92,10 +93,19 @@ object JavaToolchainPlugin extends AutoPlugin {
           .toList
           .flatMap(index => "--jvm-index" :: index :: Nil)
         val arguments =
-          List("java", "-jar", coursier.toString, "java-home", "--jvm", v) ++
+          List("java", "-jar", coursier.toString, "java-home", "--jvm", v, "--architecture", jvmArchitecture(v)) ++
             index
         new File(Process(arguments).!!.trim)
       }
     )
   }
+
+  private def jvmArchitecture(jvmVersion: String): String =
+    if (scala.util.Properties.isMac && sys.props("os.arch") == "aarch64") "amd64"
+    else defaultCoursierJVMArchitecture
+ def defaultCoursierJVMArchitecture: String =
+    sys.props("os.arch") match{
+      case "x86_64" => "amd64"
+      case x => x
+    }
 }

project/JavaToolchainPlugin.scala

@@ -503,8 +503,8 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) {
           "java-home",
           "--jvm",
           config.jvm,
-          "--jvm-index",
-          "https://github.com/coursier/jvm-index/blob/master/index.json"
+          "--architecture",
+          jvmArchitecture
         )
         .call()
         .out
@@ -532,6 +532,15 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) {
       Failure(SubprocessException(result))
   }
 
+  private def jvmArchitecture: String =
+    if (scala.util.Properties.isMac && sys.props("os.arch") == "aarch64") "amd64"
+    else defaultCoursierJVMArchitecture
+ def defaultCoursierJVMArchitecture: String =
+    sys.props("os.arch") match{
+      case "x86_64" => "amd64"
+      case x => x
+    }
+
   private def clean(): Unit = {
     Files.walkFileTree(targetroot, new DeleteVisitor)
   }