summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Mélois <olivier.melois@disneystreaming.com>2019-10-03 11:13:07 +0200
committerTobias Roeser <le.petit.fou@web.de>2019-10-03 11:13:07 +0200
commit4d0ecc75a64d1de2965c43904c40ce70cd02e3af (patch)
tree1f5be70a71896e954c506b5affdb48fadaef446c
parent9f8f354dfcf1bed2434b02f2a41148af9c0321b6 (diff)
downloadmill-4d0ecc75a64d1de2965c43904c40ce70cd02e3af.tar.gz
mill-4d0ecc75a64d1de2965c43904c40ce70cd02e3af.tar.bz2
mill-4d0ecc75a64d1de2965c43904c40ce70cd02e3af.zip
Removes semanticdb settings (#705)
Bloop 1.3.3 can assume the responsibility of finding the semanticdb plugin and setting the relevant options in the compiler, which means we don't have to do it ourselves anymore to accommodate metals users. See https://github.com/scalameta/metals/pull/852
-rw-r--r--contrib/bloop/src/mill.contrib.bloop/BloopImpl.scala37
-rw-r--r--contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala4
2 files changed, 2 insertions, 39 deletions
diff --git a/contrib/bloop/src/mill.contrib.bloop/BloopImpl.scala b/contrib/bloop/src/mill.contrib.bloop/BloopImpl.scala
index 13255e42..23523bf9 100644
--- a/contrib/bloop/src/mill.contrib.bloop/BloopImpl.scala
+++ b/contrib/bloop/src/mill.contrib.bloop/BloopImpl.scala
@@ -129,33 +129,6 @@ class BloopImpl(ev: () => Evaluator, wd: Path) extends ExternalModule { outer =>
bloopDir / s"${name(module)}.json"
//////////////////////////////////////////////////////////////////////////////
- // SemanticDB related configuration
- //////////////////////////////////////////////////////////////////////////////
-
- // Version of the semanticDB plugin.
- def semanticDBVersion: String = "4.2.3"
-
- // Scala versions supported by semantic db. Needs to be updated when
- // bumping semanticDBVersion.
- // See [https://github.com/scalameta/metals/blob/82acc8bff0884800d601170b2a1aefa4e38b5a9a/build.sbt#L151]
- def semanticDBSupported = Set(
- "2.13.1",
- "2.13.0",
- "2.12.10",
- "2.12.9",
- "2.12.8",
- "2.12.7",
- "2.11.12"
- )
-
- // Recommended for metals usage.
- def semanticDBOptions = List(
- s"-P:semanticdb:sourceroot:$pwd",
- "-P:semanticdb:synthetics:on",
- "-P:semanticdb:failures:warning"
- )
-
- //////////////////////////////////////////////////////////////////////////////
// Computation of the bloop configuration for a specific module
//////////////////////////////////////////////////////////////////////////////
@@ -173,20 +146,14 @@ class BloopImpl(ev: () => Evaluator, wd: Path) extends ExternalModule { outer =>
val scalaConfig = module match {
case s: ScalaModule =>
- val semanticDb = s.resolveDeps(s.scalaVersion.map {
- case scalaV if semanticDBSupported(scalaV) =>
- Agg(ivy"org.scalameta:semanticdb-scalac_$scalaV:$semanticDBVersion")
- case _ => Agg()
- })
-
T.task {
- val pluginCp = semanticDb() ++ s.scalacPluginClasspath()
+ val pluginCp = s.scalacPluginClasspath()
val pluginOptions = pluginCp.map { pathRef =>
s"-Xplugin:${pathRef.path}"
}
val allScalacOptions =
- (s.scalacOptions() ++ pluginOptions ++ semanticDBOptions).toList
+ (s.scalacOptions() ++ pluginOptions).toList
Some(
BloopConfig.Scala(
organization = "org.scala-lang",
diff --git a/contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala b/contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala
index 0af93c46..d6c694c0 100644
--- a/contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala
+++ b/contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala
@@ -83,14 +83,10 @@ object BloopTests extends TestSuite {
val platform = p.platform.get.name
val mainCLass = p.platform.get.mainClass.get
val resolution = p.resolution.get.modules
- val sdb = testBloop.semanticDBVersion
- val sdbOpts = testBloop.semanticDBOptions
assert(name == "scalaModule")
assert(sources == List(workdir / "scalaModule" / "src"))
assert(options.contains("-language:higherKinds"))
- assert(options.exists(_.contains(s"semanticdb-scalac_2.12.8-$sdb.jar")))
- assert(sdbOpts.forall(options.contains))
assert(version == "2.12.8")
assert(classpath.exists(_.contains("bloop-config_2.12-1.2.5.jar")))
assert(platform == "jvm")