Skip to content

Commit

Permalink
Merge pull request #56 from sjrd/scala-3.4.0
Browse files Browse the repository at this point in the history
Upgrade to Scala 3.4.0 and tasty-query 1.3.0.
  • Loading branch information
sjrd authored Feb 20, 2024
2 parents 8508cd0 + a47206d commit c2eb93d
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 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.3.1"),
crossScalaVersions := Seq("3.4.0"),
scalaVersion := crossScalaVersions.value.head,

scalacOptions ++= Seq(
Expand All @@ -28,9 +28,12 @@ inThisBuild(Def.settings(
Developer("bishabosha", "Jamie Thompson", "[email protected]", url("https://github.com/bishabosha")),
),

versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
versionPolicyIntention := Compatibility.BinaryCompatible,
// Ignore dependencies to internal modules whose version is like `1.2.3+4...` (see https://github.com/scalacenter/sbt-version-policy#how-to-integrate-with-sbt-dynver)
versionPolicyIgnoredInternalDependencyVersions := Some("^\\d+\\.\\d+\\.\\d+\\+\\d+".r),

// Temporary until we upgrade to an sbt-tasty-mima that supports Scala 3.4.x out of the box
tastyMiMaTastyQueryVersionOverride := Some("1.3.0"),
))

val commonSettings = Seq(
Expand Down Expand Up @@ -94,7 +97,7 @@ lazy val tastyMiMa =
testFrameworks += new TestFramework("munit.Framework")
)
.settings(
libraryDependencies += "ch.epfl.scala" %% "tasty-query" % "1.2.0",
libraryDependencies += "ch.epfl.scala" %% "tasty-query" % "1.3.0",

Test / rtJarOpt := {
for (bootClasspath <- Option(System.getProperty("sun.boot.class.path"))) yield {
Expand Down

0 comments on commit c2eb93d

Please sign in to comment.