mirror of https://github.com/sbt/sbt.git
Scala 2.12.13
This commit is contained in:
parent
0a6e5c3116
commit
61a077e3a6
|
|
@ -113,7 +113,7 @@ def commonBaseSettings: Seq[Setting[_]] = Def.settings(
|
|||
)
|
||||
def commonSettings: Seq[Setting[_]] =
|
||||
commonBaseSettings :+
|
||||
addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.11.0" cross CrossVersion.full)
|
||||
addCompilerPlugin(kindProjector)
|
||||
def utilCommonSettings: Seq[Setting[_]] =
|
||||
commonBaseSettings :+ (crossScalaVersions := (scala212 :: scala213 :: Nil))
|
||||
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ trait TypeFunctions {
|
|||
private type AnyLeft[T] = Left[T, Nothing]
|
||||
private type AnyRight[T] = Right[Nothing, T]
|
||||
|
||||
final val left: Id ~> Left[?, Nothing] =
|
||||
final val left: Id ~> Left[*, Nothing] =
|
||||
λ[Id ~> AnyLeft](Left(_)).setToString("TypeFunctions.left")
|
||||
final val right: Id ~> Right[Nothing, ?] =
|
||||
final val right: Id ~> Right[Nothing, *] =
|
||||
λ[Id ~> AnyRight](Right(_)).setToString("TypeFunctions.right")
|
||||
final val some: Id ~> Some[?] = λ[Id ~> Some](Some(_)).setToString("TypeFunctions.some")
|
||||
final val some: Id ~> Some[*] = λ[Id ~> Some](Some(_)).setToString("TypeFunctions.some")
|
||||
final def idFun[T]: T => T = ((t: T) => t).setToString("TypeFunctions.id")
|
||||
final def const[A, B](b: B): A => B = ((_: A) => b).setToString(s"TypeFunctions.const($b)")
|
||||
final def idK[M[_]]: M ~> M = λ[M ~> M](m => m).setToString("TypeFunctions.idK")
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ private[sbt] object PluginCross {
|
|||
VersionNumber(sv) match {
|
||||
case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2"
|
||||
case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7"
|
||||
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.12"
|
||||
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.13"
|
||||
case _ => sys.error(s"Unsupported sbt binary version: $sv")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
|
|||
|
||||
object Dependencies {
|
||||
// WARNING: Please Scala update versions in PluginCross.scala too
|
||||
val scala212 = "2.12.12"
|
||||
val scala212 = "2.12.13"
|
||||
val scala213 = "2.13.3"
|
||||
val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
|
||||
val baseScalaVersion = scala212
|
||||
|
|
@ -114,6 +114,7 @@ object Dependencies {
|
|||
|
||||
val hedgehog = "qa.hedgehog" %% "hedgehog-sbt" % "0.6.1"
|
||||
val disruptor = "com.lmax" % "disruptor" % "3.4.2"
|
||||
val silencerPlugin = "com.github.ghik" %% "silencer-plugin" % "1.4.2"
|
||||
val silencerLib = "com.github.ghik" %% "silencer-lib" % "1.4.2" % Provided
|
||||
val silencerPlugin = ("com.github.ghik" % "silencer-plugin" % "1.7.1").cross(CrossVersion.full)
|
||||
val silencerLib = ("com.github.ghik" % "silencer-lib" % "1.7.1").cross(CrossVersion.full)
|
||||
val kindProjector = ("org.typelevel" % "kind-projector" % "0.11.3").cross(CrossVersion.full)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ private[sbt] final class Execute[F[_] <: AnyRef](
|
|||
private[this] val reverse = idMap[F[_], Iterable[F[_]]]
|
||||
private[this] val callers = pMap[F, Compose[IDSet, F]#Apply]
|
||||
private[this] val state = idMap[F[_], State]
|
||||
private[this] val viewCache = pMap[F, Node[F, ?]]
|
||||
private[this] val viewCache = pMap[F, Node[F, *]]
|
||||
private[this] val results = pMap[F, Result]
|
||||
|
||||
private[this] val getResult: F ~> Result = λ[F ~> Result](
|
||||
|
|
|
|||
Loading…
Reference in New Issue