scala3: wip

Author: pshirshov

build.sbt

@@ -1623,24 +1623,18 @@ lazy val `distage-core-proxy-bytebuddy` = project.in(file("distage/distage-core-
   )
   .disablePlugins(AssemblyPlugin)
 
-lazy val `distage-core` = project.in(file("distage/distage-core"))
+lazy val `distage-framework-api` = project.in(file("distage/distage-framework-api"))
   .dependsOn(
-    `distage-core-api` % "test->compile;compile->compile",
-    `distage-core-proxy-bytebuddy` % "test->compile;compile->compile"
+    `distage-core-api` % "test->compile;compile->compile"
   )
   .settings(
     libraryDependencies ++= Seq(
       "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat,
-      "org.scalatest" %% "scalatest" % V.scalatest % Test,
-      "org.typelevel" %% "cats-core" % V.cats % Optional,
-      "org.typelevel" %% "cats-effect" % V.cats_effect % Optional,
-      "dev.zio" %% "zio" % V.zio % Optional excludeAll("dev.zio" %% "izumi-reflect"),
-      "dev.zio" %% "izumi-reflect" % V.izumi_reflect % Optional,
-      "dev.zio" %% "zio-interop-cats" % V.zio_interop_cats % Optional excludeAll("dev.zio" %% "izumi-reflect"),
-      "javax.inject" % "javax.inject" % "1" % Test
+      "org.scalatest" %% "scalatest" % V.scalatest % Test
     ),
     libraryDependencies ++= { if (scalaVersion.value.startsWith("2.")) Seq(
-      compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full)
+      compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full),
+      "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
     ) else Seq.empty }
   )
   .settings(
@@ -1769,21 +1763,24 @@ lazy val `distage-core` = project.in(file("distage/distage-core"))
   )
   .disablePlugins(AssemblyPlugin)
 
-lazy val `distage-extension-config` = project.in(file("distage/distage-extension-config"))
+lazy val `distage-core` = project.in(file("distage/distage-core"))
   .dependsOn(
     `distage-core-api` % "test->compile;compile->compile",
-    `distage-core` % "test->compile"
+    `distage-core-proxy-bytebuddy` % "test->compile;compile->compile"
   )
   .settings(
     libraryDependencies ++= Seq(
       "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat,
-      "org.scalatest" %% "scalatest" % V.scalatest % Test
+      "org.scalatest" %% "scalatest" % V.scalatest % Test,
+      "org.typelevel" %% "cats-core" % V.cats % Optional,
+      "org.typelevel" %% "cats-effect" % V.cats_effect % Optional,
+      "dev.zio" %% "zio" % V.zio % Optional excludeAll("dev.zio" %% "izumi-reflect"),
+      "dev.zio" %% "izumi-reflect" % V.izumi_reflect % Optional,
+      "dev.zio" %% "zio-interop-cats" % V.zio_interop_cats % Optional excludeAll("dev.zio" %% "izumi-reflect"),
+      "javax.inject" % "javax.inject" % "1" % Test
     ),
     libraryDependencies ++= { if (scalaVersion.value.startsWith("2.")) Seq(
-      compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full),
-      "com.github.pureconfig" %% "pureconfig-magnolia" % V.pureconfig,
-      "com.propensive" %% "magnolia" % V.magnolia,
-      "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
+      compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full)
     ) else Seq.empty }
   )
   .settings(
@@ -1908,45 +1905,25 @@ lazy val `distage-extension-config` = project.in(file("distage/distage-extension
         "-opt-inline-from:izumi.**"
       )
       case (_, _) => Seq.empty
-    } },
-    Compile / unmanagedSourceDirectories ++= {
-      val version = scalaVersion.value
-      val crossVersions = crossScalaVersions.value
-      import Ordering.Implicits._
-      val ltEqVersions = crossVersions.map(CrossVersion.partialVersion).filter(_ <= CrossVersion.partialVersion(version)).flatten
-      (Compile / unmanagedSourceDirectories).value.flatMap {
-        case dir if dir.getPath.endsWith("scala") => ltEqVersions.map { case (m, n) => file(dir.getPath + s"-$m.$n+") }
-        case _ => Seq.empty
-      }
-    },
-    Test / unmanagedSourceDirectories ++= {
-      val version = scalaVersion.value
-      val crossVersions = crossScalaVersions.value
-      import Ordering.Implicits._
-      val ltEqVersions = crossVersions.map(CrossVersion.partialVersion).filter(_ <= CrossVersion.partialVersion(version)).flatten
-      (Test / unmanagedSourceDirectories).value.flatMap {
-        case dir if dir.getPath.endsWith("scala") => ltEqVersions.map { case (m, n) => file(dir.getPath + s"-$m.$n+") }
-        case _ => Seq.empty
-      }
-    }
+    } }
   )
   .disablePlugins(AssemblyPlugin)
 
