From 2d10c87ce537fb42fdb134efcae53dca7305a7b7 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 11 Oct 2016 17:28:39 +0200 Subject: Move sbt-bridge --- .../export-jars/changes/A1.scala | 1 - .../export-jars/changes/A2.scala | 1 - .../export-jars/changes/A3.scala | 1 - .../export-jars/changes/B.scala | 4 ---- .../export-jars/changes/build2.sbt | 1 - .../export-jars/project/Build.scala | 7 ------ .../export-jars/project/DottyInjectedPlugin.scala | 17 -------------- .../sbt-test/source-dependencies/export-jars/test | 27 ---------------------- 8 files changed, 59 deletions(-) delete mode 100644 bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala delete mode 100644 bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala delete mode 100644 bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala delete mode 100644 bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala delete mode 100644 bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt delete mode 100644 bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala delete mode 100644 bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala delete mode 100644 bridge/src/sbt-test/source-dependencies/export-jars/test (limited to 'bridge/src/sbt-test/source-dependencies/export-jars') diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala b/bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala deleted file mode 100644 index 210adf865..000000000 --- a/bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala +++ /dev/null @@ -1 +0,0 @@ -object A { val x = 1 } diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala b/bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala deleted file mode 100644 index 799400c8c..000000000 --- a/bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala +++ /dev/null @@ -1 +0,0 @@ -object A { val x = 2 } diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala b/bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala deleted file mode 100644 index 25fb93965..000000000 --- a/bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala +++ /dev/null @@ -1 +0,0 @@ -object A { def x = 3 } diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala b/bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala deleted file mode 100644 index 058527993..000000000 --- a/bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala +++ /dev/null @@ -1,4 +0,0 @@ -object B -{ - def main(args: Array[String]) = assert(args(0).toInt == A.x ) -} \ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt b/bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt deleted file mode 100644 index 0f5735bc8..000000000 --- a/bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt +++ /dev/null @@ -1 +0,0 @@ -exportJars := true \ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala b/bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala deleted file mode 100644 index 4a783acbe..000000000 --- a/bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala +++ /dev/null @@ -1,7 +0,0 @@ -import sbt._ - -object Build extends Build -{ - lazy val root = Project("root", file(".")) dependsOn(a) - lazy val a = Project("a", file("a")) -} \ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala b/bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3433779b6..000000000 --- a/bridge/src/sbt-test/source-dependencies/export-jars/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/export-jars/test b/bridge/src/sbt-test/source-dependencies/export-jars/test deleted file mode 100644 index e06ce1ee5..000000000 --- a/bridge/src/sbt-test/source-dependencies/export-jars/test +++ /dev/null @@ -1,27 +0,0 @@ -$ copy-file changes/B.scala B.scala - -$ copy-file changes/A1.scala a/A.scala -> run 1 -$ copy-file changes/A2.scala a/A.scala - -# done this way because last modified times often have ~1s resolution -$ sleep 2000 -> run 2 -$ copy-file changes/A3.scala a/A.scala - -$ sleep 2000 -> run 3 - -$ copy-file changes/build2.sbt build.sbt -> reload - -$ copy-file changes/A1.scala a/A.scala -> run 1 -$ copy-file changes/A2.scala a/A.scala - -$ sleep 2000 -> run 2 -$ copy-file changes/A3.scala a/A.scala - -$ sleep 2000 -> run 3 -- cgit v1.2.3