Publish runtime and generate sources for Scala 3 (#398)

* Initial build adaptation for Scala3. Replace ProjectAttributeMacro with izumi MacroParameters

* wip

* wip

* wip

* Port IRT Runtime to Scala 3; use Match Types as type projections workaround to minimize changes and support Http4sContext type scala/scala3#13416

* Add scala-java-time dependency for Scala.js test on Scala 3

* Add project/build.properties to generated SBT projects

Add sbt workaround for circe-derivation/circe-core old versions into generated SBT projects

Use semiauto encoder for circe when sbt.scalaVersion > 3

FIXME: disable AnyVals on Scala 3 because circe deriver on 3 doesn't support AnyVals: `class Struct is not a generic product because it is a value class`

Re-enable AnyVals on Scala 3 - generate manual codec for AnyVals on Scala 3

Add sbt version to Scala build manifest

Add Scala 3 keywords to keywords list

Update scalameta, print source with Scala 3 Dialect to fix escaping of `export` and other keywords

Fix Scala 3 warning: final case object -> case object

---------

Co-authored-by: Pavel Shirshov <[email protected]>

Author: neko-kai

.build.sh

@@ -7,6 +7,11 @@ set -xe
 # and https://github.com/sbt/sbt/pull/3995/files
 # TL;DR strict aggregation in sbt is broken; this is a workaround
 
+function scala3 {
+  echo "Using Scala 3..."
+  VERSION_COMMAND="++ $SCALA3"
+}
+
 function scala213 {
   echo "Using Scala 2.13..."
   VERSION_COMMAND="++ $SCALA213"
@@ -80,6 +85,7 @@ function init {
     export IZUMI_VERSION=$(cat version.sbt | sed -r 's/.*\"(.*)\".**/\1/' | sed -E "s/SNAPSHOT/build."${CI_BUILD_UNIQ_SUFFIX}"/")
     export SCALA212=$(cat project/Deps.sc | grep 'val scala212 ' |  sed -r 's/.*\"(.*)\".**/\1/')
     export SCALA213=$(cat project/Deps.sc | grep 'val scala213 ' |  sed -r 's/.*\"(.*)\".**/\1/')
+    export SCALA3=$(cat project/Deps.sc | grep 'val scala300 ' |  sed -r 's/.*\"(.*)\".**/\1/')
 
     printenv
 }
@@ -109,6 +115,10 @@ case $i in
         scala212
     ;;
 
+    3*)
+        scala3
+    ;;
+
     coverage)
         coverage
     ;;
@@ -130,7 +140,7 @@ case $i in
     ;;
 
     *)
-        echo "Unknown option"
+        echo "Unknown option: ${i}"
         exit 1
     ;;
 esac

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         java: [ '11' ]
-        scala: [ '2.12', '2.13']
+        scala: [ '2.12', '2.13', '3.2' ]
     steps:
       - uses: 7mind/github-env@main
         with:
@@ -68,7 +68,7 @@ jobs:
     strategy:
       matrix:
         java: [ '11' ]
-        scala: [ '2.12', '2.13']
+        scala: [ '2.12', '2.13', '3.2' ]
     steps:
       - uses: 7mind/github-env@main
         with:

build.sbt

