Fix scripted empty-package test

This test started failing after we started emitting .tasty files by
default in 1293e2f, because sbt will
not by default delete these .tasty files when the corresponding
.class file is deleted, which means that the directories containing
these files are not deleted either. This is problematic because dotty
creates package symbols based on the name of directories on the
classpath, even if the directories contain no classfile. Thankfully, I
already fixed this issue in sbt-dotty yesterday in
452bc5e, so all we need to do is make
the scripted tests use the sbt-dotty plugin. This commit does this, and
also move these tests to the sbt-dotty project since they depend on it now.

Author: smarter

.drone.yml

@@ -21,7 +21,7 @@ pipeline:
     pull: true
     commands:
       - ./project/scripts/sbt ";clean ;publishLocal" "${CI_PUBLISH}"
-      - ./project/scripts/sbt "dotty-sbt-scripted-tests/scripted source-dependencies/*" "${CI_PUBLISH}"
+      - ./project/scripts/sbt "sbt-dotty/scripted source-dependencies/*" "${CI_PUBLISH}"
       - ./project/scripts/sbtPublish ${CI_PUBLISH} $SONATYPE_USER $SONATYPE_PW $PGP_PW
     volumes:
       - /home/drone/keys:/keys
@@ -50,7 +50,7 @@ matrix:
       CI_PUBLISH: true
     - CI_TEST: legacyTests
       CI_PUBLISH: false
-    - CI_TEST: ;test;sbt-dotty/scripted
+    - CI_TEST: ;test;sbt-dotty/scripted compilerReporter/*;sbt-dotty/scripted discovery/*;sbt-dotty/scripted sbt-dotty/*
       CI_PUBLISH: false
     - CI_TEST: dotty-bootstrapped/test
       CI_PUBLISH: false

project/Build.scala

@@ -730,49 +730,6 @@ object Build {
       sources in Test := Seq()
     )
 
-  lazy val `dotty-sbt-scripted-tests` = project.in(file("sbt-scripted-tests")).
-    settings(
-      publishArtifact := false,
-      resolvers += Resolver.typesafeIvyRepo("releases") // For org.scala-sbt:scripted
-    ).
-    settings(ScriptedPlugin.scriptedSettings: _*).
-    settings(
-      ScriptedPlugin.sbtTestDirectory := baseDirectory.value / "sbt-test",
-      ScriptedPlugin.scriptedLaunchOpts := Seq("-Xmx1024m"),
-      ScriptedPlugin.scriptedBufferLog := false,
-      ScriptedPlugin.scripted := ScriptedPlugin.scripted.dependsOn(Def.task {
-        val x0 = (publishLocal in `dotty-sbt-bridge-bootstrapped`).value
-        val x1 = (publishLocal in `dotty-interfaces`).value
-        val x2 = (publishLocal in `dotty-compiler-bootstrapped`).value
-        val x3 = (publishLocal in `dotty-library-bootstrapped`).value
-        val x4 = (publishLocal in `scala-library`).value
-        val x5 = (publishLocal in `scala-reflect`).value
-        val x6 = (publishLocal in `dotty-bootstrapped`).value // Needed because sbt currently hardcodes the dotty artifact
-      }).evaluated
-      // TODO: Use this instead of manually copying DottyInjectedPlugin.scala
-      // everywhere once https://github.com/sbt/sbt/issues/2601 gets fixed.
-      /*,
-      ScriptedPlugin.scriptedPrescripted := { f =>
-        IO.write(inj, """
-import sbt._
-import Keys._
-
-object DottyInjectedPlugin extends AutoPlugin {
-  override def requires = plugins.JvmPlugin
-  override def trigger = allRequirements
-
-  override val projectSettings = Seq(
-    scalaVersion := "0.1.1-bin-SNAPSHOT",
-    scalaOrganization := "ch.epfl.lamp",
-    scalacOptions += "-language:Scala2",
-    scalaBinaryVersion  := "0.1"
-  )
-}
-""")
-      }
-      */
-    )
-
   lazy val `dotty-language-server` = project.in(file("language-server")).
     dependsOn(`dotty-compiler-bootstrapped`).
     settings(commonBootstrappedSettings).

sbt-scripted-tests/sbt-test/compilerReporter/simple/Source.scala renamed to sbt-dotty/sbt-test/compilerReporter/simple/Source.scala

@@ -7,8 +7,6 @@ object DottyInjectedPlugin extends AutoPlugin {
 
   override val projectSettings = Seq(
     scalaVersion := "0.1.1-bin-SNAPSHOT",
-    scalaOrganization := "ch.epfl.lamp",
-    scalacOptions += "-language:Scala2",
-    scalaBinaryVersion  := "0.1"
+    scalacOptions += "-language:Scala2"
   )
 }

sbt-scripted-tests/sbt-test/compilerReporter/simple/build.sbt renamed to sbt-dotty/sbt-test/compilerReporter/simple/build.sbt

