project: upgrade to scala 3.3.1

etorreborre · Nov 4, 2023 · b2ed792 · b2ed792
1 parent 9ab4dcc
commit b2ed792
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.1.2]
+        scala: [3.3.1]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -63,7 +63,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.1.2]
+        scala: [3.3.1]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/build.sbt b/build.sbt
@@ -32,8 +32,8 @@ lazy val specs2Settings = Seq(
   organization := "org.specs2",
   GlobalScope / scalazVersion := "7.2.34",
   specs2ShellPrompt,
-  ThisBuild / scalaVersion := "3.3.0",
-  ThisBuild / crossScalaVersions := Seq("3.3.0"))
+  ThisBuild / scalaVersion := "3.3.1",
+  ThisBuild / crossScalaVersions := Seq("3.3.1"))
 
 lazy val tagName = Def.setting {
   s"specs2-${version.value}"

diff --git a/common/shared/src/main/scala/org/specs2/control/eff/ConsoleEffect.scala b/common/shared/src/main/scala/org/specs2/control/eff/ConsoleEffect.scala
@@ -6,7 +6,11 @@ import syntax.writer._
 
 object ConsoleEffect {
 
-  case class ConsoleMessage(value: String) extends AnyVal
+  case class ConsoleMessage(value: String) extends AnyVal {
+    // this is necessary to avoid a weird ClassCastException
+    // class org.specs2.control.eff.ConsoleEffect$ConsoleMessage cannot be cast to class java.lang.String (org.specs2.control.eff.ConsoleEffect$ConsoleMessage is in unnamed module of loader 'app'; java.lang.String is in module java.base of loader 'bootstrap') (JProcedure1.java:15)
+    override def toString(): String = value
+  }
 
   type _console[R] = Console |= R
   type Console[A] = Writer[ConsoleMessage, A]
@@ -36,12 +40,10 @@ object ConsoleEffect {
    * This interpreter prints messages to a printing function
    */
   def runConsoleToPrinter[R, U, A](printer: String => Unit)(w: Eff[R, A])(implicit m : Member.Aux[Console, R, U]): Eff[U, A] =
-    w.runWriterUnsafe((message: ConsoleMessage) => printer(message.value))
+    w.runWriterUnsafe((message: ConsoleMessage) => printer(message.toString()))
 }
 
 case class Writer[O, A](value: O, a: A) {
   val run: (O, A) =
     (value, a)
 }
-
-
diff --git a/core/shared/src/test/scala/org/specs2/text/MarkdownHeaders.scala b/core/shared/src/test/scala/org/specs2/text/MarkdownHeaders.scala
@@ -5,10 +5,10 @@ package text
  * usage: h4> "This is a h4 title"
  */
 trait MarkdownHeaders {
-  lazy val (h1, h2, h3, h4, h5, h6) = (MarkdownHeader(1), MarkdownHeader(2), MarkdownHeader(3), MarkdownHeader(4), MarkdownHeader(5), MarkdownHeader(6))
+  val (h1, h2, h3, h4, h5, h6) = (MarkdownHeader(1), MarkdownHeader(2), MarkdownHeader(3), MarkdownHeader(4), MarkdownHeader(5), MarkdownHeader(6))
 
   case class MarkdownHeader(level: Int) {
     def >(s: String) = ("#" * level) + " " + s
   }
 }
-object MarkdownHeaders extends MarkdownHeaders
+object MarkdownHeaders extends MarkdownHeaders
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 val scalaJSVersion =
 Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.13.0")
 val scalaNativeVersion =
-Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.4.12")
+Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.4.16")
 
 addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % scalaJSVersion)
 addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % scalaNativeVersion)