[incubator-pekko-http] branch main updated: update to Scala 2.13.10 (#83)

[jr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jrudolph pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git


The following commit(s) were added to refs/heads/main by this push:
     new 38a35bfbd update to Scala 2.13.10 (#83)
38a35bfbd is described below

commit 38a35bfbd632fd6182d5e3e7f62c63262b025b63
Author: Johannes Rudolph <jo...@gmail.com>
AuthorDate: Thu Feb 23 13:29:37 2023 +0100

    update to Scala 2.13.10 (#83)
---
 .../scaladsl/server/directives/JsonStreamingExamplesSpec.scala |  2 +-
 project/Common.scala                                           | 10 ++++------
 project/Dependencies.scala                                     |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/src/test/scala/docs/http/scaladsl/server/directives/JsonStreamingExamplesSpec.scala b/docs/src/test/scala/docs/http/scaladsl/server/directives/JsonStreamingExamplesSpec.scala
index 41cdc943e..79bac43d7 100644
--- a/docs/src/test/scala/docs/http/scaladsl/server/directives/JsonStreamingExamplesSpec.scala
+++ b/docs/src/test/scala/docs/http/scaladsl/server/directives/JsonStreamingExamplesSpec.scala
@@ -125,7 +125,7 @@ class JsonStreamingExamplesSpec extends RoutingSpec with CompileOnlySpec {
       Marshalling.WithFixedContentType(ContentTypes.`text/csv(UTF-8)`,
         () => {
           val txt = t.txt.replaceAll(",", ".")
-          val uid = t.uid
+          val uid = t.uid.toString
           ByteString(List(uid, txt).mkString(","))
         })
     }
diff --git a/project/Common.scala b/project/Common.scala
index ee2580e75..771b6c7dc 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -25,18 +25,16 @@ object Common extends AutoPlugin {
     scalacOptions ++= Seq(
       "-deprecation",
       "-encoding", "UTF-8", // yes, this is 2 args
-      "-target:jvm-1.8",
       "-unchecked",
       "-Xlint",
       "-Ywarn-dead-code",
       // Silence deprecation notices for changes introduced in Scala 2.12
       // Can be removed when we drop support for Scala 2.12:
       "-Wconf:msg=object JavaConverters in package collection is deprecated:s",
-      "-Wconf:msg=is deprecated \\(since 2\\.13\\.:s"),
-    // '-release' parameter is restricted to 'Compile, compile' scope because
-    // otherwise `sbt pekko-http-xml/compile:doc` fails with it on Scala 2.12.9
-    Compile / compile / scalacOptions ++=
-      onlyAfterScala212(onlyAfterJdk8("-release", "8")).value,
+      "-Wconf:msg=is deprecated \\(since 2\\.13\\.:s") ++
+    (if (isJdk8) Seq.empty
+     else if (scalaBinaryVersion.value == "2.12") Seq("-target:jvm-1.8")
+     else Seq("-release", "8")),
     javacOptions ++=
       Seq("-encoding", "UTF-8") ++ onlyOnJdk8("-source", "1.8") ++ onlyAfterJdk8("--release", "8"),
     // restrict to 'compile' scope because otherwise it is also passed to
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 48df7ef9c..d4dd6fb5b 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -35,7 +35,7 @@ object Dependencies {
   val scalafixVersion = _root_.scalafix.sbt.BuildInfo.scalafixVersion // grab from plugin
 
   val scala212Version = "2.12.15"
-  val scala213Version = "2.13.8"
+  val scala213Version = "2.13.10"
   val allScalaVersions = Seq(scala213Version, scala212Version)
 
   val Versions = Seq(


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org