-lazy val `distage-extension-plugins` = project.in(file("distage/distage-extension-plugins"))
+lazy val `distage-extension-config` = project.in(file("distage/distage-extension-config"))
   .dependsOn(
     `distage-core-api` % "test->compile;compile->compile",
-    `distage-core` % "test->compile",
-    `distage-extension-config` % "test->compile",
-    `logstage-core` % "test->compile"
+    `distage-core` % "test->compile"
   )
   .settings(
     libraryDependencies ++= Seq(
       "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat,
       "org.scalatest" %% "scalatest" % V.scalatest % Test,
-      "io.github.classgraph" % "classgraph" % V.classgraph
+      "com.github.pureconfig" %% "pureconfig-core" % V.pureconfig
     ),
     libraryDependencies ++= { if (scalaVersion.value.startsWith("2.")) Seq(
       compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full),
+      "com.github.pureconfig" %% "pureconfig-magnolia" % V.pureconfig,
+      "com.propensive" %% "magnolia" % V.magnolia,
       "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
     ) else Seq.empty }
   )
@@ -2072,25 +2049,46 @@ lazy val `distage-extension-plugins` = project.in(file("distage/distage-extensio
         "-opt-inline-from:izumi.**"
       )
       case (_, _) => Seq.empty
-    } }
+    } },
+    Compile / unmanagedSourceDirectories ++= {
+      val version = scalaVersion.value
+      val crossVersions = crossScalaVersions.value
+      import Ordering.Implicits._
+      val ltEqVersions = crossVersions.map(CrossVersion.partialVersion).filter(_ <= CrossVersion.partialVersion(version)).flatten
+      (Compile / unmanagedSourceDirectories).value.flatMap {
+        case dir if dir.getPath.endsWith("scala") => ltEqVersions.map { case (m, n) => file(dir.getPath + s"-$m.$n+") }
+        case _ => Seq.empty
+      }
+    },
+    Test / unmanagedSourceDirectories ++= {
+      val version = scalaVersion.value
+      val crossVersions = crossScalaVersions.value
+      import Ordering.Implicits._
+      val ltEqVersions = crossVersions.map(CrossVersion.partialVersion).filter(_ <= CrossVersion.partialVersion(version)).flatten
+      (Test / unmanagedSourceDirectories).value.flatMap {
+        case dir if dir.getPath.endsWith("scala") => ltEqVersions.map { case (m, n) => file(dir.getPath + s"-$m.$n+") }
+        case _ => Seq.empty
+      }
+    }
   )
   .disablePlugins(AssemblyPlugin)
 
