Skip to content

Commit

Permalink
Merge pull request #564 from http4s/scala-2.12.15
Browse files Browse the repository at this point in the history
Update Scala 2.12 to `2.12.15`
  • Loading branch information
rossabaker authored Sep 15, 2021
2 parents 1573f0a + 4aff956 commit 1343764
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
scala: [2.12.14, 2.13.6, 3.0.2]
scala: [2.12.15, 2.13.6, 3.0.2]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down
15 changes: 13 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ ThisBuild / versionIntroduced := Map(
"3.0.0-RC3" -> "0.15.0"
)

ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6", "3.0.2")
val Scala212 = "2.12.15"
val Scala213 = "2.13.6"
val Scala3 = "3.0.2"

ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, Scala3)
ThisBuild / scalaVersion := crossScalaVersions.value.filter(_.startsWith("2.")).last

lazy val commonSettings = Seq(
Expand Down Expand Up @@ -56,7 +60,14 @@ lazy val commonSettings = Seq(
Some("scm:git:[email protected]:http4s/blaze.git")
)
),
startYear := Some(2014)
startYear := Some(2014),
libraryDependencies ++= (
if (ScalaArtifacts.isScala3(scalaVersion.value)) Nil
else
Seq(
compilerPlugin(kindProjector.cross(CrossVersion.full))
)
)
)

ThisBuild / githubWorkflowJavaVersions := Seq("[email protected]")
Expand Down
1 change: 1 addition & 0 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ object Dependencies {
lazy val log4s = "org.log4s" %% "log4s" % "1.10.0"
lazy val munit = "org.scalameta" %% "munit" % "0.7.27"
lazy val scalacheckMunit = "org.scalameta" %% "munit-scalacheck" % munit.revision
lazy val kindProjector = "org.typelevel" % "kind-projector" % "0.13.2"
}

0 comments on commit 1343764

Please sign in to comment.