@@ -36,14 +36,13 @@ object Reporter {
     check <<= (compile in Compile).mapFailure( _ => {
       val problems = reporter.get.problems
       println(problems.toList)
-      assert(problems.size == 2)
+      assert(problems.size == 1)
 
       // Assert disabled because we don't currently pass positions to sbt
       // See https://github.com/lampepfl/dotty/pull/2107
       // assert(problems.forall(_.position.offset.isDefined))
 
       assert(problems.count(_.severity == Severity.Error) == 1) // not found: er1,
-      assert(problems.count(_.severity == Severity.Warn) == 1)  // `with' as a type operator has been deprecated; use `&' instead,
     })
   )
 }

sbt-scripted-tests/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala renamed to sbt-dotty/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/compilerReporter/simple/project/Reporter.scala renamed to sbt-dotty/sbt-test/compilerReporter/simple/project/Reporter.scala

@@ -7,8 +7,6 @@ object DottyInjectedPlugin extends AutoPlugin {
 
   override val projectSettings = Seq(
     scalaVersion := "0.1.1-bin-SNAPSHOT",
-    scalaOrganization := "ch.epfl.lamp",
-    scalacOptions += "-language:Scala2",
-    scalaBinaryVersion  := "0.1"
+    scalacOptions += "-language:Scala2"
   )
 }

sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/compilerReporter/simple/test renamed to sbt-dotty/sbt-test/compilerReporter/simple/test

@@ -7,8 +7,6 @@ object DottyInjectedPlugin extends AutoPlugin {
 
   override val projectSettings = Seq(
     scalaVersion := "0.1.1-bin-SNAPSHOT",
-    scalaOrganization := "ch.epfl.lamp",
-    scalacOptions += "-language:Scala2",
-    scalaBinaryVersion  := "0.1"
+    scalacOptions += "-language:Scala2"
   )
 }

sbt-scripted-tests/sbt-test/discovery/test-discovery/build.sbt renamed to sbt-dotty/sbt-test/discovery/test-discovery/build.sbt

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/discovery/test-discovery/changes/A2.scala renamed to sbt-dotty/sbt-test/discovery/test-discovery/changes/A2.scala

@@ -7,8 +7,6 @@ object DottyInjectedPlugin extends AutoPlugin {
 
   override val projectSettings = Seq(
     scalaVersion := "0.1.1-bin-SNAPSHOT",
-    scalaOrganization := "ch.epfl.lamp",
-    scalacOptions += "-language:Scala2",
-    scalaBinaryVersion  := "0.1"
+    scalacOptions += "-language:Scala2"
   )
 }

sbt-scripted-tests/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala renamed to sbt-dotty/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-dotty/sbt-test/discovery/test-discovery/project/plugins.sbt

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/discovery/test-discovery/src/main/scala/A.scala renamed to sbt-dotty/sbt-test/discovery/test-discovery/src/main/scala/A.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/discovery/test-discovery/src/test/scala/TestA.scala renamed to sbt-dotty/sbt-test/discovery/test-discovery/src/test/scala/TestA.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/discovery/test-discovery/test renamed to sbt-dotty/sbt-test/discovery/test-discovery/test

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/A.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-override/A.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/B.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-override/B.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/C.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-override/C.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/D.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-override/D.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/changes/C2.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-override/changes/C2.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-dotty/sbt-test/source-dependencies/abstract-override/project/plugins.sbt

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/test renamed to sbt-dotty/sbt-test/source-dependencies/abstract-override/test

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/build.sbt renamed to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/build.sbt

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/test renamed to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/test

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/A.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-type/A.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/B.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-type/B.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/changes/A.scala renamed to sbt-dotty/sbt-test/source-dependencies/abstract-type/changes/A.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-dotty/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-dotty/sbt-test/source-dependencies/abstract-type/project/plugins.sbt

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/test renamed to sbt-dotty/sbt-test/source-dependencies/abstract-type/test

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/added/changes/A1.scala renamed to sbt-dotty/sbt-test/source-dependencies/added/changes/A1.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/source-dependencies/added/changes/A2.scala renamed to sbt-dotty/sbt-test/source-dependencies/added/changes/A2.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/added/changes/A3.scala renamed to sbt-dotty/sbt-test/source-dependencies/added/changes/A3.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/source-dependencies/added/changes/B1.scala renamed to sbt-dotty/sbt-test/source-dependencies/added/changes/B1.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/added/changes/B2.scala renamed to sbt-dotty/sbt-test/source-dependencies/added/changes/B2.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-dotty/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-dotty/sbt-test/source-dependencies/added/project/plugins.sbt

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}

sbt-scripted-tests/sbt-test/source-dependencies/added/test renamed to sbt-dotty/sbt-test/source-dependencies/added/test

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/A.scala renamed to sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/A.scala

@@ -0,0 +1,12 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1.1-bin-SNAPSHOT",
+    scalacOptions += "-language:Scala2"
+  )
+}