Bump actions/checkout from 3 to 4

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/actions.yml

@@ -0,0 +1,82 @@
+name: ci
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: ['8', '17']
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java }}
+      - name: Run tests
+        run: ./mill -i all __.publishArtifacts __.test
+
+  check-binary-compatibility:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Check Binary Compatibility
+        run: ./mill -i __.mimaReportBinaryIssues
+
+  publish-sonatype:
+    if: github.repository == 'com-lihaoyi/PPrint' && contains(github.ref, 'refs/tags/')
+    needs: test
+    runs-on: ubuntu-latest
+    env:
+      SONATYPE_PGP_PRIVATE_KEY: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY }}
+      SONATYPE_PGP_PRIVATE_KEY_PASSWORD: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY_PASSWORD }}
+      SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
+      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+      LANG: "en_US.UTF-8"
+      LC_MESSAGES: "en_US.UTF-8"
+      LC_ALL: "en_US.UTF-8"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Publish to Maven Central
+        run: |
+          if [[ $(git tag --points-at HEAD) != '' ]]; then
+            echo $SONATYPE_PGP_PRIVATE_KEY | base64 --decode > gpg_key
+            gpg --import --no-tty --batch --yes gpg_key
+            rm gpg_key
+            ./mill -i mill.scalalib.PublishModule/publishAll \
+              --sonatypeCreds $SONATYPE_USER:$SONATYPE_PASSWORD \
+              --gpgArgs --passphrase=$SONATYPE_PGP_PRIVATE_KEY_PASSWORD,--no-tty,--pinentry-mode,loopback,--batch,--yes,-a,-b \
+              --publishArtifacts __.publishArtifacts \
+              --readTimeout 600000 \
+              --awaitTimeout 600000 \
+              --release true \
+              --signed true
+          fi
+      - name: Create GitHub Release
+        id: create_gh_release
+        uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: false

.gitignore

@@ -10,3 +10,6 @@ target/
 project/.sbtserver
 tags
 nohup.out
+.bloop/
+.metals/
+.vscode/

.mill-version

@@ -0,0 +1 @@
+0.10.5

README.md

@@ -1,4 +1,4 @@
-PPrint [![Gitter Chat][gitter-badge]][gitter-link] [![Build Status][travis-badge]][travis-link]
+PPrint [![Gitter Chat][gitter-badge]][gitter-link]
 ===============================================================================================
 
 [travis-badge]: https://travis-ci.org/lihaoyi/PPrint.svg
