Merge pull request #185 from lolgab/scala-native-scala-3

Support Scala Native + Scala 3

Author: tgodzik

build.sbt

@@ -3,16 +3,16 @@ import sbtcrossproject.CrossPlugin.autoImport.crossProject
 import com.typesafe.tools.mima.core._
 
 lazy val V = new {
-  def munit = "0.7.29"
+  def munit = "1.0.0-M10"
+  def scalacheck = "1.17.0"
 }
 val scala212 = "2.12.15"
 val scala213 = "2.13.8"
-val scala3 = "3.1.3"
+val scala3 = "3.3.1"
 val ScalaVersions = List(scala213, scala212, scala3)
 inThisBuild(
   List(
     useSuperShell := false,
-    scalacOptions += "-Yrangepos",
     organization := "com.geirsson",
     version ~= { old => old.replace('+', '-') },
     licenses := Seq(
@@ -27,7 +27,7 @@ inThisBuild(
       "olafurpg@gmail.com",
       url("https://geirsson.com")
     ),
-    resolvers += Resolver.sonatypeRepo("snapshots"),
+    resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
     versionScheme := Some("early-semver")
   )
 )
@@ -53,10 +53,16 @@ commands += Command.command("taskready") { s =>
 }
 
 lazy val warnUnusedImport = Def.setting {
-  if (scalaVersion.value.startsWith("2.13")) "-Wunused:imports"
+  if (scalaVersion.value.startsWith("2.13") ||
+    scalaVersion.value.startsWith("3.")) "-Wunused:imports"
   else "-Ywarn-unused-import"
 }
 
+lazy val yRangePos = Def.setting {
+  if (scalaVersion.value.startsWith("3.")) Seq.empty[String]
+  else Seq("-Yrangepos")
+}
+
 val languageAgnosticCompatibilityPolicy: ProblemFilter = (problem: Problem) => {
   val (ref, fullName) = problem match {
     case problem: TemplateProblem => (problem.ref, problem.ref.fullName)
@@ -70,26 +76,30 @@ val languageAgnosticCompatibilityPolicy: ProblemFilter = (problem: Problem) => {
 }
 
 lazy val sharedSettings = List[Setting[_]](
-  scalacOptions ++= List(
-    "-Yrangepos",
+  scalacOptions ++= yRangePos.value,
+  scalacOptions ++= Seq(
     "-deprecation",
     warnUnusedImport.value
   ),
   mimaBinaryIssueFilters ++= List[ProblemFilter](
     languageAgnosticCompatibilityPolicy
   ),
-  mimaPreviousArtifacts := Set("com.geirsson" %% moduleName.value % "0.9.10"),
   crossScalaVersions := ScalaVersions,
   scalaVersion := scala213
 )
 
-skip.in(publish) := true
+lazy val mimaSettings = List[Setting[_]](
+  mimaPreviousArtifacts := Set("com.geirsson" %% moduleName.value % "0.9.10")
+)
+
+publish / skip := true
 disablePlugins(MimaPlugin)
 
 lazy val pprint = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .in(file("metaconfig-pprint"))
   .settings(
     sharedSettings,
+    mimaSettings,
     moduleName := "metaconfig-pprint",
     libraryDependencies += "com.lihaoyi" %%% "fansi" % "0.4.0",
     libraryDependencies ++= {
@@ -101,18 +111,16 @@ lazy val pprint = crossProject(JVMPlatform, JSPlatform, NativePlatform)
       else Nil
     }
   )
-  .nativeSettings(
-    crossScalaVersions -= scala3
-  )
 
 lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .in(file("metaconfig-core"))
   .settings(
     sharedSettings,
+    mimaSettings,
     moduleName := "metaconfig-core",
     libraryDependencies ++= List(
-      "org.typelevel" %%% "paiges-core" % "0.4.2",
-      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.5.0"
+      "org.typelevel" %%% "paiges-core" % "0.4.3",
+      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.11.0"
     )
   )
   .settings(
@@ -131,69 +139,56 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
       else Seq.empty
     }
   )
-  .nativeSettings(
-    crossScalaVersions -= scala3
-  )
   .dependsOn(pprint)
 
-lazy val coreJVM = core.jvm
-lazy val coreJS = core.js
-lazy val coreNative = core.native
-
 lazy val typesafe = project
   .in(file("metaconfig-typesafe-config"))
   .settings(
     sharedSettings,
+    mimaSettings,
     moduleName := "metaconfig-typesafe-config",
     description := "Integration for HOCON using typesafehub/config.",
     libraryDependencies += "com.typesafe" % "config" % "1.4.1"
   )
-  .dependsOn(coreJVM)
+  .dependsOn(core.jvm)
 
 lazy val sconfig = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .in(file("metaconfig-sconfig"))
   .settings(
     sharedSettings,
+    mimaSettings,
     moduleName := "metaconfig-sconfig",
     description := "Integration for HOCON using ekrich/sconfig.",
     libraryDependencies ++= List(
-      "org.ekrich" %%% "sconfig" % "1.4.4"
+      "org.ekrich" %%% "sconfig" % "1.5.1"
     )
   )
-  .jsSettings(
+  .platformsSettings(JSPlatform, NativePlatform)(
     libraryDependencies ++= List(
-      "org.ekrich" %%% "sjavatime" % "1.1.5"
+      "org.ekrich" %%% "sjavatime" % "1.1.9"
     )
   )
-  .nativeSettings(
-    libraryDependencies ++= List(
-      "org.ekrich" %%% "sjavatime" % "1.1.3"
-    ),
-    crossScalaVersions -= scala3
-  )
   .dependsOn(core)
-lazy val sconfigJVM = sconfig.jvm
-lazy val sconfigJS = sconfig.js
-lazy val sconfigNative = sconfig.native
 
 lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .in(file("metaconfig-tests"))
   .disablePlugins(MimaPlugin)
   .settings(
     sharedSettings,
-    skip in publish := true,
-    publishArtifact.in(Compile, packageDoc) := false,
+    publish / skip := true,
+    Compile / packageDoc / publishArtifact := false,
     testFrameworks := List(new TestFramework("munit.Framework")),
     libraryDependencies ++= List(
-      "org.scalameta" %%% "munit-scalacheck" % V.munit
+      "org.scalacheck" %%% "scalacheck" % V.scalacheck,
+      "org.scalameta" %%% "munit-scalacheck" % V.munit % Test
     )
   )
   .jsSettings(
     scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
   )
   .jvmSettings(
-    mainClass in GraalVMNativeImage := Some("metaconfig.tests.ExampleMain"),
-    sources.in(Compile, doc) := Seq.empty,
+    GraalVMNativeImage / mainClass := Some("metaconfig.tests.ExampleMain"),
+    Compile / doc / sources := Seq.empty,
     libraryDependencies ++= {
       if (scalaVersion.value.startsWith("2."))
         Seq(
@@ -203,7 +198,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
     },
     graalVMNativeImageOptions ++= {
       val reflectionFile =
-        Keys.sourceDirectory.in(Compile).value./("graal")./("reflection.json")
+        (Compile / Keys.sourceDirectory).value / "graal" / "reflection.json"
       assert(reflectionFile.exists, "no such file: " + reflectionFile)
       List(
         "-H:+ReportUnsupportedElementsAtRuntime",
@@ -223,39 +218,29 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   )
   .jvmConfigure(
     _.enablePlugins(GraalVMNativeImagePlugin)
-      .dependsOn(typesafe, sconfigJVM)
-  )
-  .nativeSettings(
-    crossScalaVersions -= scala3
+      .dependsOn(typesafe, sconfig.jvm)
   )
   .dependsOn(core)
 
-lazy val testsJVM = tests.jvm
-lazy val testsJS = tests.js
-lazy val testsNative = tests.native
-
 lazy val docs = project
   .in(file("metaconfig-docs"))
   .settings(
     sharedSettings,
-    crossScalaVersions -= scala3,
     libraryDependencies ++= List(
-      "org.scalameta" %%% "munit-scalacheck" % V.munit
+      "com.lihaoyi" %%% "scalatags" % "0.12.0",
+      "org.scalacheck" %%% "scalacheck" % V.scalacheck,
+      "org.scalameta" %%% "munit-scalacheck" % V.munit % Test
     ),
     moduleName := "metaconfig-docs",
-    libraryDependencies ++= List(
-      "com.lihaoyi" %% "scalatags" % "0.9.4"
-    ).filter(_ => scalaVersion.value.startsWith("2.")),
     mdocVariables := Map(
       "VERSION" -> version.value.replaceFirst("\\+.*", ""),
       "SCALA_VERSION" -> scalaVersion.value
     ),
-    mdocOut :=
-      baseDirectory.in(ThisBuild).value / "website" / "target" / "docs",
+    mdocOut := (ThisBuild / baseDirectory).value / "website" / "target" / "docs",
     mdocExtraArguments := List("--no-link-hygiene"),
     // mdoc's metaconfig might (and will eventually) lag behind the current version, causing eviction errors
     evictionErrorLevel := Level.Warn
   )
-  .dependsOn(coreJVM, typesafe, sconfigJVM)
+  .dependsOn(core.jvm, typesafe, sconfig.jvm)
   .enablePlugins(DocusaurusPlugin)
   .disablePlugins(MimaPlugin)

metaconfig-core/shared/src/main/scala-3/metaconfig/generic/package.scala

@@ -99,7 +99,7 @@ private[generic] def deriveConfDecoderImpl[T: Type](default: Expr[T])(using
 
   if paramss.head.isEmpty then '{ ConfDecoder.constant($default) }
   else
-    val (head :: params) :: Nil = paramss
+    val (head :: params) :: Nil = paramss : @unchecked
     val vds = paramss.head.map(_.tree).collect { case vd: ValDef =>
       next(vd)
     }
@@ -176,7 +176,7 @@ private[generic] def deriveConfDecoderExImpl[T: Type](default: Expr[T])(using
           Configured.Ok(state.getOrElse($default))
     }
   else
-    val (head :: params) :: Nil = paramss
+    val (head :: params) :: Nil = paramss : @unchecked
     val vds = paramss.head.map(_.tree).collect { case vd: ValDef =>
       next(vd)
     }

metaconfig-core/shared/src/main/scala/metaconfig/Position.scala

@@ -18,7 +18,7 @@ sealed abstract class Position { pos =>
   /** Returns a formatted string of this position including filename/line/caret. */
   final def pretty(severity: String, message: String): String = {
     // Predef.augmentString = work around scala/bug#11125 on JDK 11
-    val content = augmentString(lineContent).lines
+    val content = augmentString(lineContent).linesIterator
     val sb = new StringBuilder()
     sb.append(lineInput(severity, message))
       .append("\n")

metaconfig-core/shared/src/main/scala/metaconfig/internal/Case.scala

@@ -9,7 +9,7 @@ object Case {
     while (m.find()) {
       m.appendReplacement(
         sb,
-        m.group().charAt(1).toUpper + m.group().substring(2)
+        m.group().charAt(1).toUpper.toString + m.group().substring(2)
       )
     }
     m.appendTail(sb)

metaconfig-pprint/shared/src/main/scala-2/metaconfig/pprint/TPrintImpl.scala

@@ -82,7 +82,7 @@ object TPrintLowPri {
       val g = cas.global
       val gName = s.name.asInstanceOf[g.Name]
       val lookedUps =
-        for (n <- Stream(gName.toTermName, gName.toTypeName)) yield {
+        for (n <- Iterator(gName.toTermName, gName.toTypeName)) yield {
           cas.callsiteTyper.context
             .lookupSymbol(n, _ => true)
             .symbol
@@ -186,7 +186,7 @@ object TPrintLowPri {
           }
         }
       if (stmts.length == 0) None
-      else Some(stmts.reduceLeft((l, r) => l + "; " + r))
+      else Some(stmts.reduceLeft((l, r) => s"$l; $r"))
     }
 
     tpe match {
@@ -195,8 +195,10 @@ object TPrintLowPri {
         (fansi.Str("_") ++ res, WrapType.NoWrap)
       case ThisType(sym) =>
         (
-          printSymFull(sym) + (if (sym.isPackage || sym.isModuleClass) ""
-                               else ".this.type"),
+          printSymFull(sym).toString +
+            (if (sym.isPackage || sym.isModuleClass)
+               ""
+             else ".this.type"),
           WrapType.NoWrap
         )
 
@@ -273,11 +275,11 @@ object TPrintLowPri {
         )
       case AnnotatedType(annots, tp) =>
         val mapped = annots
-          .map(x => " @" + typePrintImplRec(c)(x.tpe, true))
+          .map(x => " @" + typePrintImplRec(c)(x.tree.tpe, true))
           .reduceLeft((x, y) => x + y)
 
         (
-          typePrintImplRec(c)(tp, true) + mapped,
+          typePrintImplRec(c)(tp, true).toString + mapped,
           WrapType.NoWrap
         )
       case RefinedType(parents, defs) =>
@@ -288,7 +290,8 @@ object TPrintLowPri {
               .map(typePrintImplRec(c)(_, true))
               .reduceLeft[fansi.Str]((l, r) => l ++ " with " ++ r)
         (
-          pre + (if (defs.isEmpty) "" else "{" ++ defs.mkString(";") ++ "}"),
+          pre.toString + (if (defs.isEmpty) ""
+                          else "{" ++ defs.mkString(";") ++ "}"),
           WrapType.NoWrap
         )
       case ConstantType(value) =>

metaconfig-pprint/shared/src/main/scala-3/metaconfig/pprint/TPrintImpl.scala

@@ -43,7 +43,6 @@ object TPrintLowPri{
   def typePrintImpl[T](using Quotes, Type[T]): Expr[TPrint[T]] = {
 
     import quotes.reflect._
-    import util._
 
     def literalColor(s: fansi.Str): fansi.Str = {
       fansi.Color.Green(s)

metaconfig-tests/jvm-native/src/test/scala/metaconfig/DeriveSurfaceFileSuite.scala

@@ -0,0 +1,16 @@
+package metaconfig
+
+import java.io.File
+
+class DeriveSurfaceFileSuite extends munit.FunSuite {
+
+  case class WithFile(file: File)
+  test("toString") {
+    val surface = generic.deriveSurface[WithFile]
+    val obtained = surface.toString
+    assertNoDiff(
+      obtained,
+      "Surface(List(List(Field(name=\"file\",tpe=\"File\",annotations=List(@TabCompleteAsPath()),underlying=List()))))"
+    )
+  }
+}