aboutsummaryrefslogtreecommitdiff
path: root/sbt-bridge/sbt-test/source-dependencies/parent-member-change
diff options
context:
space:
mode:
Diffstat (limited to 'sbt-bridge/sbt-test/source-dependencies/parent-member-change')
-rw-r--r--sbt-bridge/sbt-test/source-dependencies/parent-member-change/A.scala3
-rw-r--r--sbt-bridge/sbt-test/source-dependencies/parent-member-change/B.scala1
-rw-r--r--sbt-bridge/sbt-test/source-dependencies/parent-member-change/C.scala3
-rw-r--r--sbt-bridge/sbt-test/source-dependencies/parent-member-change/changes/A.scala3
-rw-r--r--sbt-bridge/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala17
-rw-r--r--sbt-bridge/sbt-test/source-dependencies/parent-member-change/test7
6 files changed, 34 insertions, 0 deletions
diff --git a/sbt-bridge/sbt-test/source-dependencies/parent-member-change/A.scala b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/A.scala
new file mode 100644
index 000000000..d6f828508
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/A.scala
@@ -0,0 +1,3 @@
+class A {
+ def x(i: Int) = i+"3"
+} \ No newline at end of file
diff --git a/sbt-bridge/sbt-test/source-dependencies/parent-member-change/B.scala b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/B.scala
new file mode 100644
index 000000000..26e47fd25
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/B.scala
@@ -0,0 +1 @@
+class B extends A \ No newline at end of file
diff --git a/sbt-bridge/sbt-test/source-dependencies/parent-member-change/C.scala b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/C.scala
new file mode 100644
index 000000000..6985a0d2f
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/C.scala
@@ -0,0 +1,3 @@
+class C extends B {
+ def x(s: String) = s+"5"
+}
diff --git a/sbt-bridge/sbt-test/source-dependencies/parent-member-change/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/changes/A.scala
new file mode 100644
index 000000000..949655f41
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/changes/A.scala
@@ -0,0 +1,3 @@
+class A {
+ def x(i: String) = i+"3"
+} \ No newline at end of file
diff --git a/sbt-bridge/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000..3433779b6
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/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/parent-member-change/test b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/test
new file mode 100644
index 000000000..95ba12295
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/test
@@ -0,0 +1,7 @@
+> compile
+
+# modify A.scala so that the signature of its method changes to be identical to
+# that of the method in its descendant in C.scala
+$ copy-file changes/A.scala A.scala
+# Should recompile C.scala and report this error, failing the compile
+-> compile