diff options
Diffstat (limited to 'sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep')
5 files changed, 31 insertions, 0 deletions
diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java new file mode 100644 index 000000000..b448538ae --- /dev/null +++ b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java @@ -0,0 +1,2 @@ +package a; +public class A { public static final int x = 3; } diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala new file mode 100644 index 000000000..ddeafd32d --- /dev/null +++ b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala @@ -0,0 +1,2 @@ +package b +object B { val x = 3 } diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala new file mode 100644 index 000000000..6f0f9f967 --- /dev/null +++ b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala @@ -0,0 +1,2 @@ +package b +object B { val x = a.A.x } diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000..3433779b6 --- /dev/null +++ b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/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/new-pkg-dep/test b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/test new file mode 100644 index 000000000..89251bcec --- /dev/null +++ b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/test @@ -0,0 +1,8 @@ +$ copy-file changes/B0.scala B.scala +> compile + +$ copy-file changes/A1.java A.java +> compile + +$ copy-file changes/B1.scala B.scala +> compile |