@@ -34,7 +34,6 @@ object CommandlineIDLCompiler {
 
     val conf = parseArgs(args)
 
-
     val results = Seq(
       initDir(conf),
       runCompilations(izumiVersion, conf),
@@ -49,7 +48,7 @@ object CommandlineIDLCompiler {
   private def runPublish(conf: IDLCArgs): Boolean = {
     if (conf.publish && conf.languages.nonEmpty) {
       conf.languages.foreach { lang =>
-        val manifest = toOption(conf, Map.empty)(lang).manifest
+        val manifest = toOptions(conf, Map.empty)(lang).manifest
         publishLangArtifacts(conf, lang, manifest) match {
           case Left(err) => throw err
           case _ => ()
@@ -103,10 +102,10 @@ object CommandlineIDLCompiler {
     }
   }
 
-  private def runCompilations(izumiVersion: String, conf: IDLCArgs) = {
+  private def runCompilations(izumiVersion: String, conf: IDLCArgs): Boolean = {
     if (conf.languages.nonEmpty) {
       log.log("Reading manifests...")
-      val toRun = conf.languages.map(toOption(conf, Map("common.izumiVersion" -> izumiVersion)))
+      val toRun = conf.languages.map(toOptions(conf, Map("common.izumiVersion" -> izumiVersion)))
       log.log("Going to compile:")
       log.log(toRun.niceList())
       log.log("")
@@ -136,7 +135,6 @@ object CommandlineIDLCompiler {
     } else {
       false
     }
-
   }
 
   private def runCompiler(target: Path, loaded: Timed[UnresolvedDomains], option: UntypedCompilerOptions): Unit = {
@@ -175,7 +173,7 @@ object CommandlineIDLCompiler {
     IDLCArgs.parseUnsafe(args)
   }
 
-  private def toOption(conf: IDLCArgs, env: Map[String, String])(lopt: LanguageOpts): UntypedCompilerOptions = {
+  private def toOptions(conf: IDLCArgs, env: Map[String, String])(lopt: LanguageOpts): UntypedCompilerOptions = {
     val lang = IDLLanguage.parse(lopt.id)
     val exts = getExt(lang, lopt.extensions)
 

idealingua-v1/idealingua-v1-compiler/src/main/scala/izumi/idealingua/compiler/CommandlineIDLCompiler.scala

@@ -51,8 +51,6 @@ object IDLCArgs {
     final val overlayVersionFile = arg("overlay-version", "v", "version file", "<path>")
     final val define = arg("define", "d", "define value", "const.name=value")
     final val publish = flag("publish", "p", "build and publish generated code")
-
-
   }
 
   object LP extends ParserDef {
@@ -65,7 +63,7 @@ object IDLCArgs {
     final val define = arg("define", "d", "define value", "const.name=value")
   }
 
-  object IP extends ParserDef {}
+  object IP extends ParserDef
 
   def parseUnsafe(args: Array[String]): IDLCArgs = {
     val parsed = new CLIParserImpl().parse(args) match {
@@ -102,7 +100,7 @@ object IDLCArgs {
     val overlay = parameters.findValue(P.overlayDir).asPath.getOrElse(root.resolve("overlay"))
     val overlayVersion = parameters.findValue(P.overlayVersionFile).asPath
     val publish = parameters.hasFlag(P.publish)
-    val defines = parseDefs(parameters)
+    val defines = parseDefs(parameters, P.define)
 
     val internalRoles = Seq("init", "help")
 
@@ -114,7 +112,7 @@ object IDLCArgs {
         val target = parameters.findValue(LP.target).asPath
         val manifest = parameters.findValue(LP.manifest).asFile
         val credentials = parameters.findValue(LP.credentials).asFile
-        val defines = parseDefs(parameters)
+        val defines = parseDefs(parameters, LP.define)
         val extensions = parameters.findValue(LP.extensionSpec).map(_.value.split(',')).toList.flatten
 
         LanguageOpts(
@@ -142,8 +140,8 @@ object IDLCArgs {
     )
   }
 
-  private def parseDefs(parameters: RawEntrypointParams): Map[String, String] = {
-    parameters.findValues(LP.define).map {
+  private def parseDefs(parameters: RawEntrypointParams, argDef: ParserDef.ArgDef): Map[String, String] = {
+    parameters.findValues(argDef).map {
       v =>
         val parts = v.value.split('=')
         parts.head -> parts.tail.mkString("=")

idealingua-v1/idealingua-v1-compiler/src/main/scala/izumi/idealingua/compiler/IDLCArgs.scala

@@ -1,6 +1,6 @@
 package izumi.idealingua.model.publishing
 
-import izumi.idealingua.`macro`.ProjectAttributeMacro
+import izumi.fundamentals.platform.build.MacroParameters
 import izumi.idealingua.model.publishing.BuildManifest._
 
 trait BuildManifest {
@@ -67,7 +67,7 @@ object BuildManifest {
       licenses = List(License("MIT", MFUrl("https://opensource.org/licenses/MIT"))),
       website = MFUrl("http://project.website"),
       copyright = "Copyright (C) Test Inc.",
-      izumiVersion = ProjectAttributeMacro.extractSbtProjectVersion().getOrElse("UNSET-IZUMI-VERSION"),
+      izumiVersion = MacroParameters.artifactVersion().getOrElse("UNSET-IZUMI-VERSION"),
     )
   }
 

idealingua-v1/idealingua-v1-core/src/main/scala/izumi/idealingua/model/publishing/BuildManifest.scala

@@ -14,6 +14,7 @@ case class SbtOptions(
                        projectNaming: ProjectNamingRule,
                        enableScalaJs: Boolean,
                        scalaVersion: Option[String],
+                       sbtVersion: Option[String],
                      )
 
 object SbtOptions {
@@ -22,6 +23,7 @@ object SbtOptions {
       projectNaming = ProjectNamingRule.example,
       enableScalaJs = true,
       scalaVersion = None,
+      sbtVersion = None,
     )
   }
 }

idealingua-v1/idealingua-v1-core/src/main/scala/izumi/idealingua/model/publishing/manifests/ScalaBuildManifest.scala

@@ -1,10 +1,8 @@
 package izumi.idealingua.model.common
 
-sealed trait StreamDirection {
-
-}
+sealed trait StreamDirection
 
 object StreamDirection {
-  final case object ToServer extends StreamDirection
-  final case object ToClient extends StreamDirection
+  case object ToServer extends StreamDirection
+  case object ToClient extends StreamDirection
 }

idealingua-v1/idealingua-v1-model/src/main/scala/izumi/idealingua/macro/ProjectAttributeMacro.scala

@@ -0,0 +1,19 @@
+package izumi.idealingua.runtime.rpc
+
+package object http4s {
+
+  /**
+    * This is a workaround that replaces usages of type projections with Match Types on Scala 3.
+    *
+    * See: https://github.com/lampepfl/dotty/issues/13416
+    */
+  type GetBiIO[C <: Http4sContext] = { type l[+E, +A] = C#BiIO[E, A] }
+  type GetMonoIO[C <: Http4sContext] = { type l[+A] = C#BiIO[Throwable, A] }
+
+  type GetMaterializedStream[C <: Http4sContext] = C#MaterializedStream
+  type GetRequestContext[C <: Http4sContext] = C#RequestContext
+  type GetClientContext[C <: Http4sContext] = C#ClientContext
+  type GetMethodContext[C <: Http4sContext] = C#MethodContext
+  type GetClientMethodContext[C <: Http4sContext] = C#ClientMethodContext
+  type GetClientId[C <: Http4sContext] = C#ClientId
+}