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

Add Scala 3 to crossScalaVersions and CI #231

Merged
merged 4 commits into from
Jul 15, 2023
Merged

Add Scala 3 to crossScalaVersions and CI #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd20efb
Add Scala 3 to CI
mkurz Apr 5, 2023
37e97e9
Add Scala 3 to crossScalaVersions
mkurz Apr 5, 2023
fee497c
play-slick 5.2.0-M1 is published for Scala 3 now
mkurz Jul 15, 2023
ea46235
Drop silencer-lib, play-json does not use it anymore
mkurz Jul 15, 2023
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/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 2 additions & 4 deletions project/OmnidocBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
)
)

Expand Down