Skip to content

Commit

Permalink
Merge pull request #146 from velocidi/scala-2.12.15
Browse files Browse the repository at this point in the history
Update Scala 2 to 2.12.15
  • Loading branch information
beatriz authored Oct 5, 2021
2 parents 1eb4c76 + 1f2f5a1 commit 269800b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
scala: ['2.12', '2.13']
include:
- scala: '2.12'
scala-version: 2.12.14
scala-version: 2.12.15
- scala: '2.13'
scala-version: 2.13.6

Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import spray.boilerplate.BoilerplatePlugin

ThisBuild / organization := "com.velocidi"

ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6")
ThisBuild / scalaVersion := "2.12.14"
ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.6")
ThisBuild / scalaVersion := "2.12.15"

def module(project: Project, moduleName: String) =
(project in file(moduleName))
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.29")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")
Expand Down

0 comments on commit 269800b

Please sign in to comment.