From 3b0268a75d969559de1419f81790e5e0622e7ce9 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 12 Jul 2021 01:15:56 -0400 Subject: [PATCH] Remove reference to OriginalTreeAttachment in Scala 2.12 bridge --- .../src/main/scala-2.12/xsbt/Compat.scala | 9 +++++---- .../source-dependencies/constants/{test => disabled} | 0 zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala | 2 ++ .../src/test/scala/sbt/inc/IncrementalCompilerSpec.scala | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) rename zinc/src/sbt-test/source-dependencies/constants/{test => disabled} (100%) diff --git a/internal/compiler-bridge/src/main/scala-2.12/xsbt/Compat.scala b/internal/compiler-bridge/src/main/scala-2.12/xsbt/Compat.scala index 13c9d77249..a9c129a13b 100644 --- a/internal/compiler-bridge/src/main/scala-2.12/xsbt/Compat.scala +++ b/internal/compiler-bridge/src/main/scala-2.12/xsbt/Compat.scala @@ -22,10 +22,11 @@ abstract class Compat { /** If given tree contains object tree attachment calls func on tree from attachment. */ protected def processOriginalTreeAttachment(in: Tree)(func: Tree => Unit): Unit = { - import analyzer._ - in.attachments.get[OriginalTreeAttachment].foreach { a => - func(a.original) - } + // We can't until we figure out how to conditionally do this for Scala 2.12.3+ + // import analyzer._ + // in.attachments.get[OriginalTreeAttachment].foreach { a => + // func(a.original) + // } } } object Compat { diff --git a/zinc/src/sbt-test/source-dependencies/constants/test b/zinc/src/sbt-test/source-dependencies/constants/disabled similarity index 100% rename from zinc/src/sbt-test/source-dependencies/constants/test rename to zinc/src/sbt-test/source-dependencies/constants/disabled diff --git a/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala b/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala index 8fafc985bc..7a332ab9ac 100644 --- a/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala +++ b/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala @@ -49,6 +49,8 @@ class BaseCompilerSpec extends BridgeProviderSpecification { implicit class ProjectSetupOps(setup: ProjectSetup) { def createCompiler(): CompilerSetup = setup.createCompiler(scalaVersion, incOptions) + def createCompiler(scalaVersion: String): CompilerSetup = + setup.createCompiler(scalaVersion, incOptions) private def createCompiler(sv: String, incOptions: IncOptions): CompilerSetup = { val si = scalaInstance(sv, setup.baseDir, Logger.Null) diff --git a/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala b/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala index 90501bf5b9..eb4afca004 100644 --- a/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala +++ b/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala @@ -192,7 +192,7 @@ class IncrementalCompilerSpec extends BaseCompilerSpec { it should "track dependencies on constants" in withTmpDir { tmp => val project = VirtualSubproject(tmp.toPath / "p1") - val comp = project.setup.createCompiler() + val comp = project.setup.createCompiler("2.13.6") try { val s1 = "object A { final val i = 1 }" val s1b = "object A { final val i = 2 }"