Merge pull request #3912 from Gedochao/maintenance/scala-2-cleanup-sequel

Drop Scala 2 in `config` and `specification-level` modules & bump `jsoniter-scala` to 2.38.2 (was 2.13.5.2)

Author: Gedochao

.scala-steward.conf

@@ -1,7 +1,3 @@
-updates.ignore = [
-    { groupId = "com.github.plokhotnyuk.jsoniter-scala", artifactId="jsoniter-scala-macros", version="2.13.5.2" },
-    { groupId = "com.github.plokhotnyuk.jsoniter-scala", artifactId="jsoniter-scala-core", version="2.13.5.2" }
-]
 postUpdateHooks = [{
   command = ["./mill", "-i", "generate-reference-doc[].run"],
   commitMessage = "Generate the reference doc"

.scalafix.legacy.conf

@@ -17,7 +17,6 @@ import settings.{
   LocalRepo,
   PublishLocalNoFluff,
   ScalaCliCrossSbtModule,
-  ScalaCliScalafixLegacyModule,
   ScalaCliScalafixModule,
   jvmPropertiesFileName,
   localRepoResourcePath,
@@ -94,11 +93,11 @@ object cliBootstrapped extends ScalaCliPublishModule {
   }
 }
 
-object `specification-level` extends Cross[SpecificationLevel](Scala.all)
+object `specification-level` extends Cross[SpecificationLevel](Scala.scala3MainVersions)
     with CrossScalaDefaultToInternal
 object `build-macros` extends Cross[BuildMacros](Scala.scala3MainVersions)
     with CrossScalaDefaultToInternal
-object config     extends Cross[Config](Scala.all) with CrossScalaDefaultToInternal
+object config     extends Cross[Config](Scala.scala3MainVersions) with CrossScalaDefaultToInternal
 object options    extends Cross[Options](Scala.scala3MainVersions) with CrossScalaDefaultToInternal
 object directives extends Cross[Directives](Scala.scala3MainVersions)
     with CrossScalaDefaultToInternal
@@ -648,27 +647,9 @@ trait Config extends ScalaCliCrossSbtModule
   override def crossScalaVersion: String                     = crossValue
   override def moduleDeps: Seq[SonatypeCentralPublishModule] =
     Seq(`specification-level`(crossScalaVersion))
-  override def ivyDeps: T[Agg[Dep]] = {
-    val maybeCollectionCompat =
-      if (crossScalaVersion.startsWith("2.12.")) Seq(Deps.collectionCompat)
-      else Nil
-    super.ivyDeps() ++ maybeCollectionCompat ++ Agg(
-      Deps.jsoniterCoreJava8
-    )
-  }
-  override def compileIvyDeps: T[Agg[Dep]] = super.compileIvyDeps() ++ Agg(
-    Deps.jsoniterMacrosJava8
-  )
-  override def scalacOptions: T[Seq[String]] = Task {
-    super.scalacOptions() ++ Seq("-release", "8")
-  }
-
-  // Disabling Scalafix in 2.13 and 3, so that it doesn't remove
-  // some compatibility-related imports, that are actually only used
-  // in Scala 2.12.
-  override def fix(args: String*): Command[Unit] =
-    if (crossScalaVersion.startsWith("2.12.")) super.fix(args: _*)
-    else Task.Command(())
+  override def ivyDeps: T[Agg[Dep]]          = super.ivyDeps() ++ Agg(Deps.jsoniterCore)
+  override def compileIvyDeps: T[Agg[Dep]]   = super.compileIvyDeps() ++ Agg(Deps.jsoniterMacros)
+  override def scalacOptions: T[Seq[String]] = super.scalacOptions() ++ Seq("-deprecation")
 }
 
 trait Options extends ScalaCliCrossSbtModule with ScalaCliPublishModule with HasTests

build.mill.scala

@@ -1,14 +1,14 @@
 package scala.cli.config
 
-import com.github.plokhotnyuk.jsoniter_scala.core.{Key => _, _}
-import com.github.plokhotnyuk.jsoniter_scala.macros._
+import com.github.plokhotnyuk.jsoniter_scala.core.{Key as _, *}
+import com.github.plokhotnyuk.jsoniter_scala.macros.*
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.attribute.{PosixFilePermission, PosixFilePermissions}
 import java.nio.file.{Files, Path}
 
 import scala.collection.immutable.ListMap
-import scala.jdk.CollectionConverters._
+import scala.jdk.CollectionConverters.*
 import scala.util.Properties
 
 /** In-memory representation of a configuration DB content.
@@ -50,7 +50,7 @@ final class ConfigDb private (
   }
 
   /** Removes an entry from memory */
-  def remove(key: Key[_]): this.type = {
+  def remove(key: Key[?]): this.type = {
     rawEntries -= key.fullName
     this
   }
@@ -90,7 +90,9 @@ final class ConfigDb private (
         }
       val sortedMap: Map[String, RawJson] = ListMap.empty ++ keyValues
       val b                               =
-        writeToArray(sortedMap, WriterConfig.withIndentionStep((level + 1) * 2))(ConfigDb.codec)
+        writeToArray(sortedMap, WriterConfig.withIndentionStep((level + 1) * 2))(using
+          ConfigDb.codec
+        )
       if (b.nonEmpty && b.last == '}'.toByte)
         // FIXME We're copying / moving arrays around quite a bit here
         b.init ++ ("  " * level).getBytes(StandardCharsets.US_ASCII) ++ Array('}'.toByte)
@@ -114,7 +116,7 @@ final class ConfigDb private (
       Array('\n': Byte)
   }
 
-  def saveUnsafe(path: Path): Either[ConfigDb.ConfigDbPermissionsError, Unit] = {
+  private def saveUnsafe(path: Path): Either[ConfigDb.ConfigDbPermissionsError, Unit] = {
     val dir = path.getParent
 
     if (Properties.isWin) {
@@ -164,7 +166,6 @@ final class ConfigDb private (
 }
 
 object ConfigDb {
-
   final class ConfigDbFormatError(
     message: String,
     causeOpt: Option[Throwable] = None
@@ -183,7 +184,7 @@ object ConfigDb {
     res += (if (perms.contains(PosixFilePermission.OTHERS_EXECUTE)) 'x' else '-')
     res.result()
   }
-  final class ConfigDbPermissionsError(path: Path, perms: Set[PosixFilePermission])
+  private final class ConfigDbPermissionsError(path: Path, perms: Set[PosixFilePermission])
       extends Exception(
         s"$path has wrong permissions ${permsString(perms)} (expected at most rwx------)"
       )
@@ -208,7 +209,7 @@ object ConfigDb {
       map.flatMap {
         case (k, v) =>
           try {
-            val subMap = flatten(readFromArray(v.value)(codec))
+            val subMap = flatten(readFromArray(v.value)(using codec))
             subMap.toSeq.map {
               case (k0, v0) =>
                 (k + "." + k0, v0)
@@ -221,7 +222,7 @@ object ConfigDb {
       }
 
     val maybeRawEntries =
-      try Right(flatten(readFromArray(dbContent)(codec)))
+      try Right(flatten(readFromArray(dbContent)(using codec)))
       catch {
         case e: JsonReaderException =>
           Left(new ConfigDbFormatError(
@@ -241,11 +242,9 @@ object ConfigDb {
     *   either an error on failure, or a ConfigDb instance on success
     */
   def open(path: Path): Either[Exception, ConfigDb] =
-    if (Files.exists(path))
-      apply(Files.readAllBytes(path), Some(path.toString))
-    else
-      Right(empty)
+    if Files.exists(path)
+    then apply(Files.readAllBytes(path), Some(path.toString))
+    else Right(empty)
 
-  def empty: ConfigDb =
-    new ConfigDb(Map())
+  def empty: ConfigDb = new ConfigDb(Map())
 }

modules/config/src/main/scala-2.12/scala/cli/config/Util.scala

@@ -3,5 +3,4 @@ package scala.cli.config
 object ErrorMessages {
   val inlineCredentialsError =
     "Inline credentials not accepted, please edit the config file manually."
-
 }

modules/config/src/main/scala-2.13/scala/cli/config/Util.scala

@@ -1,12 +1,11 @@
 package scala.cli.config
 
-import com.github.plokhotnyuk.jsoniter_scala.core._
-import com.github.plokhotnyuk.jsoniter_scala.macros._
+import com.github.plokhotnyuk.jsoniter_scala.core.*
+import com.github.plokhotnyuk.jsoniter_scala.macros.*
 
 import scala.cli.commands.SpecificationLevel
-import scala.cli.config.PublishCredentialsAsJson._
-import scala.cli.config.RepositoryCredentialsAsJson._
-import scala.cli.config.Util._ // only used in 2.12, unused import in 2.13
+import scala.cli.config.PublishCredentialsAsJson.*
+import scala.cli.config.RepositoryCredentialsAsJson.*
 
 /** A configuration key
   */
@@ -73,7 +72,7 @@ object Key {
       extends EntryError("Error parsing config JSON", Some(cause))
 
   final class MalformedValue(
-    entry: Key[_],
+    entry: Key[?],
     input: Seq[String],
     messageOrExpectedShape: Either[String, String],
     cause: Option[Throwable] = None
@@ -89,7 +88,7 @@ object Key {
       )
 
   private final class MalformedEntry(
-    entry: Key[_],
+    entry: Key[?],
     messages: ::[String]
   ) extends EntryError(
         s"Malformed entry ${entry.fullName}, " +
@@ -153,7 +152,7 @@ object Key {
   ) extends Key[PasswordOption] {
     def parse(json: Array[Byte]): Either[EntryError, PasswordOption] =
       try {
-        val str = readFromArray(json)(stringJsonCodec)
+        val str = readFromArray(json)(using stringJsonCodec)
         PasswordOption.parse(str).left.map { e =>
           new MalformedValue(this, Seq(str), Right(e))
         }
@@ -163,7 +162,7 @@ object Key {
           Left(new JsonReaderError(e))
       }
     def write(value: PasswordOption): Array[Byte] =
-      writeToArray(value.asString.value)(stringJsonCodec)
+      writeToArray(value.asString.value)(using stringJsonCodec)
     def asString(value: PasswordOption): Seq[String] = Seq(value.asString.value)
     def fromString(values: Seq[String]): Either[MalformedValue, PasswordOption] =
       values match {

modules/config/src/main/scala-3/scala/cli/config/Util.scala

@@ -1,6 +1,6 @@
 package scala.cli.config
 
-import com.github.plokhotnyuk.jsoniter_scala.core.{Key => _}
+import com.github.plokhotnyuk.jsoniter_scala.core.Key as _
 
 import scala.cli.commands.SpecificationLevel
 
@@ -142,7 +142,7 @@ object Keys {
   )
 
   // Kept for binary compatibility
-  val repositoriesMirrors = repositoryMirrors
+  val repositoriesMirrors: Key.StringListEntry = repositoryMirrors
 
   // setting indicating if the global interactive mode was suggested
   val globalInteractiveWasSuggested = new Key.BooleanEntry(
@@ -169,7 +169,7 @@ object Keys {
       "Publishing credentials, syntax: repositoryAddress value:user value:password [realm]"
   )
 
-  def all: Seq[Key[_]] = Seq[Key[_]](
+  def all: Seq[Key[?]] = Seq[Key[?]](
     actions,
     defaultRepositories,
     ghToken,
@@ -194,5 +194,5 @@ object Keys {
     userName,
     userUrl
   )
-  lazy val map: Map[String, Key[_]] = all.map(e => e.fullName -> e).toMap
+  lazy val map: Map[String, Key[?]] = all.map(e => e.fullName -> e).toMap
 }