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

Update Play Framework and JsonPlay to support Scala 3 #3089

Merged
merged 18 commits into from
Oct 26, 2023
Merged

Update Play Framework and JsonPlay to support Scala 3 #3089

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
42ca408
General remove scala2.12
KapStorm Jul 29, 2023
6844db8
Add scala3 to play related projects
KapStorm Jul 31, 2023
92b697e
Redo temporal modifications about commenting projects and dependencies
KapStorm Aug 1, 2023
db3900e
Redo openapiDocs and awsExamples for scala2.12
KapStorm Aug 1, 2023
5da1a2c
Minor changes
KapStorm Aug 1, 2023
05c0780
playJson version
KapStorm Aug 1, 2023
e2d9b28
Merge branch 'master' into tapir-play-server-scala3
KapStorm Aug 1, 2023
68cb7e3
Merge branch 'master' into tapir-play-server-scala3
kciesielski Sep 26, 2023
ce7ece7
Switch to 2.9.0-RC2
kciesielski Sep 26, 2023
623497d
Switch to Play 3.0 and play-pekko-http-server
kciesielski Oct 25, 2023
eb99238
Merge branch 'master' into tapir-play-server-scala3
kciesielski Oct 25, 2023
cec0455
Fix package
kciesielski Oct 25, 2023
c790d9d
Update docs
kciesielski Oct 25, 2023
fe2abbf
Update play-client to Play 3
kciesielski Oct 25, 2023
b9c4c45
Update play-client docs
kciesielski Oct 25, 2023
ee6e36e
Set correct new package for play-netty-server
kciesielski Oct 25, 2023
e1f0a8e
Set correct new package name in docs
kciesielski Oct 26, 2023
9ada51f
Define case classes outside test to avoid macro issues in Scala 3
kciesielski Oct 26, 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
7 changes: 4 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ val scala3 = "3.3.1"

val scala2Versions = List(scala2_12, scala2_13)
val scala2And3Versions = scala2Versions ++ List(scala3)
val scala2_13And3Versions = List(scala2_13, scala3)
val codegenScalaVersions = List(scala2_12)
val examplesScalaVersions = List(scala2_13)
val documentationScalaVersion = scala2_13
Expand Down Expand Up @@ -811,9 +812,9 @@ lazy val playJson: ProjectMatrix = (projectMatrix in file("json/playjson"))
scalaTest.value % Test
)
)
.jvmPlatform(scalaVersions = scala2Versions)
.jvmPlatform(scalaVersions = scala2And3Versions)
.jsPlatform(
scalaVersions = scala2Versions,
scalaVersions = scala2And3Versions,
settings = commonJsSettings ++ Seq(
libraryDependencies ++= Seq(
"io.github.cquiroz" %%% "scala-java-time" % Versions.jsScalaJavaTime % Test
Expand Down Expand Up @@ -1383,7 +1384,7 @@ lazy val playServer: ProjectMatrix = (projectMatrix in file("server/play-server"
"org.scala-lang.modules" %% "scala-collection-compat" % Versions.scalaCollectionCompat
)
)
.jvmPlatform(scalaVersions = scala2Versions)
.jvmPlatform(scalaVersions = scala2_13And3Versions)
.dependsOn(serverCore, serverTests % Test)

lazy val jdkhttpServer: ProjectMatrix = (projectMatrix in file("server/jdkhttp-server"))
Expand Down
2 changes: 1 addition & 1 deletion project/Versions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ object Versions {
val zioInteropReactiveStreams = "2.0.2"
val zioJson = "0.6.2"
val playClient = "2.1.11"
val playServer = "2.8.20"
val playServer = "2.9.0"
val tethys = "0.26.0"
val vertx = "4.4.5"
val jsScalaJavaTime = "2.5.0"
Expand Down