From 47d10d6d72d238c8431e67a5cbd6e3a149269864 Mon Sep 17 00:00:00 2001
From: ckipp01 <ckipp@pm.me>
Date: Wed, 14 Dec 2022 20:59:30 +0100
Subject: [PATCH] refactor: start using newly published bloop-gradle

---
 build.sbt                                                | 2 ++
 .../scala/meta/internal/builds/GradleBuildTool.scala     | 9 +++++----
 project/V.scala                                          | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index c5d9f48bd0d..4ad19fab7a7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -446,6 +446,7 @@ lazy val metals = project
       "sbtBloopVersion" -> V.sbtBloop,
       "gradleBloopVersion" -> V.gradleBloop,
       "mavenBloopVersion" -> V.mavenBloop,
+      "gradleBloopVersion" -> V.gradleBloop,
       "scalametaVersion" -> V.scalameta,
       "semanticdbVersion" -> V.semanticdb,
       "javaSemanticdbVersion" -> V.javaSemanticdb,
@@ -648,6 +649,7 @@ lazy val metalsDependencies = project
       "com.lihaoyi" % "mill-contrib-testng" % V.mill,
       "org.virtuslab.scala-cli" % "cli_3" % V.scalaCli intransitive (),
       "ch.epfl.scala" % "bloop-maven-plugin" % V.mavenBloop,
+      "ch.epfl.scala" %% "gradle-bloop" % V.gradleBloop,
     ),
   )
   .disablePlugins(ScalafixPlugin)
diff --git a/metals/src/main/scala/scala/meta/internal/builds/GradleBuildTool.scala b/metals/src/main/scala/scala/meta/internal/builds/GradleBuildTool.scala
index 8e868be99e8..4efd0d82173 100644
--- a/metals/src/main/scala/scala/meta/internal/builds/GradleBuildTool.scala
+++ b/metals/src/main/scala/scala/meta/internal/builds/GradleBuildTool.scala
@@ -6,6 +6,7 @@ import java.nio.file.Path
 
 import scala.util.Properties
 
+import scala.meta.internal.metals.BuildInfo
 import scala.meta.internal.metals.UserConfiguration
 import scala.meta.io.AbsolutePath
 
@@ -14,14 +15,15 @@ case class GradleBuildTool(userConfig: () => UserConfiguration)
     with BloopInstallProvider {
 
   private val initScriptName = "init-script.gradle"
-  private def initScript(versionToUse: String) =
+  private val gradleBloopVersion = BuildInfo.gradleBloopVersion
+  private val initScript =
     s"""
        |initscript {
        |  repositories{
        |    mavenCentral()
        |  }
        |  dependencies {
-       |    classpath 'ch.epfl.scala:gradle-bloop_2.12:$versionToUse'
+       |    classpath 'ch.epfl.scala:gradle-bloop_2.12:$gradleBloopVersion'
        |  }
        |}
        |allprojects {
@@ -30,8 +32,7 @@ case class GradleBuildTool(userConfig: () => UserConfiguration)
     """.stripMargin.getBytes()
 
   private lazy val initScriptPath: Path = {
-    val bloopVersion = userConfig().currentBloopVersion
-    Files.write(tempDir.resolve(initScriptName), initScript(bloopVersion))
+    Files.write(tempDir.resolve(initScriptName), initScript)
   }
 
   private lazy val gradleWrapper = {
diff --git a/project/V.scala b/project/V.scala
index 8111a04aab0..d70a3611a8d 100644
--- a/project/V.scala
+++ b/project/V.scala
@@ -21,7 +21,7 @@ object V {
   val coursierInterfaces = "1.0.11"
   val debugAdapter = "3.0.4"
   val genyVersion = "0.7.1"
-  val gradleBloop = bloop
+  val gradleBloop = "1.5.7-RC1"
   val java8Compat = "1.0.2"
   val javaSemanticdb = "0.7.4"
   val jsoup = "1.15.3"