aboutsummaryrefslogtreecommitdiff
path: root/bridge/src/sbt-test/source-dependencies/parent-member-change
diff options
context:
space:
mode:
Diffstat (limited to 'bridge/src/sbt-test/source-dependencies/parent-member-change')
-rw-r--r--bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala3
-rw-r--r--bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala1
-rw-r--r--bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala3
-rw-r--r--bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala3
-rw-r--r--bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala17
-rw-r--r--bridge/src/sbt-test/source-dependencies/parent-member-change/test7
6 files changed, 0 insertions, 34 deletions
diff --git a/bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala b/bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala
deleted file mode 100644
index d6f828508..000000000
--- a/bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class A {
- def x(i: Int) = i+"3"
-} \ No newline at end of file
diff --git a/bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala b/bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala
deleted file mode 100644
index 26e47fd25..000000000
--- a/bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala
+++ /dev/null
@@ -1 +0,0 @@
-class B extends A \ No newline at end of file
diff --git a/bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala b/bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala
deleted file mode 100644
index 6985a0d2f..000000000
--- a/bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class C extends B {
- def x(s: String) = s+"5"
-}
diff --git a/bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala b/bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala
deleted file mode 100644
index 949655f41..000000000
--- a/bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class A {
- def x(i: String) = i+"3"
-} \ No newline at end of file
diff --git a/bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala b/bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala
deleted file mode 100644
index 3433779b6..000000000
--- a/bridge/src/sbt-test/source-dependencies/parent-member-change/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/parent-member-change/test b/bridge/src/sbt-test/source-dependencies/parent-member-change/test
deleted file mode 100644
index 95ba12295..000000000
--- a/bridge/src/sbt-test/source-dependencies/parent-member-change/test
+++ /dev/null
@@ -1,7 +0,0 @@
-> 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