Merge pull request #274 from tpolecat/rc1

Scala 3.0.0-RC1
typelevel · Feb 23, 2021 · bf8e112 · bf8e112
2 parents 60a933c + 40a383f
commit bf8e112
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,11 +1,11 @@
 
 val scala212Version        = "2.12.12"
 val scala213Version        = "2.13.4"
-val scala30PreviousVersion = "3.0.0-M2"
-val scala30Version         = "3.0.0-M3"
+val scala30PreviousVersion = "3.0.0-M3"
+val scala30Version         = "3.0.0-RC1"
 
-val catsVersion = "2.3.1"
-val catsEffectVersion = "2.3.1"
+val catsVersion = "2.4.2"
+val catsEffectVersion = "2.3.3"
 
 // Global Settings
 lazy val commonSettings = Seq(
@@ -129,7 +129,7 @@ lazy val jaeger = project
     name        := "natchez-jaeger",
     description := "Jaeger support for Natchez.",
     libraryDependencies ++= Seq(
-      "org.scala-lang.modules" %% "scala-collection-compat" % (if (scalaVersion.value == "3.0.0-M2") "2.3.1" else "2.3.2"),
+      "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2",
       "io.jaegertracing"        % "jaeger-client"           % "1.5.0",
     )
   )
@@ -143,7 +143,7 @@ lazy val honeycomb = project
     name        := "natchez-honeycomb",
     description := "Honeycomb support for Natchez.",
     libraryDependencies ++= Seq(
-      "org.scala-lang.modules" %% "scala-collection-compat" % (if (scalaVersion.value == "3.0.0-M2") "2.3.1" else "2.3.2"),
+      "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2",
       "io.honeycomb.libhoney"   % "libhoney-java"           % "1.3.1"
     )
   )
@@ -170,7 +170,7 @@ lazy val lightstep = project
     name           := "natchez-lightstep",
     description    := "Lightstep support for Natchez.",
     libraryDependencies ++= Seq(
-      "org.scala-lang.modules" %% "scala-collection-compat" % (if (scalaVersion.value == "3.0.0-M2") "2.3.1" else "2.3.2"),
+      "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2",
       "com.lightstep.tracer"    % "lightstep-tracer-jre"    % "0.30.3"
     )
   )
@@ -212,7 +212,7 @@ lazy val datadog = project
     name        := "natchez-datadog",
     description := "Lightstep HTTP bindings for Natchez.",
     libraryDependencies ++= Seq(
-      "org.scala-lang.modules" %% "scala-collection-compat" % (if (scalaVersion.value == "3.0.0-M2") "2.3.1" else "2.3.2"),
+      "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2",
       "com.datadoghq" % "dd-trace-ot"  % "0.72.0",
       "com.datadoghq" % "dd-trace-api" % "0.72.0"
     )
@@ -251,7 +251,7 @@ lazy val newrelic = project
     description := "Newrelic bindings for Natchez.",
     libraryDependencies ++= Seq(
       "io.circe"               %% "circe-core"              % "0.13.0",
-      "org.scala-lang.modules" %% "scala-collection-compat" % (if (scalaVersion.value == "3.0.0-M2") "2.3.1" else "2.3.2"),
+      "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2",
       "com.newrelic.telemetry" % "telemetry"                % "0.10.0",
       "com.newrelic.telemetry" % "telemetry-core"           % "0.11.0",
       "com.newrelic.telemetry" % "telemetry-http-okhttp"    % "0.11.0"
@@ -266,7 +266,7 @@ lazy val mtl = crossProject(JSPlatform, JVMPlatform)
     name        := "natchez-mtl",
     description := "cats-mtl bindings for Natchez.",
     libraryDependencies ++= Seq(
-      "org.typelevel"          %%% "cats-mtl"    % "1.1.1",
+      "org.typelevel"          %%% "cats-mtl"    % "1.1.2",
     )
   )
 
@@ -299,7 +299,7 @@ lazy val mock = project
     description := "Mock Open Tracing implementation",
     libraryDependencies ++= Seq(
       "io.opentracing" % "opentracing-mock" % "0.33.0",
-      "org.scala-lang.modules" %% "scala-collection-compat" % (if (scalaVersion.value == "3.0.0-M2") "2.3.1" else "2.3.2"),
+      "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2"
     ))
 
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,5 +6,5 @@ addSbtPlugin("com.typesafe.sbt"          % "sbt-ghpages"              % "0.6.3")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"             % "0.1.16")
 addSbtPlugin("com.timushev.sbt"          % "sbt-updates"              % "0.5.1")
 addSbtPlugin("ch.epfl.lamp"              % "sbt-dotty"                % "0.5.3")
-addSbtPlugin("org.scala-js"              % "sbt-scalajs"              % "1.4.0")
+addSbtPlugin("org.scala-js"              % "sbt-scalajs"              % "1.5.0")
 addSbtPlugin("org.portable-scala"        % "sbt-scalajs-crossproject" % "1.0.0")