Merge branch 'main' into update/fs2-core-3.7.0

disneystreaming · Sep 27, 2023 · 2282b2b · 2282b2b
2 parents 3eba9ee + 8490991
commit 2282b2b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.11"
+version = "3.7.14"
 
 runner.dialect=scala213source3
 

diff --git a/build.sbt b/build.sbt
@@ -39,8 +39,7 @@ sonatypeCredentialHost := "s01.oss.sonatype.org"
 val Version = new {
   object CE3 {
     val fs2 = "3.7.0"
-
-    val ce  = "3.4.11"
+    val ce  = "3.5.1"
   }
 
   val expecty          = "0.16.0"

diff --git a/modules/core/src-scala-3/SourceLocationMacro.scala b/modules/core/src-scala-3/SourceLocationMacro.scala
@@ -4,6 +4,7 @@ package weaver
 // format: off
 
 import scala.quoted._
+import java.nio.file.Paths
 
 trait SourceLocationMacro {
   trait Here {
@@ -25,7 +26,7 @@ object macros {
 
     val position = Position.ofMacroExpansion
 
-    val psj = position.sourceFile.getJPath.get
+    val psj = position.sourceFile.getJPath.getOrElse(Paths.get(position.sourceFile.path))
     // Comparing roots to workaround a Windows-specific behaviour
     // https://github.com/disneystreaming/weaver-test/issues/364
     val rp = if(pwd.getRoot == psj.getRoot) Expr(pwd.relativize(psj).toString) else Expr(psj.toString)

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.6
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,15 +1,15 @@
 // format: off
-addSbtPlugin("ch.epfl.scala"        % "sbt-scalafix"                  % "0.11.0")
+addSbtPlugin("ch.epfl.scala"        % "sbt-scalafix"                  % "0.11.1")
 
-addSbtPlugin("org.scala-js"         % "sbt-scalajs"                   % "1.13.2")
+addSbtPlugin("org.scala-js"         % "sbt-scalajs"                   % "1.14.0")
 
-addSbtPlugin("org.scala-native"     % "sbt-scala-native"              % "0.4.14")
+addSbtPlugin("org.scala-native"     % "sbt-scala-native"              % "0.4.15")
 
 addSbtPlugin("com.eed3si9n"         % "sbt-projectmatrix"             % "0.9.1")
 
-addSbtPlugin("com.github.sbt"       % "sbt-ci-release"                % "1.5.11")
+addSbtPlugin("com.github.sbt"       % "sbt-ci-release"                % "1.5.12")
 
-addSbtPlugin("org.scalameta"        % "sbt-scalafmt"                  % "2.5.0")
+addSbtPlugin("org.scalameta"        % "sbt-scalafmt"                  % "2.5.2")
 
 addSbtPlugin("org.scalameta"        % "sbt-mdoc"                      % "2.3.7")