@@ -9,4 +9,4 @@ PPrint [![Gitter Chat][gitter-badge]][gitter-link] [![Build Status][travis-badge
 
 *A Scala library to pretty-print values and types*
 
-[Documentation](https://lihaoyi.github.io/PPrint/)
+[Documentation](https://com-lihaoyi.github.io/PPrint/)

build.sc

@@ -1,19 +1,40 @@
 import mill._, scalalib._, scalajslib._, scalanativelib._, publish._
+import mill.scalalib.api.Util.isScala3
+import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.1.4`
+import de.tobiasroeser.mill.vcs.version.VcsVersion
+import $ivy.`com.github.lolgab::mill-mima::0.0.11`
+import com.github.lolgab.mill.mima._
 
+val dottyCommunityBuildVersion = sys.props.get("dottyVersion").toList
 
-trait PPrintModule extends PublishModule {
+val scalaVersions =
+  "2.12.16" :: "2.13.8" :: "2.11.12" :: "3.1.3" :: dottyCommunityBuildVersion
+
+val scalaJSVersions = scalaVersions.map((_, "1.10.1"))
+val scalaNativeVersions = scalaVersions.map((_, "0.4.5"))
+
+trait PPrintModule extends PublishModule with Mima {
   def artifactName = "pprint"
 
-  def publishVersion = "0.5.9"
+  def publishVersion = VcsVersion.vcsState().format()
+
+  def mimaPreviousVersions = VcsVersion.vcsState().lastTag.toSeq
+
+  def crossScalaVersion: String
+
+  // Temporary until the next version of Mima gets released with
+  // https://github.com/lightbend/mima/issues/693 included in the release.
+  def mimaPreviousArtifacts =
+    if(isScala3(crossScalaVersion)) Agg.empty[Dep] else super.mimaPreviousArtifacts()
 
   def pomSettings = PomSettings(
     description = artifactName(),
     organization = "com.lihaoyi",
-    url = "https://github.com/lihaoyi/PPrint",
+    url = "https://github.com/com-lihaoyi/PPrint",
     licenses = Seq(License.MIT),
-    scm = SCM(
-      "git://github.com/lihaoyi/PPrint.git",
-      "scm:git://github.com/lihaoyi/PPrint.git"
+    versionControl = VersionControl.github(
+      owner = "com-lihaoyi",
+      repo = "PPrint"
     ),
     developers = Seq(
       Developer("lihaoyi", "Li Haoyi", "https://github.com/lihaoyi")
@@ -23,13 +44,15 @@ trait PPrintModule extends PublishModule {
 trait PPrintMainModule extends CrossScalaModule {
   def millSourcePath = super.millSourcePath / offset
   def ivyDeps = Agg(
-    ivy"com.lihaoyi::fansi::0.2.9",
-    ivy"com.lihaoyi::sourcecode::0.2.1"
-  )
-  def compileIvyDeps = Agg(
-    ivy"org.scala-lang:scala-reflect:${scalaVersion()}",
-    ivy"org.scala-lang:scala-compiler:${scalaVersion()}"
+    ivy"com.lihaoyi::fansi::0.4.0",
+    ivy"com.lihaoyi::sourcecode::0.3.0"
   )
+  def compileIvyDeps =
+    if (crossScalaVersion.startsWith("2")) Agg(
+      ivy"${scalaOrganization()}:scala-reflect:${scalaVersion()}",
+      ivy"${scalaOrganization()}:scala-compiler:${scalaVersion()}"
+    )
+    else Agg.empty[Dep]
   def offset: os.RelPath = os.rel
   def sources = T.sources(
     super.sources()
@@ -40,46 +63,12 @@ trait PPrintMainModule extends CrossScalaModule {
         )
       )
   )
-  def generatedSources = T{
-    val dir = T.ctx().dest
-    val file = dir/"pprint"/"TPrintGen.scala"
-
-    val typeGen = for(i <- 2 to 22) yield {
-      val ts = (1 to i).map("T" + _).mkString(", ")
-      val tsBounded = (1 to i).map("T" + _ + ": Type").mkString(", ")
-      val tsGet = (1 to i).map("get[T" + _ + "](cfg)").mkString(" + \", \" + ")
-      s"""
-          implicit def F${i}TPrint[$tsBounded, R: Type] = make[($ts) => R](cfg =>
-            "(" + $tsGet + ") => " + get[R](cfg)
-          )
-          implicit def T${i}TPrint[$tsBounded] = make[($ts)](cfg =>
-            "(" + $tsGet + ")"
-          )
-        """
-    }
-    val output = s"""
-        package pprint
-        trait TPrintGen[Type[_], Cfg]{
-          def make[T](f: Cfg => String): Type[T]
-          def get[T: Type](cfg: Cfg): String
-          implicit def F0TPrint[R: Type] = make[() => R](cfg => "() => " + get[R](cfg))
-          implicit def F1TPrint[T1: Type, R: Type] = {
-            make[T1 => R](cfg => get[T1](cfg) + " => " + get[R](cfg))
-          }
-          ${typeGen.mkString("\n")}
-        }
-      """.stripMargin
-    os.write(file, output, createFolders = true)
-    Seq(PathRef(file))
-  }
-
 }
 
 
-trait PPrintTestModule extends ScalaModule with TestModule {
+trait PPrintTestModule extends ScalaModule with TestModule.Utest {
   def crossScalaVersion: String
-  def testFrameworks = Seq("utest.runner.Framework")
-  def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.7.4")
+  def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.0")
   def offset: os.RelPath = os.rel
   def millSourcePath = super.millSourcePath / os.up
 
@@ -97,20 +86,18 @@ trait PPrintTestModule extends ScalaModule with TestModule {
 }
 
 object pprint extends Module {
-  object jvm extends Cross[JvmPPrintModule]("2.12.8", "2.13.0")
+  object jvm extends Cross[JvmPPrintModule](scalaVersions:_*)
   class JvmPPrintModule(val crossScalaVersion: String)
     extends PPrintMainModule with ScalaModule with PPrintModule {
     object test extends Tests with PPrintTestModule{
       val crossScalaVersion = JvmPPrintModule.this.crossScalaVersion
     }
   }
 
-  object js extends Cross[JsPPrintModule](
-    ("2.12.8", "0.6.31"), ("2.13.0", "0.6.31"), 
-    ("2.12.8", "1.0.0"), ("2.13.0", "1.0.0")
-  )
+  object js extends Cross[JsPPrintModule](scalaJSVersions:_*)
   class JsPPrintModule(val crossScalaVersion: String, crossJSVersion: String)
     extends PPrintMainModule with ScalaJSModule with PPrintModule {
+
     def offset = os.up
     def scalaJSVersion = crossJSVersion
     object test extends Tests with PPrintTestModule{
@@ -119,9 +106,7 @@ object pprint extends Module {
     }
   }
 
-  object native extends Cross[NativePPrintModule](
-    ("2.11.12", "0.3.9"), ("2.11.12", "0.4.0-M2")
-  )
+  object native extends Cross[NativePPrintModule](scalaNativeVersions:_*)
   class NativePPrintModule(val crossScalaVersion: String, crossScalaNativeVersion: String)
     extends PPrintMainModule with ScalaNativeModule with PPrintModule {
     def offset = os.up
@@ -131,4 +116,5 @@ object pprint extends Module {
       val crossScalaVersion = NativePPrintModule.this.crossScalaVersion
     }
   }
+
 }

mill

@@ -3,14 +3,14 @@
 # This is a wrapper script, that automatically download mill from GitHub release pages
 # You can give the required mill version with MILL_VERSION env variable
 # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
-DEFAULT_MILL_VERSION=0.6.1
+DEFAULT_MILL_VERSION=0.10.5
 
 set -e
 
 if [ -z "$MILL_VERSION" ] ; then
   if [ -f ".mill-version" ] ; then
     MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)"
-  elif [ -f "mill" ] && [ "$BASH_SOURCE" != "mill" ] ; then
+  elif [ -f "mill" ] && [ "$0" != "mill" ] ; then
     MILL_VERSION=$(grep -F "DEFAULT_MILL_VERSION=" "mill" | head -n 1 | cut -d= -f2)
   else
     MILL_VERSION=$DEFAULT_MILL_VERSION
@@ -28,13 +28,14 @@ version_remainder="$MILL_VERSION"
 MILL_MAJOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
 MILL_MINOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
 
-if [ ! -x "$MILL_EXEC_PATH" ] ; then
-  mkdir -p $MILL_DOWNLOAD_PATH
+if [ ! -s "$MILL_EXEC_PATH" ] ; then
+  mkdir -p "$MILL_DOWNLOAD_PATH"
   if [ "$MILL_MAJOR_VERSION" -gt 0 ] || [ "$MILL_MINOR_VERSION" -ge 5 ] ; then
     ASSEMBLY="-assembly"
   fi
   DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download
-  MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION${ASSEMBLY}"
+  MILL_VERSION_TAG=$(echo $MILL_VERSION | sed -E 's/([^-]+)(-M[0-9]+)?(-.*)?/\1\2/')
+  MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION_TAG}/$MILL_VERSION${ASSEMBLY}"
   curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL"
   chmod +x "$DOWNLOAD_FILE"
   mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH"

pprint/src-2.11/pprint/ProductSupport.scala

@@ -0,0 +1,11 @@
+package pprint
+
+object ProductSupport {
+
+  def treeifyProductElements(x: Product,
+                             walker: Walker,
+                             escapeUnicode: Boolean,
+                             showFieldNames: Boolean): Iterator[Tree] =
+    x.productIterator.map(x => walker.treeify(x, escapeUnicode, showFieldNames))
+
+}

pprint/src-2.12/pprint/ProductSupport.scala

@@ -0,0 +1,11 @@
+package pprint
+
+object ProductSupport {
+
+  def treeifyProductElements(x: Product,
+                             walker: Walker,
+                             escapeUnicode: Boolean,
+                             showFieldNames: Boolean): Iterator[Tree] =
+    x.productIterator.map(x => walker.treeify(x, escapeUnicode, showFieldNames))
+
+}

pprint/src-2.13/pprint/ProductSupport.scala

@@ -0,0 +1,19 @@
+package pprint
+
+object ProductSupport {
+
+  def treeifyProductElements(x: Product,
+                             walker: Walker,
+                             escapeUnicode: Boolean,
+                             showFieldNames: Boolean): Iterator[Tree] = {
+    if (!showFieldNames) x.productIterator.map(x => walker.treeify(x, escapeUnicode, showFieldNames))
+    else x.productElementNames
+      .zipWithIndex
+      .map {
+        case (name, i) =>
+          val elem = x.productElement(i)
+          Tree.KeyValue(name, walker.treeify(elem, escapeUnicode, showFieldNames))
+      }
+  }
+
+}

pprint/src-2.13/pprint/StringPrefix.scala

@@ -2,4 +2,4 @@ package pprint
 
 object StringPrefix{
   def apply(i: Iterable[_]) = i.asInstanceOf[{ def collectionClassName: String }].collectionClassName
-}
+}