From f7b068a7f4e0e311aa38962986abd1d8c810e698 Mon Sep 17 00:00:00 2001 From: Brice Jaglin Date: Tue, 6 Feb 2024 08:53:21 +0100 Subject: [PATCH] Scala3: build with LTS, test Scala2 & Scala 3 against LTS & latest --- project/Dependencies.scala | 3 ++- project/ScalafixBuild.scala | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 238bf0dd27..4ceaec8b36 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,8 @@ import sbt._ object Dependencies { val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.18") val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.12") - val scala3 = sys.props.getOrElse("scala3.nightly", "3.4.0-RC2") + val scala3LTS = sys.props.getOrElse("scala3.nightly", "3.3.2-RC4") + val scala3Latest = sys.props.getOrElse("scala3.nightly", "3.4.0-RC4") val bijectionCoreV = "0.9.7" val collectionCompatV = "2.11.0" diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala index e8fb0b04ec..7887468954 100644 --- a/project/ScalafixBuild.scala +++ b/project/ScalafixBuild.scala @@ -31,7 +31,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys { publish / skip := true ) lazy val supportedScalaVersions = List(scala213, scala212) - lazy val buildScalaVersions = Seq(scala212, scala213, scala3) + lazy val buildScalaVersions = Seq(scala212, scala213, scala3LTS) lazy val buildScalaVersionsWithTargets: Seq[(String, TargetAxis)] = buildScalaVersions.map(sv => (sv, TargetAxis(sv))) ++ Seq(scala213, scala212).flatMap { sv => @@ -52,11 +52,11 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys { } val prevVersions = previousVersions(sv).map(prev => TargetAxis(prev)) - val scala3FromScala2 = TargetAxis(scala3) + val scala3FromScala2 = TargetAxis(scala3Latest) val xsource3 = TargetAxis(sv, xsource3 = true) (prevVersions :+ scala3FromScala2 :+ xsource3).map((sv, _)) - } + } // :+ (scala3LTS, TargetAxis(scala3Latest)) lazy val publishLocalTransitive = taskKey[Unit]("Run publishLocal on this project and its dependencies")