Merge pull request #80 from Quafadas/columns

fix column order

Author: Quafadas

.scalafmt.conf

@@ -10,5 +10,4 @@ runner.dialectOverride.allowSignificantIndentation = true
 rewrite.scala3.countEndMarkerLines = lastBlockOnly
 rewrite.scala3.insertEndMarkerMinLines = 1
 indent.main = 2
-maxColumn = 180
-project.excludeFilters = [ ".*.mill"]
+maxColumn = 180

build.mill

@@ -5,26 +5,24 @@
 
 package build
 
-import mill._, mill.scalalib._, mill.scalajslib._
-import mill._, scalalib._, publish._
+import mill.*, mill.scalalib.*, mill.scalajslib.*
+import mill.*, scalalib.*, publish.*
 
 import mill.util.VcsVersion
 
-object Config {
+object Config:
   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 = 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"
-}
+end Config
 
 // mill __.compiledClassesAndSemanticDbFiles
-trait Common extends ScalaModule {
+trait Common extends ScalaModule:
   def scalaVersion = Config.scalaVersion
 
   override def mvnDeps = super.mvnDeps() ++ Seq(
@@ -33,23 +31,21 @@ trait Common extends ScalaModule {
     Config.fansi
   )
   override def scalacOptions: T[Seq[String]] = super.scalacOptions() ++ Seq("-Xmax-inlines", "128")
-}
-
+end Common
 
-trait CommonJS extends Common with ScalaJSModule {
+trait CommonJS extends Common with ScalaJSModule:
   def scalaJSVersion = "1.19.0"
   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
   )
-}
+end CommonJS
 
-
-trait PublishModule extends mill.scalalib.PublishModule {
+trait PublishModule extends mill.scalalib.PublishModule:
   override def artifactName = "scautable"
 
-  override def publishVersion = Task{ VcsVersion.vcsState().format() }
+  override def publishVersion = Task(VcsVersion.vcsState().format())
 
   override def pomSettings = Task {
     PomSettings(
@@ -63,17 +59,16 @@ trait PublishModule extends mill.scalalib.PublishModule {
       )
     )
   }
+end PublishModule
 
-}
-
-trait CommonTests extends TestModule.Munit {
+trait CommonTests extends TestModule.Munit:
 
   // override def testFramework = "munit.runner.Framework"
   override def mvnDeps = super.mvnDeps() ++ Seq(
     Config.munit
   )
-}
+end CommonTests
 
-trait ShareCompileResources extends ScalaModule {
+trait ShareCompileResources extends ScalaModule:
   override def compileResources = super.compileResources() ++ resources()
-}
+end ShareCompileResources

examples/package.mill

@@ -1,34 +1,29 @@
 package build.examples
 
-import mill._, scalalib._, mill.scalajslib._, mill.scalajslib.api._
+import mill.*, scalalib.*, mill.scalajslib.*, mill.scalajslib.api.*
 
 import build.Config
 
-object `package` extends ScalaModule with build.ShareCompileResources {
+object `package` extends ScalaModule with build.ShareCompileResources:
   def scalaVersion = Config.scalaVersion
   override def moduleDeps = Seq(build.scautable.jvm)
 
   override def mvnDeps = super.mvnDeps() ++ Seq(
     mvn"io.github.quafadas::dedav4s::0.10.0-RC2"
   )
 
-  /**
-    *
-    */
-  object vizserver extends ScalaModule{
+  /** */
+  object vizserver extends ScalaModule:
     def scalaVersion = Config.scalaVersion
     def moduleDeps = Seq(build.examples)
 
-    /**
-      * This attempts to leave some logging behind, to tell vscode to port forward to 8085. If it doesn't work, you can port forwrad manually.
+    /** This attempts to leave some logging behind, to tell vscode to port forward to 8085. If it doesn't work, you can port forwrad manually.
       *
       * @return
       */
-    def mainClass = Task{
+    def mainClass = Task {
       println("Starting vizserver...on https://localhost:8085/")
       Some("viz.websockets.serve")
     }
-
-  }
-
-}
+  end vizserver
+end `package`

scautable/package.mill

@@ -1,35 +1,33 @@
 package build.scautable
 
-import mill._
-import mill.scalalib._
-import mill.scalajslib._
-import mill.scalajslib.api._
+import mill.*
+import mill.scalalib.*
+import mill.scalajslib.*
+import mill.scalajslib.api.*
 import build.Config
 
-object `package` extends Module {
+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 mvnDeps= super.mvnDeps() ++ Seq(
+  object jvm extends SharedModule with ScalaModule with build.PublishModule:
+    override def mvnDeps = super.mvnDeps() ++ Seq(
       mvn"org.apache.poi:poi:5.4.1",
-      mvn"org.apache.poi:poi-ooxml:5.4.1",
+      mvn"org.apache.poi:poi-ooxml:5.4.1"
     )
-  }
+  end jvm
 
   object js extends SharedModule with build.CommonJS with build.PublishModule
 
-  object test extends Module {
-    object js extends SharedTest with build.CommonJS with TestScalaJSModule {
-      override def moduleDeps: Seq[JavaModule]  = Seq(build.scautable.js)
-    }
+  object test extends Module:
+    object js extends SharedTest with build.CommonJS with TestScalaJSModule:
+      override def moduleDeps: Seq[JavaModule] = Seq(build.scautable.js)
+    end js
 
-    object jvm extends SharedTest with build.ShareCompileResources {
+    object jvm extends SharedTest with build.ShareCompileResources:
       override def moduleDeps = Seq(build.scautable.jvm)
-    }
-  }
-
-}
+    end jvm
+  end test
+end `package`