-lazy val `distage-extension-logstage` = project.in(file("distage/distage-extension-logstage"))
+lazy val `distage-extension-plugins` = project.in(file("distage/distage-extension-plugins"))
   .dependsOn(
-    `distage-extension-config` % "test->compile;compile->compile",
     `distage-core-api` % "test->compile;compile->compile",
     `distage-core` % "test->compile",
-    `logstage-core` % "test->test;compile->compile"
+    `distage-extension-config` % "test->compile",
+    `logstage-core` % "test->compile"
   )
   .settings(
     libraryDependencies ++= Seq(
       "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat,
       "org.scalatest" %% "scalatest" % V.scalatest % Test,
-      "dev.zio" %% "zio" % V.zio % Test excludeAll("dev.zio" %% "izumi-reflect")
+      "io.github.classgraph" % "classgraph" % V.classgraph
     ),
     libraryDependencies ++= { if (scalaVersion.value.startsWith("2.")) Seq(
-      compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full)
+      compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full),
+      "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
     ) else Seq.empty }
   )
   .settings(
@@ -2219,18 +2217,21 @@ lazy val `distage-extension-logstage` = project.in(file("distage/distage-extensi
   )
   .disablePlugins(AssemblyPlugin)
 
-lazy val `distage-framework-api` = project.in(file("distage/distage-framework-api"))
+lazy val `distage-extension-logstage` = project.in(file("distage/distage-extension-logstage"))
   .dependsOn(
-    `distage-core-api` % "test->compile;compile->compile"
+    `distage-extension-config` % "test->compile;compile->compile",
+    `distage-core-api` % "test->compile;compile->compile",
+    `distage-core` % "test->compile",
+    `logstage-core` % "test->test;compile->compile"
   )
   .settings(
     libraryDependencies ++= Seq(
       "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat,
-      "org.scalatest" %% "scalatest" % V.scalatest % Test
+      "org.scalatest" %% "scalatest" % V.scalatest % Test,
+      "dev.zio" %% "zio" % V.zio % Test excludeAll("dev.zio" %% "izumi-reflect")
     ),
     libraryDependencies ++= { if (scalaVersion.value.startsWith("2.")) Seq(
-      compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full),
-      "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
+      compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full)
     ) else Seq.empty }
   )
   .settings(
@@ -3555,11 +3556,11 @@ lazy val `microsite` = project.in(file("doc/microsite"))
     `fundamentals-bio` % "test->compile;compile->compile",
     `distage-core-api` % "test->compile;compile->compile",
     `distage-core-proxy-bytebuddy` % "test->compile;compile->compile",
+    `distage-framework-api` % "test->compile;compile->compile",
     `distage-core` % "test->compile;compile->compile",
     `distage-extension-config` % "test->compile;compile->compile",
     `distage-extension-plugins` % "test->compile;compile->compile",
     `distage-extension-logstage` % "test->compile;compile->compile",
-    `distage-framework-api` % "test->compile;compile->compile",
     `distage-framework` % "test->compile;compile->compile",
     `distage-framework-docker` % "test->compile;compile->compile",
     `distage-testkit-core` % "test->compile;compile->compile",
@@ -3966,11 +3967,11 @@ lazy val `distage` = (project in file(".agg/distage-distage"))
   .aggregate(
     `distage-core-api`,
     `distage-core-proxy-bytebuddy`,
+    `distage-framework-api`,
     `distage-core`,
     `distage-extension-config`,
     `distage-extension-plugins`,
     `distage-extension-logstage`,
-    `distage-framework-api`,
     `distage-framework`,
     `distage-framework-docker`,
     `distage-testkit-core`,
@@ -3990,11 +3991,11 @@ lazy val `distage-jvm` = (project in file(".agg/distage-distage-jvm"))
   .aggregate(
     `distage-core-api`,
     `distage-core-proxy-bytebuddy`,
+    `distage-framework-api`,
     `distage-core`,
     `distage-extension-config`,
     `distage-extension-plugins`,
     `distage-extension-logstage`,
-    `distage-framework-api`,
     `distage-framework`,
     `distage-framework-docker`,
     `distage-testkit-core`,

distage/distage-extension-config/src/main/scala/izumi/distage/config/codec/PureconfigAutoDerive.scala renamed to distage/distage-extension-config/src/main/scala-2/izumi/distage/config/codec/PureconfigAutoDerive.scala

@@ -44,7 +44,7 @@ object PureconfigAutoDerive {
 
   object PureconfigAutoDeriveMacro {
     def materializeImpl[A: c.WeakTypeTag](c: blackbox.Context): c.Expr[PureconfigAutoDerive[A]] = {
-      import c.universe._
+      import c.universe.*
       c.Expr[PureconfigAutoDerive[A]] {
         // Yes, this is legal /_\ !! We add an import so that implicit scope is enhanced
         // by new config codecs that aren't in ConfigReader companion object

distage/distage-extension-config/src/main/scala/izumi/distage/config/codec/PureconfigInstances.scala renamed to distage/distage-extension-config/src/main/scala-2/izumi/distage/config/codec/PureconfigInstances.scala

@@ -1,8 +1,8 @@
 package izumi.distage.config.codec
 
 import com.typesafe.config.{ConfigMemorySize, ConfigValue}
+import pureconfig.*
 import pureconfig.ConfigReader.Result
-import pureconfig._
 import pureconfig.error.{CannotConvert, ConfigReaderFailures, ThrowableFailure}
 import pureconfig.generic.error.{InvalidCoproductOption, NoValidCoproductOptionFound}
 import pureconfig.generic.{CoproductHint, ProductHint}
@@ -74,7 +74,7 @@ object PureconfigInstances extends PureconfigInstances {
       } yield res
     }
     override def to(cv: ConfigValue, name: String): ConfigValue = {
-      import pureconfig.syntax._
+      import pureconfig.syntax.*
       Map(name -> cv).toConfig
     }
   }

distage/distage-extension-config/src/main/scala-3/izumi/distage/config/codec/scala-2/izumi/distage/config/codec/PureconfigAutoDerive.scala

@@ -0,0 +1,42 @@
+package izumi.distage.config.codec
+
+import pureconfig.ConfigReader
+
+
+/**
+  * Derive `pureconfig.ConfigReader` for A and for its fields recursively with `pureconfig-magnolia`
+  *
+  * This differs from just using [[pureconfig.module.magnolia.auto.reader.exportReader]] by using
+  * different configuration, defined in [[PureconfigInstances]], specifically:
+  *
+  * 1. Field name remapping is disabled, `camelCase` fields will remain camelCase, not `kebab-case`
+  * 2. Sealed traits are rendered as in `circe`, using a wrapper object with a single field, instead of using a `type` field. Example:
+  *
+  * {{{
+  *   sealed trait AorB
+  *   final case class A(a: Int) extends AorB
+  *   final case class B(b: String) extends AorB
+  *
+  *   final case class Config(values: List[AorB])
+  * }}}
+  *
+  * in config:
+  *
+  * {{{
+  *   config {
+  *     values = [
+  *       { A { a = 123 } },
+  *       { B { b = cba } }
+  *     ]
+  *   }
+  * }}}
+  */
+final class PureconfigAutoDerive[A](val value: ConfigReader[A]) extends AnyVal
+
+object PureconfigAutoDerive {
+  @inline def apply[A](implicit ev: PureconfigAutoDerive[A]): ConfigReader[A] = ev.value
+
+  @inline def derived[A](implicit ev: PureconfigAutoDerive[A]): ConfigReader[A] = ev.value
+
+  implicit def materialize[A]: PureconfigAutoDerive[A] = ???
+}

distage/distage-extension-plugins/src/main/scala/izumi/distage/plugins/ForcedRecompilationToken.scala renamed to distage/distage-extension-plugins/src/main/scala-2/izumi/distage/plugins/ForcedRecompilationToken.scala

@@ -32,7 +32,7 @@ object ForcedRecompilationToken {
     var cachedTypedTree: Universe#Tree = null
 
     def whiteboxMaterializeImpl(c: whitebox.Context): c.Tree = {
-      import c.universe._
+      import c.universe.*
 
       UniqueRecompilationTokenMacro.synchronized {
         if (cachedTypedTree eq null) {

distage/distage-extension-plugins/src/main/scala-2/izumi/distage/plugins/PluginConfigStatic.scala

@@ -0,0 +1,22 @@
+package izumi.distage.plugins
+
+import izumi.distage.plugins.StaticPluginLoader.StaticPluginLoaderMacro
+import scala.language.experimental.macros
+
+trait PluginConfigStatic {
+  /** Scan the specified package *at compile-time* for classes and objects that inherit [[PluginBase]]
+    *
+    * WARN: may interact badly with incremental compilation
+    * WARN: will _not_ find plugins defined in the current module, only those defined in dependency modules
+    *       (similarly to how you cannot call Scala macros defined in the current module)
+    */
+  def compileTime(pluginsPackage: String): PluginConfig = macro StaticPluginLoaderMacro.scanCompileTimeConfig
+
+  /** Scan the the current source file's package *at compile-time* for classes and objects that inherit [[PluginBase]]
+    *
+    * WARN: may interact badly with incremental compilation
+    * WARN: will _not_ find plugins defined in the current module, only those defined in dependency modules
+    *       (similarly to how you cannot call Scala macros defined in the current module)
+    */
+  def compileTimeThisPkg: PluginConfig = macro StaticPluginLoaderMacro.scanCompileTimeConfigThisPkg
+}

distage/distage-extension-plugins/src/main/scala/izumi/distage/plugins/StaticPluginLoader.scala renamed to distage/distage-extension-plugins/src/main/scala-2/izumi/distage/plugins/StaticPluginLoader.scala

@@ -1,12 +1,10 @@
 package izumi.distage.plugins
 
-import scala.language.experimental.macros
 import izumi.distage.plugins.load.{LoadedPlugins, PluginLoaderDefaultImpl}
 import izumi.fundamentals.platform.language.SourcePackageMaterializer.SourcePackageMaterializerMacro
 import izumi.fundamentals.reflection.ReflectionUtil
 
 import scala.reflect.macros.blackbox
-import scala.reflect.runtime.{universe => ru}
 
 /** Scan the specified package *at compile-time* for classes and objects that inherit [[PluginBase]]
   *
@@ -43,7 +41,7 @@ object StaticPluginLoader {
     }
 
     def scanCompileTimeImpl(c: blackbox.Context)(pluginPath: String): c.Expr[List[PluginBase]] = {
-      import c.universe._
+      import c.universe.*
 
       val loadedPlugins = if (pluginPath == "") {
         LoadedPlugins.empty
@@ -57,7 +55,7 @@ object StaticPluginLoader {
     }
 
     def instantiatePluginsInCode(c: blackbox.Context)(loadedPlugins: Seq[PluginBase]): List[c.Tree] = {
-      import c.universe._
+      import c.universe.*
       val runtimeMirror = ru.runtimeMirror(this.getClass.getClassLoader)
       loadedPlugins.map {
         plugin =>

distage/distage-extension-plugins/src/main/scala-3/izumi/distage/plugins/ForcedRecompilationToken.scala

@@ -0,0 +1,30 @@
+package izumi.distage.plugins
+
+import scala.annotation.implicitNotFound
+
+/**
+  * This macro allows `distage`'s compile-time checks to cooperate with Scala's incremental compilation:
+  * it forces recompilation of the macro that performs compile-time plan checking every time a PluginDef's body changes.
+  *
+  * It does that by generating a new unique type for each compiler session and assigning it to the class that inherits PluginDef.
+  * The "change of super type" of a plugin forces recompilation of all code that references it, and specifically of the
+  * code generated by [[izumi.distage.framework.PlanCheckMacro]].
+  *
+  * This allows compile-time checking macro to re-run on relevant changes and provide rapid feedback during development.
+  *
+  * @see [[https://izumi.7mind.io/distage/distage-framework.html#compile-time-checks Compile-time checks]]
+  */
+@implicitNotFound("""Could not find implicit for `izumi.distage.plugins.ForcedRecompilationToken[${T}]`.
+This is supposed to be impossible, but is sometimes observed under mdoc & scaladoc,
+in which case you'll have to put a dummy implicit in scope, such as by using:
+
+  import izumi.distage.plugins.ForcedRecompilationToken.disabled._""")
+final abstract class ForcedRecompilationToken[T]
+
+object ForcedRecompilationToken {
+  implicit def materialize[T]: ForcedRecompilationToken[T] = ???
+
+  object disabled {
+    implicit def disable: ForcedRecompilationToken[Unit] = null
+  }
+}