aboutsummaryrefslogtreecommitdiff
path: root/sbt-bridge/sbt-test/source-dependencies/intermediate-error
diff options
context:
space:
mode:
Diffstat (limited to 'sbt-bridge/sbt-test/source-dependencies/intermediate-error')
-rw-r--r--sbt-bridge/sbt-test/source-dependencies/intermediate-error/A.scala6
-rw-r--r--sbt-bridge/sbt-test/source-dependencies/intermediate-error/B.scala4
-rw-r--r--sbt-bridge/sbt-test/source-dependencies/intermediate-error/changes/A2.scala6
-rw-r--r--sbt-bridge/sbt-test/source-dependencies/intermediate-error/changes/A3.scala6
-rw-r--r--sbt-bridge/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala17
-rw-r--r--sbt-bridge/sbt-test/source-dependencies/intermediate-error/test7
6 files changed, 46 insertions, 0 deletions
diff --git a/sbt-bridge/sbt-test/source-dependencies/intermediate-error/A.scala b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/A.scala
new file mode 100644
index 000000000..392db0805
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/A.scala
@@ -0,0 +1,6 @@
+object A
+{
+ def x = 3
+ //def x: String = 3
+ //def x: String = "3"
+} \ No newline at end of file
diff --git a/sbt-bridge/sbt-test/source-dependencies/intermediate-error/B.scala b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/B.scala
new file mode 100644
index 000000000..1a1e0c06f
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/B.scala
@@ -0,0 +1,4 @@
+object B
+{
+ val y: Int = A.x
+} \ No newline at end of file
diff --git a/sbt-bridge/sbt-test/source-dependencies/intermediate-error/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/changes/A2.scala
new file mode 100644
index 000000000..ba9953954
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/changes/A2.scala
@@ -0,0 +1,6 @@
+object A
+{
+ //def x = 3
+ def x: String = 3
+ //def x: String = "3"
+} \ No newline at end of file
diff --git a/sbt-bridge/sbt-test/source-dependencies/intermediate-error/changes/A3.scala b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/changes/A3.scala
new file mode 100644
index 000000000..f020041ea
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/changes/A3.scala
@@ -0,0 +1,6 @@
+object A
+{
+ //def x = 3
+ //def x: String = 3
+ def x: String = "3"
+} \ No newline at end of file
diff --git a/sbt-bridge/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000..3433779b6
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/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/sbt-test/source-dependencies/intermediate-error/test b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/test
new file mode 100644
index 000000000..e3016a9c6
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/test
@@ -0,0 +1,7 @@
+> compile
+
+$ copy-file changes/A2.scala A.scala
+-> compile
+
+$ copy-file changes/A3.scala A.scala
+-> compile \ No newline at end of file