use new syntax. prepare Scala 3.4

scalapb-json · Dec 25, 2023 · 93290b4 · 93290b4
1 parent 6c0d98a
commit 93290b4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/core/shared/src/main/scala/scalapb_argonaut/AnyFormat.scala b/core/shared/src/main/scala/scalapb_argonaut/AnyFormat.scala
@@ -22,7 +22,7 @@ object AnyFormat {
     // ... and add the @type marker to the resulting JSON
     printer.toJson(message).obj match {
       case Some(fields) =>
-        Json.obj(("@type" -> Json.jString(any.typeUrl)) :: fields.toList: _*)
+        Json.obj((("@type" -> Json.jString(any.typeUrl)) :: fields.toList) *)
       case value =>
         // Safety net, this shouldn't happen
         throw new IllegalStateException(

diff --git a/core/shared/src/main/scala/scalapb_argonaut/JsonFormat.scala b/core/shared/src/main/scala/scalapb_argonaut/JsonFormat.scala
@@ -159,7 +159,7 @@ class Printer private (config: Printer.PrinterConfig) {
                 )
               }
               key -> value
-            }.toList: _*)
+            }.toList *)
           )
         } else {
           b += JField(name, Json.jArray(xs.iterator.map(toJson).toList))
@@ -187,7 +187,7 @@ class Printer private (config: Printer.PrinterConfig) {
           b += JField(
             name,
             Json.array(
-              xs.map(serializeSingleValue(fd, _, config.isFormattingLongAsNumber)): _*
+              xs.map(serializeSingleValue(fd, _, config.isFormattingLongAsNumber)) *
             )
           )
         }
@@ -221,7 +221,7 @@ class Printer private (config: Printer.PrinterConfig) {
             serializeNonMessageField(f, name, m.getField(f), b)
           }
         }
-        Json.obj(b.result(): _*)
+        Json.obj(b.result() *)
     }
   }
 
@@ -638,7 +638,7 @@ object JsonFormat {
       StructFormat.structParser
     )
     .registerWriter[com.google.protobuf.struct.ListValue](
-      x => Json.array(StructFormat.listValueWriter(x): _*),
+      x => Json.array(StructFormat.listValueWriter(x) *),
       StructFormat.listValueParser
     )
     .registerMessageFormatter[com.google.protobuf.any.Any](AnyFormat.anyWriter, AnyFormat.anyParser)

diff --git a/core/shared/src/main/scala/scalapb_argonaut/StructFormat.scala b/core/shared/src/main/scala/scalapb_argonaut/StructFormat.scala
@@ -42,7 +42,7 @@ object StructFormat {
   def structWriter(v: struct.Struct): Json =
     Json.obj(v.fields.iterator.map { case (x, y) =>
       x -> structValueWriter(y)
-    }.toList: _*)
+    }.toList *)
 
   def listValueParser(v: Json.JsonArray): struct.ListValue = {
     com.google.protobuf.struct.ListValue(v.map(structValueParser))

diff --git a/core/shared/src/test/scala/scalapb_argonaut/RepeatableTestGen.scala b/core/shared/src/test/scala/scalapb_argonaut/RepeatableTestGen.scala
@@ -28,7 +28,7 @@ class RepeatableTestGen(unknown: Gen[UnknownFieldSet]) {
     Gen.from1(Nested.of)
 
   private[this] implicit val enumGen: Gen[RepeatablesTest.Enum] =
-    Gen.elements(RepeatablesTest.Enum.values.head, RepeatablesTest.Enum.values.tail: _*)
+    Gen.elements(RepeatablesTest.Enum.values.head, RepeatablesTest.Enum.values.tail *)
 
   implicit val repGen: Gen[RepeatablesTest] =
     Gen.from6(RepeatablesTest.of)