From c013d1180cc81e4e1e1a24e287317c8f2e5a3cb5 Mon Sep 17 00:00:00 2001 From: Amina Adewusi Date: Fri, 17 Sep 2021 17:46:07 +0100 Subject: [PATCH] Bump scala version to 2.12.15 --- build.sbt | 2 +- main/src/main/scala/sbt/PluginCross.scala | 2 +- project/Dependencies.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 55a26b6ab..0e6137e5c 100644 --- a/build.sbt +++ b/build.sbt @@ -45,7 +45,7 @@ ThisBuild / scmInfo := Some( ThisBuild / resolvers += Resolver.mavenLocal Global / semanticdbEnabled := !(Global / insideCI).value -Global / semanticdbVersion := "4.4.20" +Global / semanticdbVersion := "4.4.28" val excludeLint = SettingKey[Set[Def.KeyedInitialize[_]]]("excludeLintKeys") Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty) Global / excludeLint += componentID diff --git a/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala index 39dc0a071..98d5d57e1 100644 --- a/main/src/main/scala/sbt/PluginCross.scala +++ b/main/src/main/scala/sbt/PluginCross.scala @@ -99,7 +99,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.14" + case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.15" case _ => sys.error(s"Unsupported sbt binary version: $sv") } } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3d398e5bb..d5035cf74 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._ object Dependencies { // WARNING: Please Scala update versions in PluginCross.scala too - val scala212 = "2.12.14" + val scala212 = "2.12.15" val scala213 = "2.13.6" val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up") val baseScalaVersion = scala212 @@ -116,5 +116,5 @@ object Dependencies { val hedgehog = "qa.hedgehog" %% "hedgehog-sbt" % "0.6.1" val disruptor = "com.lmax" % "disruptor" % "3.4.2" - val kindProjector = ("org.typelevel" % "kind-projector" % "0.13.0").cross(CrossVersion.full) + val kindProjector = ("org.typelevel" % "kind-projector" % "0.13.2").cross(CrossVersion.full) }