From 2d10c87ce537fb42fdb134efcae53dca7305a7b7 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 11 Oct 2016 17:28:39 +0200 Subject: Move sbt-bridge --- .../source-dependencies/synthetic-companion/A.scala | 1 - .../source-dependencies/synthetic-companion/B.scala | 3 --- .../synthetic-companion/changes/A2.scala | 2 -- .../source-dependencies/synthetic-companion/dbg.sbt | 2 -- .../project/DottyInjectedPlugin.scala | 17 ----------------- .../source-dependencies/synthetic-companion/test | 4 ---- 6 files changed, 29 deletions(-) delete mode 100644 bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala delete mode 100644 bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala delete mode 100644 bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala delete mode 100644 bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt delete mode 100644 bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala delete mode 100644 bridge/src/sbt-test/source-dependencies/synthetic-companion/test (limited to 'bridge/src/sbt-test/source-dependencies/synthetic-companion') diff --git a/bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala b/bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala deleted file mode 100644 index 9917b2d98..000000000 --- a/bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala +++ /dev/null @@ -1 +0,0 @@ -case class A(x: Int) diff --git a/bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala b/bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala deleted file mode 100644 index be302fe40..000000000 --- a/bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala +++ /dev/null @@ -1,3 +0,0 @@ -object B { - A(0) -} diff --git a/bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala b/bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala deleted file mode 100644 index 3d35a445f..000000000 --- a/bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala +++ /dev/null @@ -1,2 +0,0 @@ -case class A(x: Int) -private object A diff --git a/bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt b/bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt deleted file mode 100644 index 1ac0e14e9..000000000 --- a/bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt +++ /dev/null @@ -1,2 +0,0 @@ -logLevel := Level.Debug -incOptions ~= { _.copy(apiDebug = true, relationsDebug = true) } diff --git a/bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala b/bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3433779b6..000000000 --- a/bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,17 +0,0 @@ -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/bridge/src/sbt-test/source-dependencies/synthetic-companion/test b/bridge/src/sbt-test/source-dependencies/synthetic-companion/test deleted file mode 100644 index f3a023810..000000000 --- a/bridge/src/sbt-test/source-dependencies/synthetic-companion/test +++ /dev/null @@ -1,4 +0,0 @@ -> compile -$ copy-file changes/A2.scala A.scala -# Compilation of B.scala should fail because object A does not extend `Int => A` anymore --> compile -- cgit v1.2.3