Backport mill 1.x support to series/0.18 (#1899)

* Backport mill 1.x support to series/0.18

* Bump mima to fix deadlock

---------

Co-authored-by: Jakub Kozłowski <kubukoz@gmail.com>

Author: rochala

.scalafmt.conf

@@ -1,5 +1,5 @@
 version = "3.1.2"
-runner.dialect = scala213
+runner.dialect = scala213source3
 project {
   excludePaths = [
     "glob:**/generated/**/*.scala",

CHANGELOG.md

@@ -5,8 +5,11 @@ When adding entries, please treat them as if they could end up in a release any
 
 Thank you!
 
+
 # 0.18.49
 
+* mill codegen plugin: now supports Mill 1.x (tested with 1.1.1), in addition to the existing Mill 0.11.x and 0.12.x support
+* codegen: Cross comple codegen module against Scala 3
 * codegen: Fix `Long` literal rendering to add `L` suffix, preventing `integer number too large` compilation errors for values exceeding `Int.MaxValue` in [#1898](https://github.com/disneystreaming/smithy4s/pull/1898)
 
 # 0.18.48

build.sbt

@@ -440,7 +440,10 @@ lazy val codegen = projectMatrix
   .in(file("modules/codegen"))
   .enablePlugins(BuildInfoPlugin)
   .dependsOn(protocol)
-  .jvmPlatform(buildtimejvmScala2Versions, jvmDimSettings)
+  .jvmPlatform(
+    buildtimejvmScala2Versions :+ Scala3,
+    jvmDimSettings
+  )
   .settings(
     buildInfoKeys := Seq[BuildInfoKey](
       version,
@@ -464,14 +467,42 @@ lazy val codegen = projectMatrix
       Dependencies.Circe.core.value,
       Dependencies.Circe.parser.value,
       Dependencies.Circe.generic.value,
-      Dependencies.collectionsCompat.value,
-      "org.scala-lang" % "scala-reflect" % scalaVersion.value,
-      "io.get-coursier" %% "coursier" % "2.1.24",
+      ("io.get-coursier" %% "coursier" % "2.1.24")
+        .cross(CrossVersion.for3Use2_13),
       Dependencies.Mima.core % Test
     ),
+    libraryDependencies ++= {
+      if (scalaVersion.value.startsWith("2."))
+        Seq(
+          "org.scala-lang" % "scala-reflect" % scalaVersion.value,
+          Dependencies.collectionsCompat.value
+        )
+      else Seq.empty
+    },
+    // For Scala 3, exclude transitive Scala 2.13 deps from coursier that conflict with Scala 3 cross versions.
+    // Note: scala-xml_2.13 is NOT excluded because coursier needs it at runtime.
+    excludeDependencies ++= {
+      if (scalaVersion.value.startsWith("3."))
+        Seq(
+          ExclusionRule(
+            "org.scala-lang.modules",
+            "scala-collection-compat_2.13"
+          )
+        )
+      else Seq.empty
+    },
     libraryDependencies ++= munitDeps.value,
     scalacOptions := scalacOptions.value
-      .filterNot(Seq("-Ywarn-value-discard", "-Wvalue-discard").contains),
+      .filterNot(Seq("-Ywarn-value-discard", "-Wvalue-discard").contains) ++ {
+      if (scalaVersion.value.startsWith("3."))
+        Seq(
+          "-Wconf:msg=class EnumTrait in package:silent",
+          "-Wconf:msg=class SetShape in package:silent",
+          // Scala 2.12 does not support the Scala 3 varargs syntax
+          "-Wconf:msg=is no longer supported for vararg splices:silent"
+        )
+      else Seq.empty
+    },
     bloopEnabled := true,
     Compile / sourceGenerators += {
       sourceManaged
@@ -564,6 +595,7 @@ lazy val millCodegenPlugin = projectMatrix
         (core.jvm(Scala3) / publishLocal).value,
         (dynamic.jvm(Scala213) / publishLocal).value,
         (codegen.jvm(Scala213) / publishLocal).value,
+        (codegen.jvm(Scala3) / publishLocal).value,
 
         // for mill
         (protocolJvm / publishLocal).value
@@ -573,8 +605,7 @@ lazy val millCodegenPlugin = projectMatrix
     Test / test := (Test / test).dependsOn(publishLocal).value,
     libraryDependencies ++= munitDeps.value
   )
-  .millPlatforms(Scala213, millVersions)
-  .dependsOn(codegen)
+  .millPlatforms(Scala213, millVersions, codegen)
 
 lazy val decline = (projectMatrix in file("modules/decline"))
   .settings(

modules/bootstrapped/src/generated/com/amazonaws/dynamodb/DynamoDB.scala

@@ -63,7 +63,7 @@ object DynamoDBGen extends Service.Mixin[DynamoDBGen, DynamoDBOperation] {
     aws.api.Service(sdkId = "DynamoDB", arnNamespace = Some(aws.api.ArnNamespace("dynamodb")), cloudFormationName = Some(aws.api.CloudFormationName("DynamoDB")), cloudTrailEventSource = Some("dynamodb.amazonaws.com"), docId = None, endpointPrefix = Some("dynamodb"), cloudWatchNamespace = None),
     aws.auth.Sigv4(name = "dynamodb"),
     aws.protocols.AwsJson1_0(http = None, eventStreamHttp = None),
-    smithy.api.Documentation("<fullname>Amazon DynamoDB</fullname>\n\n\n         <p>Amazon DynamoDB is a fully managed NoSQL database service that provides fast and\n      predictable performance with seamless scalability. DynamoDB lets you offload the\n      administrative burdens of operating and scaling a distributed database, so that you don\'t have\n      to worry about hardware provisioning, setup and configuration, replication, software patching,\n      or cluster scaling.</p>\n\n         <p>With DynamoDB, you can create database tables that can store and retrieve any amount of\n      data, and serve any level of request traffic. You can scale up or scale down your tables\'\n      throughput capacity without downtime or performance degradation, and use the AWS Management\n      Console to monitor resource utilization and performance metrics.</p>\n\n         <p>DynamoDB automatically spreads the data and traffic for your tables over a sufficient\n      number of servers to handle your throughput and storage requirements, while maintaining\n      consistent and fast performance. All of your data is stored on solid state disks (SSDs) and\n      automatically replicated across multiple Availability Zones in an AWS region, providing\n      built-in high availability and data durability. </p>"),
+    smithy.api.Documentation("<fullname>Amazon DynamoDB</fullname>\n\n\n         <p>Amazon DynamoDB is a fully managed NoSQL database service that provides fast and\n      predictable performance with seamless scalability. DynamoDB lets you offload the\n      administrative burdens of operating and scaling a distributed database, so that you don't have\n      to worry about hardware provisioning, setup and configuration, replication, software patching,\n      or cluster scaling.</p>\n\n         <p>With DynamoDB, you can create database tables that can store and retrieve any amount of\n      data, and serve any level of request traffic. You can scale up or scale down your tables'\n      throughput capacity without downtime or performance degradation, and use the AWS Management\n      Console to monitor resource utilization and performance metrics.</p>\n\n         <p>DynamoDB automatically spreads the data and traffic for your tables over a sufficient\n      number of servers to handle your throughput and storage requirements, while maintaining\n      consistent and fast performance. All of your data is stored on solid state disks (SSDs) and\n      automatically replicated across multiple Availability Zones in an AWS region, providing\n      built-in high availability and data durability. </p>"),
     smithy.api.Title("Amazon DynamoDB"),
     smithy.api.XmlNamespace(uri = smithy.api.NonEmptyString("http://dynamodb.amazonaws.com/doc/2012-08-10/"), prefix = None),
   ).lazily

modules/bootstrapped/src/generated/smithy4s/example/AnotherString.scala

@@ -14,7 +14,7 @@ import smithy4s.schema.Schema.string
 object AnotherString extends Newtype[String] {
   val id: ShapeId = ShapeId("smithy4s.example", "AnotherString")
   val hints: Hints = Hints(
-    smithy.api.Documentation("Multiple line doc comment for another string\nContaining a random */ here.\nSeriously, it\'s important to escape special characters."),
+    smithy.api.Documentation("Multiple line doc comment for another string\nContaining a random */ here.\nSeriously, it's important to escape special characters."),
   ).lazily
   val underlyingSchema: Schema[String] = string.withId(id).addHints(hints)
   implicit val schema: Schema[AnotherString] = bijection(underlyingSchema, asBijection)

modules/bootstrapped/src/generated/smithy4s/example/OrderType.scala

@@ -38,7 +38,7 @@ object OrderType extends ShapeTag.Companion[OrderType] {
   val id: ShapeId = ShapeId("smithy4s.example", "OrderType")
 
   val hints: Hints = Hints(
-    smithy.api.Documentation("Our order types have different ways to identify a product\nExcept for preview orders, these don\'t have an ID"),
+    smithy.api.Documentation("Our order types have different ways to identify a product\nExcept for preview orders, these don't have an ID"),
   ).lazily
 
   final case class OnlineCase(online: OrderNumber) extends OrderType { final def $ordinal: Int = 0 }
@@ -51,7 +51,7 @@ object OrderType extends ShapeTag.Companion[OrderType] {
     val id: ShapeId = ShapeId("smithy4s.example", "InStoreOrder")
 
     val hints: Hints = Hints(
-      smithy.api.Documentation("For an InStoreOrder a location ID isn\'t needed"),
+      smithy.api.Documentation("For an InStoreOrder a location ID isn't needed"),
     ).lazily
 
     // constructor using the original order from the spec

modules/codegen/src-3/smithy4s/codegen/internal/MapTypeCompanionPlatform.scala

@@ -0,0 +1,23 @@
+/*
+ *  Copyright 2021-2026 Disney Streaming
+ *
+ *  Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     https://disneystreaming.github.io/TOST-1.0.txt
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package smithy4s.codegen.internals
+
+import LineSegment.NameRef
+
+trait MapTypeCompanionPlatform {
+  val seqMapRef = NameRef("scala.collection.immutable.SeqMap")
+}

modules/codegen/src/smithy4s/codegen/internals/LineSyntax.scala

@@ -22,12 +22,12 @@ import WithValue.ToLineWithValue
 
 private[codegen] object LineSyntax {
   implicit class LineInterpolator(val sc: StringContext) extends AnyVal {
-    def line(renderables: ToLineWithValue[_]*): Line = {
+    def line(renderables: ToLineWithValue[?]*): Line = {
       renderAndCombine(renderables.toList)
     }
 
     private def renderAndCombine(
-        renderables: List[ToLineWithValue[_]]
+        renderables: List[ToLineWithValue[?]]
     ): Line = {
       def aux[A](binding: ToLineWithValue[A]): Line = {
         binding.render

modules/codegen/src/smithy4s/codegen/internals/Renderer.scala

@@ -1852,32 +1852,34 @@ private[internals] class Renderer(compilationUnit: CompilationUnit) { self =>
   }
 
   private def renderPrimitive[T](prim: Primitive.Aux[T]): T => Line =
-    // NOTE: this match doesn't have exhaustivity checking on Scala 2! (due to the Aux pattern's weird interaction with gADTs)
-    prim match {
+    // NOTE: this match doesn't have exhaustivity checking on Scala 2! (due to the Aux pattern's weird interaction with GADTs)
+    // The asInstanceOf is needed for Scala 3 compatibility since it doesn't refine T through the Aux type alias.
+    (prim match {
       case Primitive.BigDecimal =>
         (bd: BigDecimal) => line"scala.math.BigDecimal($bd)"
       case Primitive.BigInteger => (bi: BigInt) => line"scala.math.BigInt($bi)"
-      case Primitive.Unit       => _ => line"()"
-      case Primitive.Double     => t => line"${t.toString}d"
-      case Primitive.Float      => t => line"${t.toString}f"
-      case Primitive.Long       => t => line"${t.toString}L"
-      case Primitive.Int        => t => line"${t.toString}"
-      case Primitive.Short      => t => line"${t.toString}"
-      case Primitive.Bool       => t => line"${t.toString}"
-      case Primitive.Uuid       => uuid => line"java.util.UUID.fromString(${renderStringLiteral(uuid.toString)})"
-      case Primitive.String     => renderStringLiteral
-      case Primitive.Byte       => b => line"${b.toString}"
+      case Primitive.Unit       => (_: Unit) => line"()"
+      case Primitive.Double     => (t: Double) => line"${t.toString}d"
+      case Primitive.Float      => (t: Float) => line"${t.toString}f"
+      case Primitive.Long       => (t: Long) => line"${t.toString}L"
+      case Primitive.Int        => (t: Int) => line"${t.toString}"
+      case Primitive.Short      => (t: Short) => line"${t.toString}"
+      case Primitive.Bool       => (t: Boolean) => line"${t.toString}"
+      case Primitive.Uuid =>
+        (uuid: java.util.UUID) => line"java.util.UUID.fromString(${renderStringLiteral(uuid.toString)})"
+      case Primitive.String => (s: String) => renderStringLiteral(s)
+      case Primitive.Byte   => (b: Byte) => line"${b.toString}"
       case Primitive.Blob =>
-        ba =>
+        (ba: Array[Byte]) =>
           val blob = NameRef("smithy4s", "Blob")
           if (ba.isEmpty) line"$blob.empty"
           else
             line"$blob(Array[Byte](${ba.mkString(", ")}))"
       case Primitive.Timestamp =>
-        ts => line"${NameRef("smithy4s", "Timestamp")}(${ts.getEpochSecond()}L, ${ts.getNano()})"
-      case Primitive.Document => renderNodeToLine(_)
-      case Primitive.Nothing  => v => (v: Nothing) // this case can't happen
-    }
+        (ts: java.time.Instant) => line"${NameRef("smithy4s", "Timestamp")}(${ts.getEpochSecond()}L, ${ts.getNano()})"
+      case Primitive.Document => (node: Node) => renderNodeToLine(node)
+      case Primitive.Nothing  => (_: Any) => sys.error("unreachable") // this case can't happen
+    }).asInstanceOf[T => Line]
 
   private def renderNodeToLine(node: Node): Line = {
     node.accept(new NodeVisitor[Line] {
@@ -1910,10 +1912,25 @@ private[internals] class Renderer(compilationUnit: CompilationUnit) { self =>
     })
   }
 
+  private def escapeForStringLiteral(raw: String): String = {
+    val sb = new StringBuilder("\"")
+    raw.foreach {
+      case '\b'                      => sb.append("\\b")
+      case '\t'                      => sb.append("\\t")
+      case '\n'                      => sb.append("\\n")
+      case '\f'                      => sb.append("\\f")
+      case '\r'                      => sb.append("\\r")
+      case '"'                       => sb.append("\\\"")
+      case '\\'                      => sb.append("\\\\")
+      case c if c >= ' ' && c <= '~' => sb.append(c)
+      case c                         => sb.append("\\u%04x".format(c.toInt))
+    }
+    sb.append('"')
+    sb.toString()
+  }
+
   private def renderStringLiteral(raw: String): Line = {
-    import scala.reflect.runtime.universe._
-    val str = Literal(Constant(raw))
-      .toString()
+    val str = escapeForStringLiteral(raw)
       // Replace sequences like "\\uD83D" (how Smithy specs refer to unicode characters)
       // with unicode character escapes like "\uD83D" that can be parsed in the regex implementations on all platforms.
       // See https://github.com/disneystreaming/smithy4s/pull/499

modules/codegen/src/smithy4s/codegen/internals/SmithyToIR.scala

@@ -132,7 +132,11 @@ private[codegen] class SmithyToIR(
       .toSet
       .flatMap((n: Node) => n.asArrayNode().asScala)
       .flatMap(_.getElements().asScala)
-      .flatMap(_.asStringNode().asScala.map(n => NamespacePattern(n.getValue)))
+      .flatMap(
+        _.asStringNode().asScala.map(n =>
+          NamespacePattern.fromString(n.getValue)
+        )
+      )
 
   private def fieldModifier(member: MemberShape): Field.Modifier = {
     val hasRequired = member.hasTrait(classOf[RequiredTrait])
@@ -173,7 +177,8 @@ private[codegen] class SmithyToIR(
 
         shape.tpe.flatMap {
           case Type.Alias(_, name, tpe: Type.ExternalType, isUnwrapped) =>
-            val newHints = hints.filterNot(_ sameNativeTrait tpe.refinementHint)
+            val newHints =
+              hints.filterNot(_.sameNativeTrait(tpe.refinementHint))
             TypeAlias(
               shape.getId(),
               name,
@@ -701,7 +706,7 @@ private[codegen] class SmithyToIR(
         val h = hints(shape)
         tpe match {
           case e: Type.ExternalType =>
-            h.filterNot(_ sameNativeTrait e.refinementHint)
+            h.filterNot(_.sameNativeTrait(e.refinementHint))
           case _ => h
         }
       }
@@ -838,16 +843,18 @@ private[codegen] class SmithyToIR(
       def unionShape(x: UnionShape): Option[Type] =
         Type.Ref(x.namespace, x.name).some
 
+      @SuppressWarnings(Array("all"))
       def memberShape(x: MemberShape): Option[Type] =
         model.getShape(x.getTarget()).asScala.flatMap { shape =>
-          val builder =
-            (Shape.shapeToBuilder(shape: Shape): AbstractShapeBuilder[_, _])
+          val builder = (Shape.shapeToBuilder(shape: Shape): Any)
+            .asInstanceOf[AbstractShapeBuilder[?, ?]]
 
           builder
             .addTraits(x.getAllTraits().asScala.map(_._2).asJavaCollection)
 
           builder
             .build()
+            .asInstanceOf[Shape]
             .accept(this)
         }
 
@@ -1123,7 +1130,8 @@ private[codegen] class SmithyToIR(
         .zipWithIndex
         .collect {
           case ((name, Some(tpe: Type.ExternalType), modifier, hints), index) =>
-            val newHints = hints.filterNot(_ sameNativeTrait tpe.refinementHint)
+            val newHints =
+              hints.filterNot(_.sameNativeTrait(tpe.refinementHint))
             Field(name, tpe, modifier, index, newHints)
           case ((name, Some(tpe), modifier, hints), index) =>
             Field(name, tpe, modifier, index, hints)
@@ -1164,7 +1172,7 @@ private[codegen] class SmithyToIR(
             Alt(
               name,
               UnionMember.TypeCase(tpe),
-              h.filterNot(_ sameNativeTrait tpe.refinementHint)
+              h.filterNot(_.sameNativeTrait(tpe.refinementHint))
             )
           case (name, Some(Right(tpe)), h) =>
             Alt(name, UnionMember.TypeCase(tpe), h)
@@ -1429,7 +1437,7 @@ private[codegen] class SmithyToIR(
       case (node, IdRefCase()) =>
         val ref = Type.Ref("smithy4s", "ShapeId")
         val namespace :: name :: _ =
-          node.asStringNode.get.getValue.split("#").toList
+          (node.asStringNode.get.getValue.split("#").toList: @unchecked)
         def toField(value: String) = TypedNode.FieldTN.RequiredTN(
           NodeAndType(
             Node.from(value),