Merge pull request #76 from Quafadas/mill1

mill1

Author: Quafadas

.devcontainer/devcontainer.json

@@ -26,9 +26,9 @@
     "ghcr.io/guiyomh/features/just:0" :{}
   },
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  // "forwardPorts": [],
+  "forwardPorts": [8080],
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "chmod +x mill"
+  "postCreateCommand": ""
   // Configure tool-specific properties.
   // "customizations": {},
   // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.

.github/workflows/copilot-instructions.md renamed to .github/copilot-instructions.md

@@ -1,7 +1,7 @@
-This is a scala 3 project using the mill build tool. It is a lightweight dataframe library with the twist that it expects the "dataframe" in question to have it's structure identified by the compiler, at compile time. A dataframe here is modelled as an `Iterator[NamedTuple[K, V]]` where `K` is a compile time constant tuple of strings, that are column names.
-
-When writing tests, use scala munit. Cross platform tests should be in 'scautable/test/src'.
-
-When writing code, follow the coding guidelines in `styleguide.md` in the root of the repository.
-
+This is a scala 3 project using the mill build tool. It is a lightweight dataframe library with the twist that it expects the "dataframe" in question to have it's structure identified by the compiler, at compile time. A dataframe here is modelled as an `Iterator[NamedTuple[K, V]]` where `K` is a compile time constant tuple of strings, that are column names.
+
+When writing tests, use scala munit. Cross platform tests should be in 'scautable/test/src'.
+
+When writing code, follow the coding guidelines in `styleguide.md` in the root of the repository.
+
 Answer all questions in the style of a friendly colleague that is an expert in dataframe libraries, scala3 and the requirements of a statistical library. Feel free to suggest popular API's from successful libraries, e.g. Pandas which expose clean APIs and clear functionality to a consumer of this library.

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
       - "v*"
   pull_request:
     branches:
-      - main
+      - "*"
 
 permissions:
   id-token: write
@@ -47,17 +47,12 @@ jobs:
       - uses: actions/setup-java@main
         with:
           distribution: 'temurin'
-          java-version: 17
-      - name: Setup GPG secrets
-        run: |
-          gpg --version
-          cat <(echo "${{ secrets.PUBLISH_SECRET_KEY }}") | base64 --decode | gpg --batch --import
-          gpg --list-secret-keys --keyid-format LONG
+          java-version: 21
       - name: Publish to Maven Central
-        run: ./mill --import "ivy:com.lihaoyi::mill-contrib-sonatypecentral:" mill.contrib.sonatypecentral.SonatypeCentralPublishModule/publishAll --publishArtifacts __.publishArtifacts
+        run: ./mill mill.javalib.SonatypeCentralPublishModule/
         env:
-          MILL_PGP_PASSPHRASE: ${{ secrets.PUBLISH_SECRET_KEY_PASSWORD }}
-          MILL_PGP_SECRET_BASE64: ${{ secrets.PUBLISH_SECRET_KEY }}
+          MILL_PGP_PASSPHRASE: ${{ secrets.MILL_PGP_PASSPHRASE  }}
+          MILL_PGP_SECRET_BASE64: ${{ secrets.MILL_PGP_SECRET_BASE64 }}
           MILL_SONATYPE_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }}
           MILL_SONATYPE_USERNAME: ${{ secrets.PUBLISH_USER }}
 
@@ -69,34 +64,34 @@ jobs:
     steps:
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
       - uses: actions/checkout@main
         with:
           fetch-depth: 0
           fetch-tags: true
-      - run: ./mill site.publishDocs
+      - run: ./mill site.siteGen
 
   site:
-    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
+    if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
     needs: test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
       - uses: actions/checkout@main
         with:
           fetch-depth: 0
           fetch-tags: true
-      - run: ./mill site.publishDocs
+      - run: ./mill site.siteGen
       - name: Setup Pages
         uses: actions/configure-pages@main
       - uses: actions/upload-artifact@main
         with:
           name: page
-          path: out/site/publishDocs.dest
+          path: out/site/laika/generateSite.dest
           if-no-files-found: error
 
   deploy:

