From c3eb841ce8ae349d9820dbf6c18884955e74254e Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 20 Nov 2016 00:02:50 +0100 Subject: Make every project use the new directory structure --- .../sbt-test/source-dependencies/typeref-only/A.scala | 5 +++++ .../sbt-test/source-dependencies/typeref-only/B.scala | 1 + .../sbt-test/source-dependencies/typeref-only/build.sbt | 5 +++++ .../typeref-only/project/DottyInjectedPlugin.scala | 17 +++++++++++++++++ .../sbt-test/source-dependencies/typeref-only/test | 7 +++++++ 5 files changed, 35 insertions(+) create mode 100644 sbt-bridge/sbt-test/source-dependencies/typeref-only/A.scala create mode 100644 sbt-bridge/sbt-test/source-dependencies/typeref-only/B.scala create mode 100644 sbt-bridge/sbt-test/source-dependencies/typeref-only/build.sbt create mode 100644 sbt-bridge/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala create mode 100644 sbt-bridge/sbt-test/source-dependencies/typeref-only/test (limited to 'sbt-bridge/sbt-test/source-dependencies/typeref-only') diff --git a/sbt-bridge/sbt-test/source-dependencies/typeref-only/A.scala b/sbt-bridge/sbt-test/source-dependencies/typeref-only/A.scala new file mode 100644 index 000000000..3b274e4a8 --- /dev/null +++ b/sbt-bridge/sbt-test/source-dependencies/typeref-only/A.scala @@ -0,0 +1,5 @@ +class A[T] + +abstract class C { + def foo: A[B] +} diff --git a/sbt-bridge/sbt-test/source-dependencies/typeref-only/B.scala b/sbt-bridge/sbt-test/source-dependencies/typeref-only/B.scala new file mode 100644 index 000000000..179f0d275 --- /dev/null +++ b/sbt-bridge/sbt-test/source-dependencies/typeref-only/B.scala @@ -0,0 +1 @@ +class B diff --git a/sbt-bridge/sbt-test/source-dependencies/typeref-only/build.sbt b/sbt-bridge/sbt-test/source-dependencies/typeref-only/build.sbt new file mode 100644 index 000000000..02813797f --- /dev/null +++ b/sbt-bridge/sbt-test/source-dependencies/typeref-only/build.sbt @@ -0,0 +1,5 @@ +logLevel := Level.Debug + +// disable recompile all which causes full recompile which +// makes it more difficult to test dependency tracking +incOptions ~= { _.copy(recompileAllFraction = 1.0) } diff --git a/sbt-bridge/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000..3433779b6 --- /dev/null +++ b/sbt-bridge/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala @@ -0,0 +1,17 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1-SNAPSHOT", + scalaOrganization := "ch.epfl.lamp", + scalacOptions += "-language:Scala2", + scalaBinaryVersion := "2.11", + autoScalaLibrary := false, + libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + ) +} diff --git a/sbt-bridge/sbt-test/source-dependencies/typeref-only/test b/sbt-bridge/sbt-test/source-dependencies/typeref-only/test new file mode 100644 index 000000000..fb314fd7b --- /dev/null +++ b/sbt-bridge/sbt-test/source-dependencies/typeref-only/test @@ -0,0 +1,7 @@ +# test case for dependency tracking in case given type (`B` in our case) +# mentioned only in type ref (as a type argument) +> compile + +$ delete B.scala + +-> compile -- cgit v1.2.3