diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2016-10-11 17:28:39 +0200 |
|---|---|---|
| committer | Guillaume Martres <smarter@ubuntu.com> | 2016-11-22 01:35:06 +0100 |
| commit | 2d10c87ce537fb42fdb134efcae53dca7305a7b7 (patch) | |
| tree | a3629c9a3ad6db3e9d07df8fa8621f8c8211076c /sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java | |
| parent | 34d64f381362b12a595fd26690c7c9b1c26d16f7 (diff) | |
| download | dotty-2d10c87ce537fb42fdb134efcae53dca7305a7b7.tar.gz dotty-2d10c87ce537fb42fdb134efcae53dca7305a7b7.tar.bz2 dotty-2d10c87ce537fb42fdb134efcae53dca7305a7b7.zip | |
Move sbt-bridge
Diffstat (limited to 'sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java')
6 files changed, 30 insertions, 0 deletions
diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java new file mode 100644 index 000000000..96b1a01a7 --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java @@ -0,0 +1,3 @@ +public class A { + public int x() { return 5; } +} diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java new file mode 100644 index 000000000..7e9bb5574 --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java @@ -0,0 +1 @@ +public class B extends A {} diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java new file mode 100644 index 000000000..a5a7716ea --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java @@ -0,0 +1,4 @@ +public class C extends B +{ + public int x() { return super.x() + 3; } +} diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java new file mode 100644 index 000000000..9f4b93d84 --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java @@ -0,0 +1 @@ +public class A {} diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000..3433779b6 --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/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/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test new file mode 100644 index 000000000..387cbae45 --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test @@ -0,0 +1,4 @@ +> compile + +$ copy-file changes/A2.java A.java +-> compile |