mirror of https://github.com/sbt/sbt.git
Bump tests to 2.12
This commit is contained in:
Eugene Yokota
parent
2afff9571b
commit
94e18992b5
|
|
@ -1,4 +1,4 @@
|
|||
scalaVersion in ThisBuild := "2.11.8"
|
||||
ThisBuild / scalaVersion := "2.12.7"
|
||||
|
||||
lazy val dep = project
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
trait Foo
|
||||
trait BarA
|
||||
trait BarB
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
import scala.util.continuations._
|
||||
|
||||
class Use {
|
||||
val a = new Baz
|
||||
def bar: (Foo with BarA) @cpsParam[Unit, Unit] = a.foo
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
scalaVersion := "2.10.6"
|
||||
autoCompilerPlugins := true
|
||||
libraryDependencies += compilerPlugin("org.scala-lang.plugins" % "continuations" % scalaVersion.value)
|
||||
scalacOptions += "-P:continuations:enable"
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
import scala.util.continuations._
|
||||
|
||||
class Baz {
|
||||
def foo = shiftUnit[Foo with BarA, Unit, Unit](null)
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
import scala.util.continuations._
|
||||
|
||||
class Baz {
|
||||
def foo = shiftUnit[Foo with BarB, Unit, Unit](null)
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
# Compile code with a type (Foo with BarA) @cpsParam...
|
||||
# The spec says only simple types can be annotated, but scalac allows any type.
|
||||
$ copy-file changes/Def1.scala Def.scala
|
||||
> compile
|
||||
|
||||
# To ensure it was properly processed, change it to (Foo with BarB) @cpsParam...
|
||||
# This should invalidate Use.scala, which expects it to be BarA and so compilation should fail.
|
||||
$ delete Def.scala
|
||||
$ copy-file changes/Def2.scala Def.scala
|
||||
-> compile
|
||||
|
|
@ -1,7 +1,3 @@
|
|||
# A.scala needs B.scala, it won't be in source list
|
||||
> ++2.11.4!
|
||||
-> compile
|
||||
|
||||
# A.scala needs B.scala, it would be in source list
|
||||
> ++2.10.4!
|
||||
> ++2.12.7!
|
||||
> compile
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
val paradiseVersion = "2.0.1"
|
||||
ThisBuild / scalaVersion := "2.12.7"
|
||||
|
||||
val paradiseVersion = "2.1.1"
|
||||
val commonSettings = Seq(
|
||||
version := "1.0.0",
|
||||
scalacOptions ++= Seq(""),
|
||||
scalaVersion := "2.11.4",
|
||||
resolvers += Resolver.sonatypeRepo("snapshots"),
|
||||
resolvers += Resolver.sonatypeRepo("releases"),
|
||||
addCompilerPlugin("org.scalamacros" % "paradise" % paradiseVersion cross CrossVersion.full)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
ThisBuild / scalaVersion := "2.12.7"
|
||||
|
||||
val defaultSettings = Seq(
|
||||
scalaVersion := "2.10.6",
|
||||
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package macro
|
||||
package macros
|
||||
|
||||
object Client {
|
||||
Provider.printTree(Provider.printTree(Foo.str))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package macro
|
||||
package macros
|
||||
|
||||
object Foo {
|
||||
def str: String = "abc"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
package macro
|
||||
package macros
|
||||
object Foo {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package macro
|
||||
package macros
|
||||
import scala.language.experimental.macros
|
||||
import scala.reflect.macros._
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
ThisBuild / scalaVersion := "2.12.7"
|
||||
|
||||
val defaultSettings = Seq(
|
||||
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
ThisBuild / scalaVersion := "2.12.7"
|
||||
|
||||
val defaultSettings = Seq(
|
||||
scalaVersion := "2.10.6",
|
||||
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package macro
|
||||
package macros
|
||||
|
||||
object Client {
|
||||
Provider.printTree(Foo.str)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package macro
|
||||
package macros
|
||||
|
||||
object Foo {
|
||||
def str: String = "abc"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
package macro
|
||||
package macros
|
||||
object Foo {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package macro
|
||||
package macros
|
||||
import scala.language.experimental.macros
|
||||
import scala.reflect.macros._
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
ThisBuild / scalaVersion := "2.12.7"
|
||||
|
||||
val defaultSettings = Seq(
|
||||
scalaVersion := "2.10.6",
|
||||
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package macro
|
||||
package macros
|
||||
|
||||
object Client {
|
||||
Provider.tree(0)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package macro
|
||||
package macros
|
||||
import scala.language.experimental.macros
|
||||
import scala.reflect.macros._
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package macro
|
||||
package macros
|
||||
import scala.language.experimental.macros
|
||||
import scala.reflect.macros._
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue