diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2016-05-31 15:23:04 +0200 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2016-06-07 17:10:36 +0200 |
| commit | 09b2f39731386cd5b3688d5c3badf75d956d4f6d (patch) | |
| tree | d122fc0e96d6c1cd22d7e0d0b5ee523563d534e7 /bridge/src/sbt-test/source-dependencies/binary | |
| parent | 030ff82070197f0c126f5c0287e076b0f6b6dd8d (diff) | |
| download | dotty-09b2f39731386cd5b3688d5c3badf75d956d4f6d.tar.gz dotty-09b2f39731386cd5b3688d5c3badf75d956d4f6d.tar.bz2 dotty-09b2f39731386cd5b3688d5c3badf75d956d4f6d.zip | |
Make the dotty-bridge sbt project a subproject of dotty
Note that the dotty-bridge tests will not be run automatically by `test`
which is short for `dotty/test`, to run the dotty-bridge tests, do in sbt:
> dotty-bridge/test
> dotty-bridge/scripted
Original history: https://github.com/smarter/dotty-bridge/commits/master
Diffstat (limited to 'bridge/src/sbt-test/source-dependencies/binary')
6 files changed, 40 insertions, 0 deletions
diff --git a/bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala b/bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala new file mode 100644 index 000000000..88d8ef9a3 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala @@ -0,0 +1 @@ +object Break
\ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/binary/dep/A.scala b/bridge/src/sbt-test/source-dependencies/binary/dep/A.scala new file mode 100644 index 000000000..91d3855f6 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/binary/dep/A.scala @@ -0,0 +1,3 @@ +object A { + val x = 3 +}
\ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala b/bridge/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000..3433779b6 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/binary/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/bridge/src/sbt-test/source-dependencies/binary/project/P.scala b/bridge/src/sbt-test/source-dependencies/binary/project/P.scala new file mode 100644 index 000000000..d5d84e5a4 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/binary/project/P.scala @@ -0,0 +1,10 @@ +import sbt._ +import Keys._ + +object B extends Build +{ + lazy val dep = Project("dep", file("dep")) + lazy val use = Project("use", file("use")) settings( + unmanagedJars in Compile <+= packageBin in (dep, Compile) map Attributed.blank + ) +}
\ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/binary/test b/bridge/src/sbt-test/source-dependencies/binary/test new file mode 100644 index 000000000..058c5492c --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/binary/test @@ -0,0 +1,6 @@ +# done this way because last modified times often have ~1s resolution +> use/package +$ sleep 2000 + +$ copy-file changes/Break.scala dep/A.scala +-> use/compile diff --git a/bridge/src/sbt-test/source-dependencies/binary/use/B.scala b/bridge/src/sbt-test/source-dependencies/binary/use/B.scala new file mode 100644 index 000000000..5f371ab41 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/binary/use/B.scala @@ -0,0 +1,3 @@ +object B { + val y = A.x +}
\ No newline at end of file |