Merge pull request #327 from tpolecat/merge-with-master

merge with master

.github/workflows/build.yml

@@ -17,4 +17,4 @@ jobs:
             ~/.sbt
           key: sbt-${{ hashFiles('**/build.sbt') }}
       - name: Run tests
-        run: csbt headerCheck +clean evictionCheck +test
+        run: sbt headerCheck +clean evictionCheck +test

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: olafurpg/setup-scala@v10
       - uses: olafurpg/setup-gpg@v3
       - name: Publish
-        run: csbt ci-release
+        run: sbt ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}

build.sbt

@@ -1,12 +1,12 @@
 val scala212Version        = "2.12.12"
 val scala213Version        = "2.13.5"
-val scala30PreviousVersion = "3.0.0-RC1"
-val scala30Version         = "3.0.0-RC2"
+val scala30PreviousVersion = "3.0.0-RC2"
+val scala30Version         = "3.0.0-RC3"
 
 val collectionCompatVersion = "2.4.3"
 
-val catsVersion = "2.5.0"
-val catsEffectVersion = "3.0.1"
+val catsVersion = "2.6.0"
+val catsEffectVersion = "3.1.0"
 
 // We do `evictionCheck` in CI and don't sweat the Java deps for now.
 inThisBuild(Seq(
@@ -49,8 +49,8 @@ lazy val commonSettings = Seq(
 
   // Testing
   libraryDependencies ++= Seq(
-    "org.scalameta" %%% "munit"               % "0.7.23" % Test,
-    "org.typelevel" %%% "munit-cats-effect-2" % "1.0.1"  % Test,
+    "org.scalameta" %%% "munit"               % "0.7.25" % Test,
+    "org.typelevel" %%% "munit-cats-effect-2" % "1.0.2"  % Test,
   ),
   testFrameworks += new TestFramework("munit.Framework"),
 
@@ -61,16 +61,16 @@ lazy val commonSettings = Seq(
   Compile / doc     / scalacOptions --= Seq("-Xfatal-warnings"),
   Compile / doc     / scalacOptions ++= Seq(
     "-groups",
-    "-sourcepath", (baseDirectory in LocalRootProject).value.getAbsolutePath,
+    "-sourcepath", (LocalRootProject / baseDirectory).value.getAbsolutePath,
     "-doc-source-url", "https://github.com/tpolecat/natchez/blob/v" + version.value + "€{FILE_PATH}.scala"
   ),
   libraryDependencies ++= Seq(
     compilerPlugin("org.typelevel" %% "kind-projector" % "0.11.3" cross CrossVersion.full),
-  ).filterNot(_ => isDotty.value),
+  ).filterNot(_ => scalaVersion.value.startsWith("3.")),
 
   // Add some more source directories
-  unmanagedSourceDirectories in Compile ++= {
-    val sourceDir = (sourceDirectory in Compile).value
+  Compile / unmanagedSourceDirectories ++= {
+    val sourceDir = (Compile / sourceDirectory).value
     CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _))  => Seq(sourceDir / "scala-3")
       case Some((2, _))  => Seq(sourceDir / "scala-2")
@@ -79,8 +79,8 @@ lazy val commonSettings = Seq(
   },
 
   // Also for test
-  unmanagedSourceDirectories in Test ++= {
-    val sourceDir = (sourceDirectory in Test).value
+  Test / unmanagedSourceDirectories ++= {
+    val sourceDir = (Test / sourceDirectory).value
     CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _))  => Seq(sourceDir / "scala-3")
       case Some((2, _))  => Seq(sourceDir / "scala-2")
@@ -91,7 +91,7 @@ lazy val commonSettings = Seq(
   // dottydoc really doesn't work at all right now
   Compile / doc / sources := {
     val old = (Compile / doc / sources).value
-    if (isDotty.value)
+    if (scalaVersion.value.startsWith("3."))
       Seq()
     else
       old
@@ -105,13 +105,13 @@ publish / skip := true
 
 lazy val crossProjectSettings = Seq(
   Compile / unmanagedSourceDirectories ++= {
-    val major = if (isDotty.value) "-3" else "-2"
+    val major = if (scalaVersion.value.startsWith("3.")) "-3" else "-2"
     List(CrossType.Pure, CrossType.Full).flatMap(
       _.sharedSrcDir(baseDirectory.value, "main").toList.map(f => file(f.getPath + major)))
   },
 
   Test / unmanagedSourceDirectories ++= {
-    val major = if (isDotty.value) "-3" else "-2"
+    val major = if (scalaVersion.value.startsWith("3.")) "-3" else "-2"
     List(CrossType.Pure, CrossType.Full).flatMap(
       _.sharedSrcDir(baseDirectory.value, "test").toList.map(f => file(f.getPath + major)))
   },
@@ -135,7 +135,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
 lazy val coreJVM = core.jvm
 lazy val coreJS = core.js
   .settings(
-    scalaJSStage in Test := FastOptStage,
+    Test / scalaJSStage := FastOptStage,
     jsEnv := new org.scalajs.jsenv.nodejs.NodeJSEnv(),
     scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule)),
   )
@@ -150,7 +150,7 @@ lazy val jaeger = project
     description := "Jaeger support for Natchez.",
     libraryDependencies ++= Seq(
       "org.scala-lang.modules" %% "scala-collection-compat" % collectionCompatVersion,
-      "io.jaegertracing"        % "jaeger-client"           % "1.5.0",
+      "io.jaegertracing"        % "jaeger-client"           % "1.6.0",
     )
   )
 
@@ -191,7 +191,7 @@ lazy val lightstep = project
     description    := "Lightstep support for Natchez.",
     libraryDependencies ++= Seq(
       "org.scala-lang.modules" %% "scala-collection-compat" % collectionCompatVersion,
-      "com.lightstep.tracer"    % "lightstep-tracer-jre"    % "0.30.3"
+      "com.lightstep.tracer"    % "lightstep-tracer-jre"    % "0.30.5"
     )
   )
 
@@ -204,8 +204,8 @@ lazy val lightstepGrpc = project
     name        := "natchez-lightstep-grpc",
     description := "Lightstep gRPC bindings for Natchez.",
     libraryDependencies ++= Seq(
-      "com.lightstep.tracer" % "tracer-grpc"                     % "0.30.1",
-      "io.grpc"              % "grpc-netty"                      % "1.36.1",
+      "com.lightstep.tracer" % "tracer-grpc"                     % "0.30.3",
+      "io.grpc"              % "grpc-netty"                      % "1.37.0",
       "io.netty"             % "netty-tcnative-boringssl-static" % "2.0.38.Final"
     )
   )
@@ -219,7 +219,7 @@ lazy val lightstepHttp = project
     name        := "natchez-lightstep-http",
     description := "Lightstep HTTP bindings for Natchez.",
     libraryDependencies ++= Seq(
-      "com.lightstep.tracer" % "tracer-okhttp" % "0.30.1"
+      "com.lightstep.tracer" % "tracer-okhttp" % "0.30.3"
     )
   )
 
