Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Scala version in sbt and GH Workflows #445

Merged
merged 1 commit into from
Oct 22, 2020
Merged

Update Scala version in sbt and GH Workflows #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/scala.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
scala: [2.12.11, 2.13.2]
scala: [2.12.12, 2.13.3]

steps:
- uses: actions/checkout@v2
Expand Down
15 changes: 9 additions & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ developers in ThisBuild := List(

val minorVersion = SettingKey[Int]("minor scala version")

val crossCompile = crossScalaVersions := List("2.13.2", "2.12.11")
val scala212V = "2.12.12"
val scala213V = "2.13.3"

val crossCompile = crossScalaVersions := List(scala212V, scala213V)

val commonScalacOptions = scalacOptions ++= List(
"-deprecation",
Expand Down Expand Up @@ -65,12 +68,12 @@ val setMinorVersion = minorVersion := {

lazy val compilerPlugins = libraryDependencies ++= List(
compilerPlugin("org.typelevel" %% "kind-projector" % Version.kindProjector),
compilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
compilerPlugin("com.olegpy" %% "better-monadic-for" % Version.bm4),
)

val paradise = libraryDependencies ++= {
minorVersion.value match {
case 12 => List(compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.patch))
case 12 => List(compilerPlugin("org.scalamacros" % "paradise" % Version.macroParadise cross CrossVersion.patch))
case 13 => List()
}
}
Expand Down Expand Up @@ -132,7 +135,7 @@ val swaggerUIVersion = SettingKey[String]("swaggerUIVersion")
lazy val testLibs = libraryDependencies ++= scalatest :: scalacheck :: scalatestScalacheck :: Nil

lazy val commonSettings = publishSettings ++ List(
scalaVersion := "2.13.2",
scalaVersion := scala213V,
collectionCompat,
compilerPlugins,
commonScalacOptions,
Expand Down Expand Up @@ -311,7 +314,7 @@ lazy val docs = project
.in(file("modules/docs"))
.enablePlugins(ScalaUnidocPlugin)
.settings(
scalaVersion := "2.13.2",
scalaVersion := scala213V,
publish / skip := true,
crossCompile,
setMinorVersion,
Expand All @@ -324,7 +327,7 @@ lazy val typedschema =
.dependsOn(macros, kernel, main)
.settings(
publish / skip := true,
scalaVersion := "2.13.2",
scalaVersion := scala213V,
publishSettings,
setMinorVersion,
crossCompile
Expand Down
4 changes: 4 additions & 0 deletions project/Version.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ object Version {

val kindProjector = "0.10.3"

val bm4 = "0.3.1"

val macroParadise = "2.1.1"

val akkaHttpCirce = "1.35.0"

val cats = "2.2.0"
Expand Down