From c3eb841ce8ae349d9820dbf6c18884955e74254e Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Sun, 20 Nov 2016 00:02:50 +0100
Subject: Make every project use the new directory structure

---
 .../source-dependencies/transitive-b/changes/A2.scala   |  4 ++++
 .../transitive-b/project/DottyInjectedPlugin.scala      | 17 +++++++++++++++++
 .../transitive-b/src/main/scala/A.scala                 |  4 ++++
 .../transitive-b/src/main/scala/B.scala                 |  1 +
 .../transitive-b/src/main/scala/C.scala                 |  4 ++++
 .../sbt-test/source-dependencies/transitive-b/test      |  4 ++++
 6 files changed, 34 insertions(+)
 create mode 100644 sbt-bridge/sbt-test/source-dependencies/transitive-b/changes/A2.scala
 create mode 100644 sbt-bridge/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala
 create mode 100644 sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala
 create mode 100644 sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala
 create mode 100644 sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala
 create mode 100644 sbt-bridge/sbt-test/source-dependencies/transitive-b/test

(limited to 'sbt-bridge/sbt-test/source-dependencies/transitive-b')

diff --git a/sbt-bridge/sbt-test/source-dependencies/transitive-b/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-b/changes/A2.scala
new file mode 100644
index 000000000..3a0001416
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/transitive-b/changes/A2.scala
@@ -0,0 +1,4 @@
+trait A
+{
+	val x = 5
+}
\ No newline at end of file
diff --git a/sbt-bridge/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000..3433779b6
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/transitive-b/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/transitive-b/src/main/scala/A.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala
new file mode 100644
index 000000000..d49070e79
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala
@@ -0,0 +1,4 @@
+trait A
+{
+	val x = "a"
+}
\ No newline at end of file
diff --git a/sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala
new file mode 100644
index 000000000..310eb5b60
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala
@@ -0,0 +1 @@
+trait B extends A
\ No newline at end of file
diff --git a/sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala
new file mode 100644
index 000000000..da117fc3f
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala
@@ -0,0 +1,4 @@
+trait C extends B
+{
+	val z = x.length
+}
\ No newline at end of file
diff --git a/sbt-bridge/sbt-test/source-dependencies/transitive-b/test b/sbt-bridge/sbt-test/source-dependencies/transitive-b/test
new file mode 100644
index 000000000..774b014aa
--- /dev/null
+++ b/sbt-bridge/sbt-test/source-dependencies/transitive-b/test
@@ -0,0 +1,4 @@
+> compile
+
+$ copy-file changes/A2.scala src/main/scala/A.scala
+-> compile
\ No newline at end of file
-- 
cgit v1.2.3