Skip to content

Commit

Permalink
Merge branch 'main' into update/play-2.9.3
Browse files Browse the repository at this point in the history
  • Loading branch information
phelps-sg authored May 11, 2024
2 parents 5ac0f26 + 40e0a24 commit c2e9b52
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/continouos-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
strategy:
fail-fast: true
matrix:
scala: [ '2.13.13' ]
scala: [ '2.13.14' ]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -70,12 +70,12 @@ jobs:
matrix:
distribution: [ 'corretto' ]
jdk: [ '11' ]
scala: [ '2.13.13' ]
scala: [ '2.13.14' ]
experimental: [ false ]
include:
- jdk: '17'
distribution: 'corretto'
scala: '2.13.13'
scala: '2.13.14'
experimental: true

steps:
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import sbt.plugins.JvmPlugin
object Dependencies extends AutoPlugin {

object Version {
val scala213 = "2.13.13"
val scala213 = "2.13.14"

val play = "2.9.3"
val guice = "7.0.0"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.0
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")

// CI Release plugin.
// ~
Expand All @@ -11,7 +11,7 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
// ~
// sbt-scoverage is a plugin for SBT that integrates the scoverage code coverage library.
// See more: https://github.com/scoverage/sbt-scoverage
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")

// Fixing Scala-Xml mess (Temp).
ThisBuild / libraryDependencySchemes ++= Seq(
Expand Down

0 comments on commit c2e9b52

Please sign in to comment.