Skip to content

Commit

Permalink
Drop Scala 2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
mkurz committed Oct 3, 2022
1 parent 72ddbe7 commit f43503b
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
uses: playframework/.github/.github/workflows/cmd.yml@v3
with:
java: 17, 11
scala: 2.12.16, 2.13.8
scala: 2.13.8
cmd: cd docs && sbt validateDocs evaluateSbtFiles

tests:
Expand All @@ -40,7 +40,7 @@ jobs:
uses: playframework/.github/.github/workflows/cmd.yml@v3
with:
java: 17, 11
scala: 2.12.16, 2.13.8
scala: 2.13.8
cmd: sbt +publishLocal +plugin/test +plugin/scripted

finish:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ lazy val core = project
.in(file("play-ebean"))
.settings(
name := "play-ebean",
crossScalaVersions := Seq(scala212, scala213),
crossScalaVersions := Seq(scala213),
Dependencies.ebean,
mimaSettings,
Compile / compile := enhanceEbeanClasses(
Expand Down
2 changes: 1 addition & 1 deletion docs/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ lazy val docs = project
// No resource directories shuts the ebean agent up about java sources in the classes directory
Test / unmanagedResourceDirectories := Nil,
Test / parallelExecution := false,
scalaVersion := "2.12.16"
scalaVersion := "2.13.8"
)
.settings(PlayEbean.unscopedSettings: _*)
.settings(
Expand Down
2 changes: 1 addition & 1 deletion project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ object Common extends AutoPlugin {
organizationName := "Lightbend Inc.",
organizationHomepage := Some(url("https://www.lightbend.com/")),
// scala settings
scalaVersion := scala212,
scalaVersion := scala213,
scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-encoding", "utf8"),
javacOptions ++= Seq("-encoding", "UTF-8"),
// legal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val root = project
.in(file("."))
.enablePlugins(PlayJava, PlayEbean)

scalaVersion := "2.12.16"
scalaVersion := "2.13.8"

Test / sourceDirectory := baseDirectory.value / "tests"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val root = project
.in(file("."))
.enablePlugins(PlayJava, PlayEbean)

scalaVersion := "2.12.16"
scalaVersion := "2.13.8"

resolvers ++= DefaultOptions.resolvers(snapshot = true)

Expand Down

0 comments on commit f43503b

Please sign in to comment.