From 09b2f39731386cd5b3688d5c3badf75d956d4f6d Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Tue, 31 May 2016 15:23:04 +0200
Subject: Make the dotty-bridge sbt project a subproject of dotty

Note that the dotty-bridge tests will not be run automatically by `test`
which is short for `dotty/test`, to run the dotty-bridge tests, do in sbt:
> dotty-bridge/test
> dotty-bridge/scripted

Original history: https://github.com/smarter/dotty-bridge/commits/master
---
 .../source-dependencies/parent-member-change/A.scala    |  3 +++
 .../source-dependencies/parent-member-change/B.scala    |  1 +
 .../source-dependencies/parent-member-change/C.scala    |  3 +++
 .../parent-member-change/changes/A.scala                |  3 +++
 .../project/DottyInjectedPlugin.scala                   | 17 +++++++++++++++++
 .../source-dependencies/parent-member-change/test       |  7 +++++++
 6 files changed, 34 insertions(+)
 create mode 100644 bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala
 create mode 100644 bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala
 create mode 100644 bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala
 create mode 100644 bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala
 create mode 100644 bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala
 create mode 100644 bridge/src/sbt-test/source-dependencies/parent-member-change/test

(limited to 'bridge/src/sbt-test/source-dependencies/parent-member-change')

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
new file mode 100644
index 000000000..d6f828508
--- /dev/null
+++ b/bridge/src/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/bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala b/bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala
new file mode 100644
index 000000000..26e47fd25
--- /dev/null
+++ b/bridge/src/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/bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala b/bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala
new file mode 100644
index 000000000..6985a0d2f
--- /dev/null
+++ b/bridge/src/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/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
new file mode 100644
index 000000000..949655f41
--- /dev/null
+++ b/bridge/src/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/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
new file mode 100644
index 000000000..3433779b6
--- /dev/null
+++ b/bridge/src/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/bridge/src/sbt-test/source-dependencies/parent-member-change/test b/bridge/src/sbt-test/source-dependencies/parent-member-change/test
new file mode 100644
index 000000000..95ba12295
--- /dev/null
+++ b/bridge/src/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
-- 
cgit v1.2.3