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 /bridge/src/sbt-test/source-dependencies/resident-java | |
parent | 34d64f381362b12a595fd26690c7c9b1c26d16f7 (diff) | |
download | dotty-2d10c87ce537fb42fdb134efcae53dca7305a7b7.tar.gz dotty-2d10c87ce537fb42fdb134efcae53dca7305a7b7.tar.bz2 dotty-2d10c87ce537fb42fdb134efcae53dca7305a7b7.zip |
Move sbt-bridge
Diffstat (limited to 'bridge/src/sbt-test/source-dependencies/resident-java')
8 files changed, 0 insertions, 45 deletions
diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/build.sbt b/bridge/src/sbt-test/source-dependencies/resident-java/build.sbt deleted file mode 100644 index 619622832..000000000 --- a/bridge/src/sbt-test/source-dependencies/resident-java/build.sbt +++ /dev/null @@ -1 +0,0 @@ -compileOrder := CompileOrder.JavaThenScala diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java b/bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java deleted file mode 100644 index bdf223afb..000000000 --- a/bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java +++ /dev/null @@ -1,5 +0,0 @@ -package example; - -public class A { - public final int x = 3; -} diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java b/bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java deleted file mode 100644 index 3b67c58d2..000000000 --- a/bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java +++ /dev/null @@ -1,5 +0,0 @@ -package example; - -public class A { - public final String x = "a"; -} diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala b/bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala deleted file mode 100644 index 251ef7397..000000000 --- a/bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala +++ /dev/null @@ -1 +0,0 @@ -object B diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala b/bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala deleted file mode 100644 index 9d9a60c87..000000000 --- a/bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala +++ /dev/null @@ -1,3 +0,0 @@ -object B { - val x: Int = (new example.A).x -} diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala b/bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala deleted file mode 100644 index ec5fd2cf3..000000000 --- a/bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala +++ /dev/null @@ -1,3 +0,0 @@ -object B { - val x: String = (new example.A).x -} diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala b/bridge/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3433779b6..000000000 --- a/bridge/src/sbt-test/source-dependencies/resident-java/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/resident-java/test b/bridge/src/sbt-test/source-dependencies/resident-java/test deleted file mode 100644 index 6987c7df0..000000000 --- a/bridge/src/sbt-test/source-dependencies/resident-java/test +++ /dev/null @@ -1,10 +0,0 @@ -$ copy-file changes/B0.scala B.scala -> compile - -$ copy-file changes/A1.java src/main/java/example/A.java -$ copy-file changes/B1.scala B.scala -> compile - -$ copy-file changes/A2.java src/main/java/example/A.java -$ copy-file changes/B2.scala B.scala -> compile |