diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2016-11-17 11:51:08 +0100 |
---|---|---|
committer | Guillaume Martres <smarter@ubuntu.com> | 2016-11-22 01:35:07 +0100 |
commit | 6acdc1e85f04cc3a240ddb91983588897786d8ca (patch) | |
tree | a86262ad133d0dc3af19919cdc6ff77d1044003a /sbt-bridge/src/sbt-test/source-dependencies/override | |
parent | c061baf8c4a81f2b1505c30a5240857411981f62 (diff) | |
download | dotty-6acdc1e85f04cc3a240ddb91983588897786d8ca.tar.gz dotty-6acdc1e85f04cc3a240ddb91983588897786d8ca.tar.bz2 dotty-6acdc1e85f04cc3a240ddb91983588897786d8ca.zip |
Move bridge to correct location, fix unmanaged sources in build
Diffstat (limited to 'sbt-bridge/src/sbt-test/source-dependencies/override')
7 files changed, 33 insertions, 0 deletions
diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/override/A.scala new file mode 100644 index 000000000..43b95b9e9 --- /dev/null +++ b/sbt-bridge/src/sbt-test/source-dependencies/override/A.scala @@ -0,0 +1,3 @@ +trait A { + def x: Int +} diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/override/B.scala new file mode 100644 index 000000000..c7569ba51 --- /dev/null +++ b/sbt-bridge/src/sbt-test/source-dependencies/override/B.scala @@ -0,0 +1,3 @@ +trait B extends A { + override def x = 2 +}
\ No newline at end of file diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/override/C.scala new file mode 100644 index 000000000..24d656d4a --- /dev/null +++ b/sbt-bridge/src/sbt-test/source-dependencies/override/C.scala @@ -0,0 +1,3 @@ +trait C extends A { + def x = 5 +}
\ No newline at end of file diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/D.scala b/sbt-bridge/src/sbt-test/source-dependencies/override/D.scala new file mode 100644 index 000000000..1f0d0a274 --- /dev/null +++ b/sbt-bridge/src/sbt-test/source-dependencies/override/D.scala @@ -0,0 +1 @@ +trait D extends C with B
\ No newline at end of file diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/changes/B2.scala b/sbt-bridge/src/sbt-test/source-dependencies/override/changes/B2.scala new file mode 100644 index 000000000..f314e6a46 --- /dev/null +++ b/sbt-bridge/src/sbt-test/source-dependencies/override/changes/B2.scala @@ -0,0 +1,3 @@ +trait B extends A { + def x = 2 +}
\ No newline at end of file diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000..3433779b6 --- /dev/null +++ b/sbt-bridge/src/sbt-test/source-dependencies/override/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/src/sbt-test/source-dependencies/override/test b/sbt-bridge/src/sbt-test/source-dependencies/override/test new file mode 100644 index 000000000..43f805d4e --- /dev/null +++ b/sbt-bridge/src/sbt-test/source-dependencies/override/test @@ -0,0 +1,3 @@ +> compile +$ copy-file changes/B2.scala B.scala +-> compile
\ No newline at end of file |