Skip to content

Commit

Permalink
Merge pull request #28 from sjrd/tasty-query-0.5.7-scala-3.2
Browse files Browse the repository at this point in the history
Upgrade to Scala 3.2.2 and tasty-query 0.5.7.
  • Loading branch information
sjrd authored Jan 13, 2023
2 parents 2fdbd52 + 90d4bdc commit 435bc67
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ val rtJarOpt = taskKey[Option[String]]("Path to rt.jar if it exists")
val javalibEntry = taskKey[String]("Path to rt.jar or \"jrt:/\"")

inThisBuild(Def.settings(
crossScalaVersions := Seq("3.1.0"),
crossScalaVersions := Seq("3.2.2"),
scalaVersion := crossScalaVersions.value.head,

scalacOptions ++= Seq(
Expand Down Expand Up @@ -74,7 +74,7 @@ lazy val tastyMiMa =
testFrameworks += new TestFramework("munit.Framework")
)
.settings(
libraryDependencies += "ch.epfl.scala" %% "tasty-query" % "0.5.6",
libraryDependencies += "ch.epfl.scala" %% "tasty-query" % "0.5.7",

Test / rtJarOpt := {
for (bootClasspath <- Option(System.getProperty("sun.boot.class.path"))) yield {
Expand Down
4 changes: 2 additions & 2 deletions tasty-mima/src/main/scala/tastymima/Analyzer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ private[tastymima] final class Analyzer(val config: Config, val oldCtx: Context,
import Analyzer.*

private val problemFilters: List[ProblemMatcher] =
import scala.collection.JavaConverters.*
import scala.jdk.CollectionConverters.*
config.getProblemFilters().nn.asScala.toList

private val artifactPrivatePackagePaths: List[List[SimpleName]] =
import scala.collection.JavaConverters.*
import scala.jdk.CollectionConverters.*
for stringPath <- config.getArtifactPrivatePackages().nn.asScala.toList
yield stringPath.split('.').toList.map(termName(_))

Expand Down
2 changes: 1 addition & 1 deletion tasty-mima/src/main/scala/tastymima/TastyMiMa.scala
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ final class TastyMiMa(config: Config) extends ITastyMiMa:
newClasspath: JList[Path],
newClasspathEntry: Path
): JList[IProblem] =
import scala.collection.JavaConverters.*
import scala.jdk.CollectionConverters.*

val problems =
analyze(oldClasspath.asScala.toList, oldClasspathEntry, newClasspath.asScala.toList, newClasspathEntry)
Expand Down
2 changes: 1 addition & 1 deletion tasty-mima/src/test/scala/tastymima/JavaAPISuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import tastymima.intf.{Config, ProblemKind}

class JavaAPISuite extends munit.FunSuite:
def analyzeTestLib(tastyMiMa: intf.TastyMiMa): List[intf.Problem] =
import scala.collection.JavaConverters.*
import scala.jdk.CollectionConverters.*
import TestClasspaths.*

val javaProblems =
Expand Down

0 comments on commit 435bc67

Please sign in to comment.