cleanup

build.sbt

@@ -13,6 +13,10 @@ ThisBuild / organization         := "org.vastblue"
 ThisBuild / organizationName     := "vastblue.org"
 ThisBuild / organizationHomepage := Some(url("https://vastblue.org/"))
 
+//cancelable in Global := true
+
+parallelExecution := false
+
 ThisBuild / scmInfo := Some(
   ScmInfo(
     url("https://github.com/philwalk/pallet"),

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6

src/main/scala-2.13/vastblue/Info.scala

@@ -0,0 +1,7 @@
+package vastblue
+
+object Info {
+  lazy val scalaRuntimeVersion: String = {
+    scala.util.Properties.versionNumberString
+  }
+}

src/main/scala-2.13/vastblue/pathextend.scala

@@ -7,8 +7,6 @@ import java.io.{FileOutputStream, OutputStreamWriter}
 import java.security.{DigestInputStream, MessageDigest}
 import scala.jdk.CollectionConverters._
 import vastblue.Platform._
-import vastblue.time.FileTime
-import vastblue.time.FileTime._
 import vastblue.DriveRoot._
 
 // TODO: factor out code common to scala3 and scala2.13 versions
@@ -97,30 +95,9 @@ object pathextend {
     def pathFields                = p.iterator.asScala.toList
     def reversePath: String       = pathFields.reverse.mkString("/")
     def lastModified: Long        = p.toFile.lastModified
-    def lastModifiedTime          = whenModified(p.toFile)
-    def lastModSeconds: Double = {
-      secondsBetween(lastModifiedTime, now).toDouble
-    }
-    def lastModMinutes: Double = lastModSeconds / 60.0
-    def lastModHours: Double   = lastModMinutes / 60.0
-    def lastModDays: Double    = round(lastModHours / 24.0)
-    def weekDay: java.time.DayOfWeek = {
-      p.lastModifiedTime.getDayOfWeek
-    }
     def round(number: Double, scale: Int = 6): Double = {
       BigDecimal(number).setScale(scale, BigDecimal.RoundingMode.HALF_UP).toDouble
     }
-    def age: String = { // readable description of lastModified
-      if (lastModMinutes <= 60.0) {
-        "%1.2f minutes".format(lastModMinutes)
-      } else if (lastModHours <= 24.0) {
-        "%1.2f hours".format(lastModHours)
-      } else if (lastModDays <= 365.25) {
-        "%1.2f days".format(lastModDays)
-      } else {
-        "%1.2f years".format(lastModDays / 365.25)
-      }
-    }
 
     def files: Seq[JFile] = p.toFile match {
       case f if f.isDirectory => f.files
@@ -155,7 +132,6 @@ object pathextend {
     def contentAnyEncoding: String                    = p.toFile.contentAnyEncoding
     def bytes: Array[Byte]                            = JFiles.readAllBytes(p)
     def byteArray: Array[Byte]                        = bytes
-    def ageInDays: Double                             = FileTime.ageInDays(p.toFile)
 
     def trimmedLines: Seq[String] = linesCharset(DefaultCharset).map { _.trim }
     def trimmedSql: Seq[String] =
@@ -568,7 +544,7 @@ object pathextend {
     } else {
       val posix = if (str.drop(1).startsWith(":")) {
         val driveRoot = DriveRoot(str.take(2))
-        str.drop(2).string match {
+        str.drop(2) match {
           case "/" =>
             driveRoot.posix
           case pathstr if pathstr.startsWith("/") =>

src/main/scala-3/vastblue/DriveRoot.scala

@@ -4,13 +4,11 @@ import java.nio.file.{Path, Paths}
 import DriveRoot._
 import vastblue.Platform.cygdrive
 
-opaque type DriveRoot = String
-
 // DriveRoot Strings must match "" or "[A-Z]:"
 // The `toPath` method resolves path to root of disk,
 // rather than the one returned by `Paths.get("C:")`.
 object DriveRoot {
-  type DriveRoot = String
+  opaque type DriveRoot = String
 
   // empty string or uppercase "[A-Z]:"
   def apply(s: String): DriveRoot = {

src/main/scala-3/vastblue/Info.scala

@@ -0,0 +1,12 @@
+package vastblue
+
+object Info {
+  import java.io.FileInputStream
+  import java.util.jar.JarInputStream
+
+  lazy val scalaRuntimeVersion: String = {
+    val scala3LibJar = classOf[CanEqual[_, _]].getProtectionDomain.getCodeSource.getLocation.toURI.getPath
+    val manifest     = new JarInputStream(new FileInputStream(scala3LibJar)).getManifest
+    manifest.getMainAttributes.getValue("Implementation-Version")
+  }
+}

src/main/scala-3/vastblue/pathextend.scala

@@ -7,8 +7,6 @@ import java.io.{FileOutputStream, OutputStreamWriter}
 import java.security.{DigestInputStream, MessageDigest}
 import scala.jdk.CollectionConverters.*
 import vastblue.Platform.*
-import vastblue.time.FileTime
-import vastblue.time.FileTime.*
 import vastblue.DriveRoot.*
 
 // TODO: factor out code common to scala3 and scala2.13 versions
@@ -97,30 +95,9 @@ object pathextend {
     def pathFields                = p.iterator.asScala.toList
     def reversePath: String       = pathFields.reverse.mkString("/")
     def lastModified: Long        = p.toFile.lastModified
-    def lastModifiedTime          = whenModified(p.toFile)
-    def lastModSeconds: Double = {
-      secondsBetween(lastModifiedTime, now).toDouble
-    }
-    def lastModMinutes: Double = lastModSeconds / 60.0
-    def lastModHours: Double   = lastModMinutes / 60.0
-    def lastModDays: Double    = round(lastModHours / 24.0)
-    def weekDay: java.time.DayOfWeek = {
-      p.lastModifiedTime.getDayOfWeek
-    }
     def round(number: Double, scale: Int = 6): Double = {
       BigDecimal(number).setScale(scale, BigDecimal.RoundingMode.HALF_UP).toDouble
     }
-    def age: String = { // readable description of lastModified
-      if (lastModMinutes <= 60.0) {
-        "%1.2f minutes".format(lastModMinutes)
-      } else if (lastModHours <= 24.0) {
-        "%1.2f hours".format(lastModHours)
-      } else if (lastModDays <= 365.25) {
-        "%1.2f days".format(lastModDays)
-      } else {
-        "%1.2f years".format(lastModDays / 365.25)
-      }
-    }
 
     def files: Seq[JFile] = p.toFile match {
       case f if f.isDirectory => f.files
@@ -155,7 +132,6 @@ object pathextend {
     def contentAnyEncoding: String                    = p.toFile.contentAnyEncoding
     def bytes: Array[Byte]                            = JFiles.readAllBytes(p)
     def byteArray: Array[Byte]                        = bytes
-    def ageInDays: Double                             = FileTime.ageInDays(p.toFile)
 
     def trimmedLines: Seq[String] = linesCharset(DefaultCharset).map { _.trim }
     def trimmedSql: Seq[String] =
@@ -568,7 +544,7 @@ object pathextend {
     } else {
       val posix = if (str.drop(1).startsWith(":")) {
         val driveRoot = DriveRoot(str.take(2))
-        str.drop(2).string match {
+        str.drop(2) match {
           case "/" =>
             driveRoot.posix
           case pathstr if pathstr.startsWith("/") =>