Skip to content

Commit

Permalink
Merge branch 'series/2.x' into update/magnolia-1.1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
ghostdogpr authored May 24, 2024
2 parents 7429131 + 7393a66 commit 56f3e1b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ val javaTimeVersion = "2.5.0"
val jsoniterVersion = "2.28.5"
val laminextVersion = "0.17.0"
val magnoliaScala2Version = "1.1.10"
val magnoliaScala3Version = "1.3.6"
val magnoliaScala3Version = "1.3.7"
val pekkoHttpVersion = "1.0.1"
val playVersion = "3.0.3"
val playJsonVersion = "3.0.3"
Expand Down Expand Up @@ -606,7 +606,7 @@ lazy val apolloCompatibility =
)
.settings(
skip := (scalaVersion.value == scala212),
ideSkipProject := (scalaVersion.value != scala212),
ideSkipProject := (scalaVersion.value == scala212),
crossScalaVersions := Seq(scala213, scala3),
libraryDependencySchemes += "org.scala-lang.modules" %% "scala-java8-compat" % "always"
)
Expand Down

0 comments on commit 56f3e1b

Please sign in to comment.