luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Scala 2.12.13

This commit is contained in:
Eugene Yokota 2021-01-31 12:59:31 -05:00
parent 0a6e5c3116
commit 61a077e3a6
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -113,7 +113,7 @@ def commonBaseSettings: Seq[Setting[_]] = Def.settings(
) )
def commonSettings: Seq[Setting[_]] = def commonSettings: Seq[Setting[_]] =
commonBaseSettings :+ commonBaseSettings :+
addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.11.0" cross CrossVersion.full) addCompilerPlugin(kindProjector)
def utilCommonSettings: Seq[Setting[_]] = def utilCommonSettings: Seq[Setting[_]] =
commonBaseSettings :+ (crossScalaVersions := (scala212 :: scala213 :: Nil)) commonBaseSettings :+ (crossScalaVersions := (scala212 :: scala213 :: Nil))

6
internal/util-collection/src/main/scala/sbt/internal/util/TypeFunctions.scala
View File

@ -18,11 +18,11 @@ trait TypeFunctions {
private type AnyLeft[T] = Left[T, Nothing] private type AnyLeft[T] = Left[T, Nothing]
private type AnyRight[T] = Right[Nothing, T] 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") λ[Id ~> AnyLeft](Left(_)).setToString("TypeFunctions.left")
final val right: Id ~> Right[Nothing, ?] = final val right: Id ~> Right[Nothing, *] =
λ[Id ~> AnyRight](Right(_)).setToString("TypeFunctions.right") λ[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 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 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") final def idK[M[_]]: M ~> M = λ[M ~> M](m => m).setToString("TypeFunctions.idK")

2
main/src/main/scala/sbt/PluginCross.scala
View File

@ -96,7 +96,7 @@ private[sbt] object PluginCross {
VersionNumber(sv) match { VersionNumber(sv) match {
case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2" case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2"
case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7" 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") case _ => sys.error(s"Unsupported sbt binary version: $sv")
} }
} }

7
project/Dependencies.scala
View File

@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies { object Dependencies {
// WARNING: Please Scala update versions in PluginCross.scala too // 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 scala213 = "2.13.3"
val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up") val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
val baseScalaVersion = scala212 val baseScalaVersion = scala212
@ -114,6 +114,7 @@ object Dependencies {
val hedgehog = "qa.hedgehog" %% "hedgehog-sbt" % "0.6.1" val hedgehog = "qa.hedgehog" %% "hedgehog-sbt" % "0.6.1"
val disruptor = "com.lmax" % "disruptor" % "3.4.2" val disruptor = "com.lmax" % "disruptor" % "3.4.2"
val silencerPlugin = "com.github.ghik" %% "silencer-plugin" % "1.4.2" val silencerPlugin = ("com.github.ghik" % "silencer-plugin" % "1.7.1").cross(CrossVersion.full)
val silencerLib = "com.github.ghik" %% "silencer-lib" % "1.4.2" % Provided 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)
} }

2
tasks/src/main/scala/sbt/Execute.scala
View File

@ -62,7 +62,7 @@ private[sbt] final class Execute[F[_] <: AnyRef](
private[this] val reverse = idMap[F[_], Iterable[F[_]]] private[this] val reverse = idMap[F[_], Iterable[F[_]]]
private[this] val callers = pMap[F, Compose[IDSet, F]#Apply] private[this] val callers = pMap[F, Compose[IDSet, F]#Apply]
private[this] val state = idMap[F[_], State] 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 results = pMap[F, Result]
private[this] val getResult: F ~> Result = λ[F ~> Result]( private[this] val getResult: F ~> Result = λ[F ~> Result](