@@ -249,8 +249,8 @@ lazy val datadog = project
     description := "Datadog bindings for Natchez.",
     libraryDependencies ++= Seq(
       "org.scala-lang.modules" %% "scala-collection-compat" % collectionCompatVersion,
-      "com.datadoghq" % "dd-trace-ot"  % "0.77.0",
-      "com.datadoghq" % "dd-trace-api" % "0.77.0"
+      "com.datadoghq" % "dd-trace-ot"  % "0.78.3",
+      "com.datadoghq" % "dd-trace-api" % "0.78.3"
     )
   )
 
@@ -282,7 +282,7 @@ lazy val newrelic = project
   .enablePlugins(AutomateHeaderPlugin)
   .settings(commonSettings)
   .settings(
-    publish / skip := isDotty.value,
+    publish / skip := scalaVersion.value.startsWith("3."),
     name        := "newrelic",
     description := "Newrelic bindings for Natchez.",
     libraryDependencies ++= Seq(
@@ -291,7 +291,7 @@ lazy val newrelic = project
       "com.newrelic.telemetry" % "telemetry"                % "0.10.0",
       "com.newrelic.telemetry" % "telemetry-core"           % "0.12.0",
       "com.newrelic.telemetry" % "telemetry-http-okhttp"    % "0.12.0"
-    ).filterNot(_ => isDotty.value)
+    ).filterNot(_ => scalaVersion.value.startsWith("3."))
   )
 
 lazy val mtl = crossProject(JSPlatform, JVMPlatform)
@@ -302,14 +302,14 @@ lazy val mtl = crossProject(JSPlatform, JVMPlatform)
     name        := "natchez-mtl",
     description := "cats-mtl bindings for Natchez.",
     libraryDependencies ++= Seq(
-      "org.typelevel"          %%% "cats-mtl"    % "1.1.3",
+      "org.typelevel"          %%% "cats-mtl"    % "1.2.0",
     )
   )
 
 lazy val mtlJVM = mtl.jvm.dependsOn(coreJVM)
 lazy val mtlJS = mtl.js.dependsOn(coreJS)
   .settings(
-    scalaJSStage in Test := FastOptStage,
+    Test / scalaJSStage := FastOptStage,
     jsEnv := new org.scalajs.jsenv.nodejs.NodeJSEnv(),
     scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule)),
   )

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.9
+sbt.version=1.5.0

project/plugins.sbt

@@ -4,8 +4,7 @@ addSbtPlugin("com.lightbend.paradox"     % "sbt-paradox"              % "0.9.2")
 addSbtPlugin("com.typesafe.sbt"          % "sbt-site"                 % "1.4.1")
 addSbtPlugin("com.typesafe.sbt"          % "sbt-ghpages"              % "0.6.3")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"             % "0.1.17")
-addSbtPlugin("com.timushev.sbt"          % "sbt-updates"              % "0.5.2")
-addSbtPlugin("ch.epfl.lamp"              % "sbt-dotty"                % "0.5.4")
-addSbtPlugin("org.scala-js"              % "sbt-scalajs"              % "1.5.0")
+addSbtPlugin("com.timushev.sbt"          % "sbt-updates"              % "0.5.3")
+addSbtPlugin("org.scala-js"              % "sbt-scalajs"              % "1.5.1")
 addSbtPlugin("org.portable-scala"        % "sbt-scalajs-crossproject" % "1.0.0")
 addSbtPlugin("ch.epfl.scala"             % "sbt-eviction-rules"       % "1.0.0-RC1")

project/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.2")
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.3")