diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2016-10-11 17:28:39 +0200 |
|---|---|---|
| committer | Guillaume Martres <smarter@ubuntu.com> | 2016-11-22 01:35:06 +0100 |
| commit | 2d10c87ce537fb42fdb134efcae53dca7305a7b7 (patch) | |
| tree | a3629c9a3ad6db3e9d07df8fa8621f8c8211076c /bridge/src/sbt-test/source-dependencies/default-params | |
| parent | 34d64f381362b12a595fd26690c7c9b1c26d16f7 (diff) | |
| download | dotty-2d10c87ce537fb42fdb134efcae53dca7305a7b7.tar.gz dotty-2d10c87ce537fb42fdb134efcae53dca7305a7b7.tar.bz2 dotty-2d10c87ce537fb42fdb134efcae53dca7305a7b7.zip | |
Move sbt-bridge
Diffstat (limited to 'bridge/src/sbt-test/source-dependencies/default-params')
5 files changed, 0 insertions, 40 deletions
diff --git a/bridge/src/sbt-test/source-dependencies/default-params/A.scala b/bridge/src/sbt-test/source-dependencies/default-params/A.scala deleted file mode 100644 index 50baa662f..000000000 --- a/bridge/src/sbt-test/source-dependencies/default-params/A.scala +++ /dev/null @@ -1,5 +0,0 @@ -object A -{ - def x(f: String, g: Int): Int = g - def x(f: Int, g: Int = 3): Int = g -}
\ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/default-params/B.scala b/bridge/src/sbt-test/source-dependencies/default-params/B.scala deleted file mode 100644 index 59a7159f9..000000000 --- a/bridge/src/sbt-test/source-dependencies/default-params/B.scala +++ /dev/null @@ -1,4 +0,0 @@ -object B -{ - val y = A.x(5) -}
\ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala b/bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala deleted file mode 100644 index b59015306..000000000 --- a/bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala +++ /dev/null @@ -1,5 +0,0 @@ -object A -{ - def x(f: String, g: Int = 3): Int = g - def x(f: Int, g: Int): Int = g -}
\ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala b/bridge/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3433779b6..000000000 --- a/bridge/src/sbt-test/source-dependencies/default-params/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/default-params/test b/bridge/src/sbt-test/source-dependencies/default-params/test deleted file mode 100644 index 1e674f8f6..000000000 --- a/bridge/src/sbt-test/source-dependencies/default-params/test +++ /dev/null @@ -1,9 +0,0 @@ -> compile - -# switch which 'x' method has a default for the second parameter in A -# this change is selected because of the encoding of default method names -$ copy-file changes/A.scala A.scala - -# Both A.scala and B.scala need to be recompiled because the parameter needs to be explicitly provided -# and it should be a compile error --> compile |