.mill-version

@@ -8,8 +8,8 @@
       "type": "scala",
       "request": "launch",
       "name": "test",
-      "buildTarget": "scautable.jvm.test",
-      "testClass": "io.github.quafadas.scautable.CSVSuite",
+      "buildTarget": "scautable.test.jvm",
+      "testClass": "io.github.quafadas.scautable.TypeInferrerSuite",
       "args": [
         "-oD"
       ]

.vscode/launch.json

@@ -1,32 +1,33 @@
-package build
+//| mill-version: 1.0.4
+//| mill-jvm-version: 21
+//| mvnDeps:
+//| - io.github.quafadas:millSite_mill1_3.7:0.0.50
 
-import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
+package build
 
 import mill._, mill.scalalib._, mill.scalajslib._
 import mill._, scalalib._, publish._
 
-import de.tobiasroeser.mill.vcs.version._
-
-import $packages._
+import mill.util.VcsVersion
 
 object Config {
-  val oslib = ivy"com.lihaoyi::os-lib:0.11.5"
-  val scalatags = ivy"com.lihaoyi::scalatags::0.13.1"
-  val fansi = ivy"com.lihaoyi::fansi::0.5.1"
+  val oslib = mvn"com.lihaoyi::os-lib:0.11.5"
+  val scalatags = mvn"com.lihaoyi::scalatags::0.13.1"
+  val fansi = mvn"com.lihaoyi::fansi::0.5.1"
 
 
 
-  val laminar = ivy"com.raquo::laminar::17.2.1"
-  val munit = ivy"org.scalameta::munit::1.1.1"
+  val laminar = mvn"com.raquo::laminar::17.2.1"
+  val munit = mvn"org.scalameta::munit::1.1.1"
   val scalaVersion = "3.7.2"
   val scalaJSVersion = "1.19.0"
 }
 
