Fixed #109: Upgrade to Scala 3.4.1

PurpleKingdomGames · Apr 11, 2024 · aede1b4 · aede1b4
1 parent 37ced6f
commit aede1b4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ import indigoplugin.IndigoOptions
 
 Global / onChangedBuildSource := ReloadOnSourceChanges
 
-val scala3Version = "3.3.1"
+val scala3Version = "3.4.1"
 
 ThisBuild / versionScheme                                  := Some("early-semver")
 ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.5.0"

diff --git a/ultraviolet/shared/src/main/scala/ultraviolet/datatypes/ShaderPrinter.scala b/ultraviolet/shared/src/main/scala/ultraviolet/datatypes/ShaderPrinter.scala
@@ -65,7 +65,7 @@ object ShaderPrinter:
     render(ast)
 
   @SuppressWarnings(Array("scalafix:DisableSyntax.throw"))
-  private def render(ast: ShaderAST)(using pp: ShaderPrinter[_]): List[String] =
+  private def render(ast: ShaderAST)(using pp: ShaderPrinter[?]): List[String] =
     val r: ShaderAST => List[String] = {
       case Empty() =>
         Nil
@@ -362,7 +362,7 @@ object ShaderPrinter:
 
     p(ast.traverse(pp.transformer.orElse(n => n)))
 
-  private def renderStatements(statements: List[ShaderAST])(using pp: ShaderPrinter[_]): List[String] =
+  private def renderStatements(statements: List[ShaderAST])(using pp: ShaderPrinter[?]): List[String] =
     val p =
       pp.printer.orElse {
         case ShaderAST.RawLiteral(raw) =>
@@ -397,7 +397,7 @@ object ShaderPrinter:
 
   private def addIndent: String => String = str => "  " + str
 
-  private def decideType(a: ShaderAST)(using pp: ShaderPrinter[_]): String =
+  private def decideType(a: ShaderAST)(using pp: ShaderPrinter[?]): String =
     a match
       case Empty()                        => "void"
       case Block(_)                       => "void"
@@ -458,7 +458,7 @@ object ShaderPrinter:
   private def processFunctionStatements(
       statements: List[ShaderAST],
       maybeReturnType: Option[String]
-  )(using pp: ShaderPrinter[_]): (List[String], String) =
+  )(using pp: ShaderPrinter[?]): (List[String], String) =
     val nonEmpty = statements
       .filterNot(_.isEmpty)
 

diff --git a/ultraviolet/shared/src/main/scala/ultraviolet/macros/UBOReader.scala b/ultraviolet/shared/src/main/scala/ultraviolet/macros/UBOReader.scala
@@ -21,7 +21,7 @@ object UBOReader:
       case _: EmptyTuple => Nil
       case _: (t *: ts)  => summonInline[ValueOf[t]].value.asInstanceOf[String] :: summonLabels[ts]
 
-  inline private def summonTypeName[T <: Tuple]: List[ShaderTypeOf[_]] =
+  inline private def summonTypeName[T <: Tuple]: List[ShaderTypeOf[?]] =
     inline erasedValue[T] match
       case _: EmptyTuple => Nil
       case _: (t *: ts)  => summonInline[ShaderTypeOf[t]] :: summonTypeName[ts]

diff --git a/ultraviolet/shared/src/test/scala/ultraviolet/acceptance/GLSLCastingTests.scala b/ultraviolet/shared/src/test/scala/ultraviolet/acceptance/GLSLCastingTests.scala
@@ -8,9 +8,10 @@ class GLSLCastingTests extends munit.FunSuite {
   test("casting") {
     inline def fragment: Shader[Unit, Float] =
       Shader { _ =>
-        val x  = 1.0f.toInt
-        val y  = 1.toFloat
-        val z  = y.toInt
+        val x  = 1.0f.toInt // Cast is inlined on literal
+        val y  = 1.toFloat  // Cast is inlined on literal
+        val z  = x.toFloat
+        val zz = y.toInt
         val w1 = 2
         val w2 = (1 + w1).toFloat
         x + y
@@ -19,12 +20,15 @@ class GLSLCastingTests extends munit.FunSuite {
     val actual =
       fragment.toGLSL[WebGL2].toOutput.code
 
+    // DebugAST.toAST(fragment)
+
     assertEquals(
       actual,
       s"""
-      |int x=int(1.0);
-      |float y=float(1);
-      |int z=int(y);
+      |int x=1;
+      |float y=1.0;
+      |float z=float(x);
+      |int zz=int(y);
       |int w1=2;
       |float w2=float(1+w1);
       |x+y;