Merge pull request #1926 from bjaglin/scala3next

Scala3: test against both LTS & Next, build with LTS
scalacenter · Aug 1, 2024 · c57e69b · c57e69b
2 parents 5f17516 + 3c8cab3
commit c57e69b
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 11 deletions.
diff --git 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.19")
   val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.14")
-  val scala3 = sys.props.getOrElse("scala3.nightly", "3.4.2")
+  val scala3Latest = sys.props.getOrElse("scala3.nightly", "3.4.2")
+  val scala3LTS = "3.3.4-RC1"
 
   val bijectionCoreV = "0.9.7"
   val collectionCompatV = "2.12.0"

diff --git 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 =>
@@ -56,10 +56,14 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
           }
 
           val prevVersions = previousVersions(sv).map(prev => TargetAxis(prev))
+          val scala3FromScala2 = TargetAxis(scala3Latest)
           val xsource3 = TargetAxis(sv, xsource3 = true)
 
           (prevVersions :+ xsource3).map((sv, _))
-        } :+ (scala213, TargetAxis(scala3))
+        } ++ Seq(
+          (scala213, TargetAxis(scala3Latest)),
+          (scala213, TargetAxis(scala3LTS))
+        )
 
     lazy val publishLocalTransitive =
       taskKey[Unit]("Run publishLocal on this project and its dependencies")

diff --git a/scalafix-core/src/main/scala/scalafix/internal/config/ScalafixMetaconfigReaders.scala b/scalafix-core/src/main/scala/scalafix/internal/config/ScalafixMetaconfigReaders.scala
@@ -11,7 +11,6 @@ import scala.util.Try
 import scala.util.control.NonFatal
 import scala.util.matching.Regex
 
-import scala.meta.Ref
 import scala.meta._
 import scala.meta.parsers.Parse
 
@@ -23,7 +22,6 @@ import metaconfig.Configured.NotOk
 import metaconfig.Configured.Ok
 import scalafix.internal.util.SymbolOps
 import scalafix.patch.Patch.internal._
-import scalafix.v0.Symbol
 import scalafix.v0._
 
 object ScalafixMetaconfigReaders extends ScalafixMetaconfigReaders

diff --git a/scalafix-core/src/main/scala/scalafix/internal/patch/LegacyPatchOps.scala b/scalafix-core/src/main/scala/scalafix/internal/patch/LegacyPatchOps.scala
@@ -10,7 +10,6 @@ import scalafix.internal.patch.LegacyPatchOps.DeprecationMessage
 import scalafix.internal.util.SymbolOps.Root
 import scalafix.patch.Patch.internal._
 import scalafix.patch.PatchOps
-import scalafix.v0.Symbol
 import scalafix.v0._
 
 trait LegacyPatchOps extends PatchOps {

diff --git a/scalafix-core/src/main/scala/scalafix/internal/util/DenotationOps.scala b/scalafix-core/src/main/scala/scalafix/internal/util/DenotationOps.scala
@@ -1,6 +1,5 @@
 package scalafix.internal.util
 
-import scala.meta.Dialect
 import scala.meta._
 
 import scalafix.v0._

diff --git a/scalafix-core/src/main/scala/scalafix/internal/util/ProductStructure.scala b/scalafix-core/src/main/scala/scalafix/internal/util/ProductStructure.scala
@@ -1,6 +1,5 @@
 package scalafix.internal.util
 
-import scala.meta.Tree
 import scala.meta._
 
 import org.typelevel.paiges._

diff --git a/scalafix-core/src/main/scala/scalafix/patch/Patch.scala b/scalafix-core/src/main/scala/scalafix/patch/Patch.scala
@@ -1,6 +1,5 @@
 package scalafix.patch
 
-import scala.meta.Token
 import scala.meta._
 
 import org.scalameta.logger

diff --git a/scalafix-reflect/src/main/scala/scalafix/internal/v0/LegacyInMemorySemanticdbIndex.scala b/scalafix-reflect/src/main/scala/scalafix/internal/v0/LegacyInMemorySemanticdbIndex.scala
@@ -11,7 +11,6 @@ import scala.meta.internal.{semanticdb => s}
 import scalafix.internal.config.ScalaVersion
 import scalafix.internal.patch.CrashingSemanticdbIndex
 import scalafix.internal.reflect.ClasspathOps
-import scalafix.internal.v1.TreePos
 import scalafix.internal.v1._
 import scalafix.util.SemanticdbIndex
 import scalafix.v0

diff --git a/scalafix-tests/integration/src/main/scala/scalafix/test/ScalatestAutofixRule.scala b/scalafix-tests/integration/src/main/scala/scalafix/test/ScalatestAutofixRule.scala
@@ -1,6 +1,5 @@
 package scalafix.test
 
-import scalafix.v1.SemanticRule
 import scalafix.v1._
 
 class ScalatestAutofixRule extends SemanticRule("ScalatestAutofixRule") {