From cd20efb6be070fe5a48cb67f3d54f6d6743a6dad Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 5 Apr 2023 14:43:31 +0200 Subject: [PATCH 1/4] Add Scala 3 to CI --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 3d0ab86..c95d982 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -18,7 +18,7 @@ jobs: uses: playframework/.github/.github/workflows/cmd.yml@v3 with: java: 17, 11 - scala: 2.13.x + scala: 2.13.x, 3.x cmd: sbt ++$MATRIX_SCALA publishLocal # Check that we can actually build and package the library finish: From 37e97e99771e301aa498dab617da9c0d767cd1a7 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 5 Apr 2023 14:52:15 +0200 Subject: [PATCH 2/4] Add Scala 3 to crossScalaVersions --- project/OmnidocBuild.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/OmnidocBuild.scala b/project/OmnidocBuild.scala index 887c466..874b153 100644 --- a/project/OmnidocBuild.scala +++ b/project/OmnidocBuild.scala @@ -118,7 +118,7 @@ object OmnidocBuild { def projectSettings: Seq[Setting[_]] = Seq( name := "play-omnidoc", ThisBuild / playBuildRepoName := "omnidoc", - crossScalaVersions := Seq(ScalaVersions.scala213), + crossScalaVersions := Seq(ScalaVersions.scala213, ScalaVersions.scala3), resolvers ++= Resolver.sonatypeOssRepos("snapshots") ++ Resolver.sonatypeOssRepos("releases"), useCoursier := false, // so updatePlaydocClassifiers isn't empty From fee497ca08ef12e63f6a24711b3cf2536d9b1b0b Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 15 Jul 2023 14:43:13 +0200 Subject: [PATCH 3/4] play-slick 5.2.0-M1 is published for Scala 3 now --- project/OmnidocBuild.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/OmnidocBuild.scala b/project/OmnidocBuild.scala index 874b153..c2714dc 100644 --- a/project/OmnidocBuild.scala +++ b/project/OmnidocBuild.scala @@ -23,7 +23,7 @@ object OmnidocBuild { val playVersion = sys.props.getOrElse("play.version", "2.9.0-M6") val scalaTestPlusPlayVersion = sys.props.getOrElse("scalatestplus-play.version", "6.0.0-M6") val playJsonVersion = sys.props.getOrElse("play-json.version", "2.10.0-RC9") - val playSlickVersion = sys.props.getOrElse("play-slick.version", "5.1.0") + val playSlickVersion = sys.props.getOrElse("play-slick.version", "5.2.0-M1") val maybeTwirlVersion = sys.props.get("twirl.version") // List Play artifacts so that they can be added as dependencies From ea46235619f93248c89a4d79ba4cb8910e08660d Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 15 Jul 2023 15:32:37 +0200 Subject: [PATCH 4/4] Drop silencer-lib, play-json does not use it anymore See 902ac4fbbf2624cafdd39cb7437b5330fe64ae3d --- project/OmnidocBuild.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/project/OmnidocBuild.scala b/project/OmnidocBuild.scala index c2714dc..5d0af9f 100644 --- a/project/OmnidocBuild.scala +++ b/project/OmnidocBuild.scala @@ -136,8 +136,6 @@ object OmnidocBuild { libraryDependencies ++= externalModules.map(_ % Omnidoc.name), libraryDependencies ++= Seq( playOrganisation %% "play-docs" % playVersion, - compilerPlugin("com.github.ghik" %% "silencer-plugin" % "1.4.2"), - "com.github.ghik" %% "silencer-lib" % "1.4.2" % Omnidoc.name ) )