-//  mill --import ivy:com.lihaoyi::mill-contrib-bloop: mill.contrib.bloop.Bloop/install
+// mill __.compiledClassesAndSemanticDbFiles
 trait Common extends ScalaModule {
   def scalaVersion = Config.scalaVersion
 
-  override def ivyDeps = super.ivyDeps() ++ Agg(
+  override def mvnDeps = super.mvnDeps() ++ Seq(
     Config.scalatags,
     Config.oslib,
     Config.fansi
@@ -37,9 +38,9 @@ trait Common extends ScalaModule {
 
 trait CommonJS extends Common with ScalaJSModule {
   def scalaJSVersion = "1.19.0"
-  override def ivyDeps = super.ivyDeps() ++ Agg(
-    ivy"org.scala-js::scalajs-dom::2.8.1",
-    ivy"org.scala-js::scalajs-java-securerandom::1.0.0".withDottyCompat(scalaVersion()),
+  override def mvnDeps = super.mvnDeps() ++ Seq(
+    mvn"org.scala-js::scalajs-dom::2.8.1",
+    mvn"org.scala-js::scalajs-java-securerandom::1.0.0".withDottyCompat(scalaVersion()),
     Config.laminar
   )
 }
@@ -48,9 +49,9 @@ trait CommonJS extends Common with ScalaJSModule {
 trait PublishModule extends mill.scalalib.PublishModule {
   override def artifactName = "scautable"
 
-  override def publishVersion = T{ VcsVersion.vcsState().format() }
+  override def publishVersion = Task{ VcsVersion.vcsState().format() }
 
-  override def pomSettings = T {
+  override def pomSettings = Task {
     PomSettings(
       description = "Automatically generate html tables from scala case classes",
       organization = "io.github.quafadas",
@@ -68,7 +69,7 @@ trait PublishModule extends mill.scalalib.PublishModule {
 trait CommonTests extends TestModule.Munit {
 
   // override def testFramework = "munit.runner.Framework"
-  override def ivyDeps = super.ivyDeps() ++ Agg(
+  override def mvnDeps = super.mvnDeps() ++ Seq(
     Config.munit
   )
 }

build.mill

@@ -4,12 +4,12 @@ import mill._, scalalib._, mill.scalajslib._, mill.scalajslib.api._
 
 import build.Config
 
-object `package` extends RootModule with ScalaModule with build.ShareCompileResources {
+object `package` extends ScalaModule with build.ShareCompileResources {
   def scalaVersion = Config.scalaVersion
   override def moduleDeps = Seq(build.scautable.jvm)
 
-  override def ivyDeps = super.ivyDeps() ++ Agg(
-    ivy"io.github.quafadas::dedav4s::0.10.0-RC2"
+  override def mvnDeps = super.mvnDeps() ++ Seq(
+    mvn"io.github.quafadas::dedav4s::0.10.0-RC2"
   )
 
   /**

examples/package.mill

@@ -6,17 +6,17 @@ import mill.scalajslib._
 import mill.scalajslib.api._
 import build.Config
 
-object `package` extends RootModule {
+object `package` extends Module {
 
   trait SharedModule extends build.Common with PlatformScalaModule
 
   trait SharedTest extends SharedModule with TestModule.Munit with build.CommonTests
 
 
   object jvm extends SharedModule with ScalaModule with build.PublishModule {
-    override def ivyDeps= super.ivyDeps() ++ Agg(
-      ivy"org.apache.poi:poi:5.4.1",
-      ivy"org.apache.poi:poi-ooxml:5.4.1",
+    override def mvnDeps= super.mvnDeps() ++ Seq(
+      mvn"org.apache.poi:poi:5.4.1",
+      mvn"org.apache.poi:poi-ooxml:5.4.1",
     )
   }
 

scautable/package.mill

@@ -1,6 +1,6 @@
 package io.github.quafadas.scautable
 
-trait PlatformSpecific:
+private[scautable] trait PlatformSpecific:
 
   /** With scaladoc
     */

scautable/src-js/jsSpecific.scala

@@ -1,13 +1,13 @@
 package io.github.quafadas.scautable
 
 import java.awt.Desktop
-import io.github.quafadas.scautable.scautable.HtmlTableRender
+
 import NamedTuple.*
 // import almond.api.JupyterApi
 // import almond.interpreter.api.DisplayData
 // import almond.api.JupyterAPIHolder.value
 
-trait PlatformSpecific:
+private[scautable] trait PlatformSpecific:
 
   private def openBrowserWindow(uri: java.net.URI): Unit =
     if Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE) then Desktop.getDesktop().browse(uri)
@@ -32,9 +32,9 @@ trait PlatformSpecific:
       runtime.exec(Array[String](s"""xdg-open $uri]"""))
 
   inline def desktopShowNt[K <: Tuple, V <: Tuple](a: Seq[NamedTuple[K, V]])(using
-      tableDeriveInstance: HtmlTableRender[V]
+      tableDeriveInstance: HtmlRenderer.HtmlTableRender[V]
   ): os.Path =
-    val asString = scautable.nt(a).toString()
+    val asString = HtmlRenderer.nt(a).toString()
     val theHtml = raw"""
 <!DOCTYPE html>
   <html>
@@ -70,8 +70,8 @@ $$(document).ready( function () {
     *   \- summon a HtmlTableRender instance for the case class
     * @return
     */
-  inline def desktopShow[A <: Product](a: Seq[A])(using tableDeriveInstance: HtmlTableRender[A]) =
-    val asString = scautable(a).toString()
+  inline def desktopShow[A <: Product](a: Seq[A])(using tableDeriveInstance: HtmlRenderer.HtmlTableRender[A]) =
+    val asString = HtmlRenderer(a).toString()
     val theHtml = raw"""
 <!DOCTYPE html>
   <html>
@@ -101,6 +101,6 @@ $$(document).ready( function () {
 
   // def almondShow[A <: Product](a: Seq[A])(using tableDeriveInstance: HtmlTableRender[A]) =
   //   val kernel = summon[JupyterApi]
-  //   val asString = scautable(a).toString()
+  //   val asString = HtmlRenderer(a).toString()
   //   kernel.publish.html(asString)
 end PlatformSpecific