From e3560e4ed6ca153e3027542f07ad4298d86408ac Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 5 May 2016 23:37:31 -0400 Subject: [PATCH] Old incremental compiler is no more --- .../inherited-dependencies/A.scala | 4 --- .../inherited-dependencies/B.scala | 19 ---------- .../inherited-dependencies/C.scala | 1 - .../inherited-dependencies/D.scala | 1 - .../inherited-dependencies/E.scala | 1 - .../inherited-dependencies/F.scala | 3 -- .../inherited-dependencies/G.scala | 1 - .../inherited-dependencies/J.scala | 1 - .../inherited-dependencies/build.sbt | 36 ------------------- .../inherited-dependencies/test | 1 - .../inherited-deps-java/A.java | 1 - .../inherited-deps-java/B.java | 11 ------ .../inherited-deps-java/C.java | 1 - .../inherited-deps-java/D.java | 1 - .../inherited-deps-java/E.java | 1 - .../inherited-deps-java/F.java | 3 -- .../inherited-deps-java/G.java | 3 -- .../inherited-deps-java/J.java | 1 - .../inherited-deps-java/build.sbt | 30 ---------------- .../inherited-deps-java/test | 1 - .../inherited-macros/build.sbt | 22 ------------ .../inherited-macros/changes/Client.scala | 7 ---- .../inherited-macros/macro-client/build.sbt | 9 ----- .../macro-client/src/main/scala/Client.scala | 7 ---- .../macro-client/src/main/scala/Foo.scala | 5 --- .../src/main/scala/Provider.scala | 7 ---- .../source-dependencies/inherited-macros/test | 12 ------- 27 files changed, 190 deletions(-) delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-dependencies/A.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-dependencies/B.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-dependencies/C.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-dependencies/D.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-dependencies/E.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-dependencies/F.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-dependencies/G.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-dependencies/J.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-dependencies/build.sbt delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-dependencies/test delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-deps-java/A.java delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-deps-java/B.java delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-deps-java/C.java delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-deps-java/D.java delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-deps-java/E.java delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-deps-java/F.java delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-deps-java/G.java delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-deps-java/J.java delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-deps-java/test delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-macros/build.sbt delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-macros/changes/Client.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-macros/macro-client/build.sbt delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-macros/macro-client/src/main/scala/Client.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-macros/macro-client/src/main/scala/Foo.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-macros/macro-provider/src/main/scala/Provider.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited-macros/test diff --git a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/A.scala b/sbt/src/sbt-test/source-dependencies/inherited-dependencies/A.scala deleted file mode 100644 index 30853bb78..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/A.scala +++ /dev/null @@ -1,4 +0,0 @@ -// T is a type constructor [x]C -// C extends D -// E verifies the core type gets pulled out -trait A extends B.T[Int] with (E[Int] @unchecked) diff --git a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/B.scala b/sbt/src/sbt-test/source-dependencies/inherited-dependencies/B.scala deleted file mode 100644 index 48082cf78..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/B.scala +++ /dev/null @@ -1,19 +0,0 @@ -object B { - type T[x] = C -} - -class B { - // not public, so this shouldn't be tracked as an inherited dependency - private[this] class X extends D with E[Int] - - def x(i: Int): Unit = { - // not public, not an inherited dependency - trait Y extends D - } - - def y(j: Int): Unit = { - // not public - val w: D { def length: Int } = ??? - () - } -} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/C.scala b/sbt/src/sbt-test/source-dependencies/inherited-dependencies/C.scala deleted file mode 100644 index 360899d9f..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/C.scala +++ /dev/null @@ -1 +0,0 @@ -trait C extends D diff --git a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/D.scala b/sbt/src/sbt-test/source-dependencies/inherited-dependencies/D.scala deleted file mode 100644 index 804e77004..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/D.scala +++ /dev/null @@ -1 +0,0 @@ -trait D extends G.P diff --git a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/E.scala b/sbt/src/sbt-test/source-dependencies/inherited-dependencies/E.scala deleted file mode 100644 index fa7c94867..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/E.scala +++ /dev/null @@ -1 +0,0 @@ -trait E[T] diff --git a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/F.scala b/sbt/src/sbt-test/source-dependencies/inherited-dependencies/F.scala deleted file mode 100644 index 8c26474b5..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/F.scala +++ /dev/null @@ -1,3 +0,0 @@ -class F { - def q: C { def length: Int } = ??? -} \ No newline at end of file diff --git a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/G.scala b/sbt/src/sbt-test/source-dependencies/inherited-dependencies/G.scala deleted file mode 100644 index 1fd92c068..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/G.scala +++ /dev/null @@ -1 +0,0 @@ -object G { trait P extends J } \ No newline at end of file diff --git a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/J.scala b/sbt/src/sbt-test/source-dependencies/inherited-dependencies/J.scala deleted file mode 100644 index 62eeb6c96..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/J.scala +++ /dev/null @@ -1 +0,0 @@ -class J \ No newline at end of file diff --git a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/build.sbt b/sbt/src/sbt-test/source-dependencies/inherited-dependencies/build.sbt deleted file mode 100644 index 5bab26a24..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/build.sbt +++ /dev/null @@ -1,36 +0,0 @@ -// this test is specific to the old incremental compilation algorithm -incOptions := incOptions.value.withNameHashing(false) - -lazy val verifyDeps = taskKey[Unit]("verify inherited dependencies are properly extracted") - -verifyDeps := { - val a = compile.in(Compile).value match { case a: Analysis => a } - val baseDir = baseDirectory.value - def relative(f: java.io.File): java.io.File = f.relativeTo(baseDir) getOrElse f - def toFile(s: String) = relative(baseDir / (s + ".scala")) - def inheritedDeps(name: String): Set[File] = { - val file = (baseDir / (name + ".scala")).getAbsoluteFile - val absoluteFiles = a.relations.publicInherited.internal.forward(file) - absoluteFiles.map(relative) - } - val ADeps = Set("C", "D", "E", "G", "J").map(toFile) - same(inheritedDeps("A"), ADeps) - val BDeps = Set.empty[File] - same(inheritedDeps("B"), BDeps) - val CDeps = Set("D", "G", "J").map(toFile) - same(inheritedDeps("C"), CDeps) - val DDeps = Set("G", "J").map(toFile) - same(inheritedDeps("D"), DDeps) - val EDeps = Set.empty[File] - same(inheritedDeps("E"), EDeps) - val FDeps = Set("C", "D", "G", "J").map(toFile) - same(inheritedDeps("F"), FDeps) - val GDeps = Set("J").map(toFile) - same(inheritedDeps("G"), GDeps) - val JDeps = Set.empty[File] - same(inheritedDeps("J"), JDeps) -} - -def same[T](x: T, y: T): Unit = { - assert(x == y, s"\nActual: $x, \nExpected: $y") -} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/test b/sbt/src/sbt-test/source-dependencies/inherited-dependencies/test deleted file mode 100644 index e5d477601..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-dependencies/test +++ /dev/null @@ -1 +0,0 @@ -> verifyDeps diff --git a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/A.java b/sbt/src/sbt-test/source-dependencies/inherited-deps-java/A.java deleted file mode 100644 index 894125a7e..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/A.java +++ /dev/null @@ -1 +0,0 @@ -class A implements B.T, E {} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/B.java b/sbt/src/sbt-test/source-dependencies/inherited-deps-java/B.java deleted file mode 100644 index 6b54edc7d..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/B.java +++ /dev/null @@ -1,11 +0,0 @@ -public class B { - static interface T extends C {} - - // not public, so this shouldn't be tracked as an inherited dependency - private class Q implements E {} - - public void x(int i) { - // not public, not an inherited dependency - D j = new D() {}; - } -} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/C.java b/sbt/src/sbt-test/source-dependencies/inherited-deps-java/C.java deleted file mode 100644 index 6c06f4033..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/C.java +++ /dev/null @@ -1 +0,0 @@ -interface C extends D {} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/D.java b/sbt/src/sbt-test/source-dependencies/inherited-deps-java/D.java deleted file mode 100644 index 9455ef5b0..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/D.java +++ /dev/null @@ -1 +0,0 @@ -interface D extends G.P {} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/E.java b/sbt/src/sbt-test/source-dependencies/inherited-deps-java/E.java deleted file mode 100644 index d5e4d6517..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/E.java +++ /dev/null @@ -1 +0,0 @@ -public interface E {} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/F.java b/sbt/src/sbt-test/source-dependencies/inherited-deps-java/F.java deleted file mode 100644 index e205778d5..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/F.java +++ /dev/null @@ -1,3 +0,0 @@ -public class F { - public C q() { return null; } -} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/G.java b/sbt/src/sbt-test/source-dependencies/inherited-deps-java/G.java deleted file mode 100644 index ed3429f8c..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/G.java +++ /dev/null @@ -1,3 +0,0 @@ -public class G { - static interface P extends J {} -} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/J.java b/sbt/src/sbt-test/source-dependencies/inherited-deps-java/J.java deleted file mode 100644 index 8aeeb05b6..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/J.java +++ /dev/null @@ -1 +0,0 @@ -public interface J {} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt b/sbt/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt deleted file mode 100644 index da70e229f..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt +++ /dev/null @@ -1,30 +0,0 @@ -// this test is specific to the old incremental compilation algorithm -incOptions := incOptions.value.withNameHashing(false) - -lazy val verifyDeps = taskKey[Unit]("verify inherited dependencies are properly extracted") - -verifyDeps := { - val a = compile.in(Compile).value match { case a: Analysis => a } - same(a.relations.publicInherited.internal.forwardMap, expectedDeps.forwardMap) -} - -lazy val expected = Seq( - "A" -> Seq("C", "D", "E", "G", "J"), - "B" -> Seq("C", "D", "G", "J"), - "C" -> Seq("D", "G", "J"), - "D" -> Seq("G", "J"), - "E" -> Seq(), - "F" -> Seq(), - "G" -> Seq("J"), - "J" -> Seq() -) -lazy val pairs = - expected.map { case (from,tos) => - (toFile(from), tos.map(toFile)) - } -lazy val expectedDeps = (Relation.empty[File,File] /: pairs) { case (r, (x,ys)) => r + (x,ys) } -def toFile(s: String) = file(s + ".java").getAbsoluteFile - -def same[T](x: T, y: T): Unit = { - assert(x == y, s"\nActual: $x, \nExpected: $y") -} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/test b/sbt/src/sbt-test/source-dependencies/inherited-deps-java/test deleted file mode 100644 index e5d477601..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-deps-java/test +++ /dev/null @@ -1 +0,0 @@ -> verifyDeps diff --git a/sbt/src/sbt-test/source-dependencies/inherited-macros/build.sbt b/sbt/src/sbt-test/source-dependencies/inherited-macros/build.sbt deleted file mode 100644 index 85676b5fa..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-macros/build.sbt +++ /dev/null @@ -1,22 +0,0 @@ -val defaultSettings = Seq( - scalaVersion := "2.10.6", - libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ )//, - //incOptions := incOptions.value.withNameHashing(true) -) - -lazy val root = (project in file(".")). - aggregate(macroProvider, macroClient). - settings( - defaultSettings - ) - -lazy val macroProvider = (project in file("macro-provider")). - settings( - defaultSettings - ) - -lazy val macroClient = (project in file("macro-client")). - dependsOn(macroProvider). - settings( - defaultSettings - ) diff --git a/sbt/src/sbt-test/source-dependencies/inherited-macros/changes/Client.scala b/sbt/src/sbt-test/source-dependencies/inherited-macros/changes/Client.scala deleted file mode 100644 index 19633db64..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-macros/changes/Client.scala +++ /dev/null @@ -1,7 +0,0 @@ -package macro - -object Client { - object RealClient extends Provider { - // Some comment... - } -} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-macros/macro-client/build.sbt b/sbt/src/sbt-test/source-dependencies/inherited-macros/macro-client/build.sbt deleted file mode 100644 index 03a7c3fe5..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-macros/macro-client/build.sbt +++ /dev/null @@ -1,9 +0,0 @@ -// Check that a file has not been recompiled during last compilation -InputKey[Unit]("check-not-recompiled") <<= inputTask { (argTask: TaskKey[Seq[String]]) => - (argTask, compile in Compile) map { case (args: Seq[String], a: Analysis) => - assert(args.size == 1) - val fileCompilation = a.apis.internal.collect { case (file, src) if file.name.endsWith(args(0)) => src.compilation }.head - val lastCompilation = a.compilations.allCompilations.last - assert(fileCompilation.startTime != lastCompilation.startTime, "File has been recompiled during last compilation.") - } -} \ No newline at end of file diff --git a/sbt/src/sbt-test/source-dependencies/inherited-macros/macro-client/src/main/scala/Client.scala b/sbt/src/sbt-test/source-dependencies/inherited-macros/macro-client/src/main/scala/Client.scala deleted file mode 100644 index 6351461a7..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-macros/macro-client/src/main/scala/Client.scala +++ /dev/null @@ -1,7 +0,0 @@ -package macro - -object Client { - object RealClient extends Provider { - - } -} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-macros/macro-client/src/main/scala/Foo.scala b/sbt/src/sbt-test/source-dependencies/inherited-macros/macro-client/src/main/scala/Foo.scala deleted file mode 100644 index be7a40427..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-macros/macro-client/src/main/scala/Foo.scala +++ /dev/null @@ -1,5 +0,0 @@ -package macro - -object Foo { - val c = Client.RealClient -} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-macros/macro-provider/src/main/scala/Provider.scala b/sbt/src/sbt-test/source-dependencies/inherited-macros/macro-provider/src/main/scala/Provider.scala deleted file mode 100644 index 14523f149..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-macros/macro-provider/src/main/scala/Provider.scala +++ /dev/null @@ -1,7 +0,0 @@ -package macro -import scala.language.experimental.macros -import scala.reflect.macros._ - -abstract class Provider { - def notImplementedMacro = macro ??? -} diff --git a/sbt/src/sbt-test/source-dependencies/inherited-macros/test b/sbt/src/sbt-test/source-dependencies/inherited-macros/test deleted file mode 100644 index 4a755b5b2..000000000 --- a/sbt/src/sbt-test/source-dependencies/inherited-macros/test +++ /dev/null @@ -1,12 +0,0 @@ -> macroProvider/compile - -> macroClient/compile - -# Introduce a comment in Client, which inherits a macro from Provider -$ copy-file changes/Client.scala macro-client/src/main/scala/Client.scala - -> macroClient/compile - -# Object Foo depends on Client via composition, thus a whitespace change to -# Client shouldn't trigger its recompilation -> check-not-recompiled Foo.scala