Merge pull request #2550 from dotty-staging/fix-nightly

Fix scripted empty-package test

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

.drone.yml.sig

@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQojCiMgUGxlYXNlIG5vdGUgdGhhdCB0aGUgc2lnbmluZyBjYW4gb25seSBiZSBkb25lIGJ5IGNvbGxhYm9yYXRvcnMuCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL3NidCAiJHtDSV9URVNUfSIKICAgIHdoZW46CiAgICAgIGJyYW5jaDoKICAgICAgICBleGNsdWRlOiBnaC1wYWdlcwoKICBwdWJsaXNoX25pZ2h0bHk6CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MjQtMDQtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICI7Y2xlYW4gO3B1Ymxpc2hMb2NhbCIgIiR7Q0lfUFVCTElTSH0iCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICJkb3R0eS1zYnQtc2NyaXB0ZWQtdGVzdHMvc2NyaXB0ZWQgc291cmNlLWRlcGVuZGVuY2llcy8qIiAiJHtDSV9QVUJMSVNIfSIKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnRQdWJsaXNoICR7Q0lfUFVCTElTSH0gJFNPTkFUWVBFX1VTRVIgJFNPTkFUWVBFX1BXICRQR1BfUFcKICAgIHZvbHVtZXM6CiAgICAgIC0gL2hvbWUvZHJvbmUva2V5czova2V5cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IGRlcGxveW1lbnQKICAgICAgZW52aXJvbm1lbnQ6IG5pZ2h0bHkKCiAgZG9jdW1lbnRhdGlvbjoKICAgIGltYWdlOiBsYW1wZXBmbC9kb3R0eToyNC0wNC0yMDE3CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9nZW5Eb2NzICIke0NJX1BVQkxJU0h9IiAkQk9UX1BBU1MKICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCgogIHNsYWNrOgogICAgaW1hZ2U6IHBsdWdpbnMvc2xhY2sKICAgIGNoYW5uZWw6IGRvdHR5CiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgogICAgICBzdGF0dXM6IGNoYW5nZWQKCm1hdHJpeDoKICBpbmNsdWRlOgogICAgLSBDSV9URVNUOiBkb3R0eS1iaW4tdGVzdHMvdGVzdAogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGxlZ2FjeVRlc3RzCiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IDt0ZXN0O3NidC1kb3R0eS9zY3JpcHRlZAogICAgICBDSV9QVUJMSVNIOiBmYWxzZQogICAgLSBDSV9URVNUOiBkb3R0eS1ib290c3RyYXBwZWQvdGVzdAogICAgICBDSV9QVUJMSVNIOiBmYWxzZQo.A83lmQCwzpdgziEdBb3hlfSI1jnUd1hg6Peea01kqUU
+eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQojCiMgUGxlYXNlIG5vdGUgdGhhdCB0aGUgc2lnbmluZyBjYW4gb25seSBiZSBkb25lIGJ5IGNvbGxhYm9yYXRvcnMuCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL3NidCAiJHtDSV9URVNUfSIKICAgIHdoZW46CiAgICAgIGJyYW5jaDoKICAgICAgICBleGNsdWRlOiBnaC1wYWdlcwoKICBwdWJsaXNoX25pZ2h0bHk6CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MjQtMDQtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICI7Y2xlYW4gO3B1Ymxpc2hMb2NhbCIgIiR7Q0lfUFVCTElTSH0iCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICJzYnQtZG90dHkvc2NyaXB0ZWQgc291cmNlLWRlcGVuZGVuY2llcy8qIiAiJHtDSV9QVUJMSVNIfSIKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnRQdWJsaXNoICR7Q0lfUFVCTElTSH0gJFNPTkFUWVBFX1VTRVIgJFNPTkFUWVBFX1BXICRQR1BfUFcKICAgIHZvbHVtZXM6CiAgICAgIC0gL2hvbWUvZHJvbmUva2V5czova2V5cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IGRlcGxveW1lbnQKICAgICAgZW52aXJvbm1lbnQ6IG5pZ2h0bHkKCiAgZG9jdW1lbnRhdGlvbjoKICAgIGltYWdlOiBsYW1wZXBmbC9kb3R0eToyNC0wNC0yMDE3CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9nZW5Eb2NzICIke0NJX1BVQkxJU0h9IiAkQk9UX1BBU1MKICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCgogIHNsYWNrOgogICAgaW1hZ2U6IHBsdWdpbnMvc2xhY2sKICAgIGNoYW5uZWw6IGRvdHR5CiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgogICAgICBzdGF0dXM6IGNoYW5nZWQKCm1hdHJpeDoKICBpbmNsdWRlOgogICAgLSBDSV9URVNUOiBkb3R0eS1iaW4tdGVzdHMvdGVzdAogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGxlZ2FjeVRlc3RzCiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IDt0ZXN0O3NidC1kb3R0eS9zY3JpcHRlZCBjb21waWxlclJlcG9ydGVyLyo7c2J0LWRvdHR5L3NjcmlwdGVkIGRpc2NvdmVyeS8qO3NidC1kb3R0eS9zY3JpcHRlZCBzYnQtZG90dHkvKgogICAgICBDSV9QVUJMSVNIOiBmYWxzZQogICAgLSBDSV9URVNUOiBkb3R0eS1ib290c3RyYXBwZWQvdGVzdAogICAgICBDSV9QVUJMSVNIOiBmYWxzZQo.jkK92hXwTlQ5DGTdeZfSCcyYC-cQT_5bYb6Qa0O-M5o

build.sbt

@@ -11,7 +11,6 @@ val `dotty-library` = Build.`dotty-library`
 val `dotty-library-bootstrapped` = Build.`dotty-library-bootstrapped`
 val `dotty-sbt-bridge` = Build.`dotty-sbt-bridge`
 val `dotty-sbt-bridge-bootstrapped` = Build.`dotty-sbt-bridge-bootstrapped`
-val `dotty-sbt-scripted-tests` = Build.`dotty-sbt-scripted-tests`
 val `dotty-language-server` = Build.`dotty-language-server`
 val sjsSandbox = Build.sjsSandbox
 val `dotty-bench` = Build.`dotty-bench`

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"))