Merge pull request #1143 from scala-steward/update/sbt-1.10.0

Update sbt from 1.9.9 to 1.10.0
avast · May 27, 2024 · 93baab8 · 93baab8
2 parents 66fb48a + 4ff3b83
commit 93baab8
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 12 deletions.
diff --git a/fs2-kafka/src/test/scala-2/com/avast/sst/fs2kafka/Fs2KafkaModuleTest.scala b/fs2-kafka/src/test/scala-2/com/avast/sst/fs2kafka/Fs2KafkaModuleTest.scala
@@ -1,7 +1,7 @@
 package com.avast.sst.fs2kafka
 
-import cats.effect.{IO, Resource}
-import cats.syntax.flatMap._
+import cats.effect.{ContextShift, IO, Resource, Timer}
+import cats.syntax.flatMap.*
 import com.dimafeng.testcontainers.{ForAllTestContainer, KafkaContainer}
 import fs2.kafka.{AutoOffsetReset, ProducerRecord, ProducerRecords}
 import org.scalatest.funsuite.AsyncFunSuite
@@ -10,10 +10,10 @@ import scala.concurrent.ExecutionContext.Implicits.global
 
 class Fs2KafkaModuleTest extends AsyncFunSuite with ForAllTestContainer {
 
-  override val container = KafkaContainer()
+  override val container: KafkaContainer = KafkaContainer()
 
-  implicit private val cs = IO.contextShift(global)
-  implicit private val timer = IO.timer(global)
+  implicit private val cs: ContextShift[IO] = IO.contextShift(global)
+  implicit private val timer: Timer[IO] = IO.timer(global)
 
   test("producer") {
     val io = for {

diff --git a/fs2-kafka/src/test/scala-2/com/avast/sst/fs2kafka/KafkaConfigTest.scala b/fs2-kafka/src/test/scala-2/com/avast/sst/fs2kafka/KafkaConfigTest.scala
@@ -2,6 +2,9 @@ package com.avast.sst.fs2kafka
 
 import org.scalatest.funsuite.AnyFunSuite
 
+import scala.annotation.nowarn
+
+@nowarn("msg=unused value")
 class KafkaConfigTest extends AnyFunSuite {
 
   test("verify ConsumerConfig defaults") {

diff --git a/...erver/src/main/scala/com/avast/sst/grpc/server/interceptor/LoggingServerInterceptor.scala b/...erver/src/main/scala/com/avast/sst/grpc/server/interceptor/LoggingServerInterceptor.scala
@@ -5,6 +5,8 @@ import io.grpc.ForwardingServerCallListener.SimpleForwardingServerCallListener
 import io.grpc.*
 import org.slf4j.Logger
 
+import scala.annotation.nowarn
+
 /** Adds basic logging around each gRPC call. */
 class LoggingServerInterceptor(logger: Logger) extends ServerInterceptor {
 
@@ -18,6 +20,7 @@ class LoggingServerInterceptor(logger: Logger) extends ServerInterceptor {
     new OnMessageServerCallListener(methodName, next.startCall(finalCall, headers))
   }
 
+  @nowarn("msg=a type was inferred to be `Object`")
   private class CloseServerCall[A, B](methodName: String, delegate: ServerCall[A, B]) extends SimpleForwardingServerCall[A, B](delegate) {
     override def close(status: Status, trailers: Metadata): Unit = {
       import io.grpc.Status

diff --git a/...r/src/test/scala/com/avast/sst/http4s/server/middleware/CorrelationIdMiddlewareTest.scala b/...r/src/test/scala/com/avast/sst/http4s/server/middleware/CorrelationIdMiddlewareTest.scala
@@ -10,8 +10,10 @@ import org.scalatest.funsuite.AsyncFunSuite
 import org.typelevel.ci.CIString
 
 import java.net.InetSocketAddress
+import scala.annotation.nowarn
 import scala.concurrent.ExecutionContext
 
+@nowarn("msg=unused value")
 @SuppressWarnings(Array("scalafix:Disable.get", "scalafix:Disable.toString", "scalafix:Disable.createUnresolved"))
 class CorrelationIdMiddlewareTest extends AsyncFunSuite with Http4sDsl[IO] {
 

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -14,7 +14,7 @@ object BuildSettings {
   private def isScala3(scalaVersion: String): Boolean = CrossVersion.partialVersion(scalaVersion).exists(_._1 == 3)
 
   private val scala212 = "2.12.19"
-  private val scala213 = "2.13.8"
+  private val scala213 = "2.13.13"
   private val scala3 = "3.1.1"
 
   lazy val common: Seq[Def.Setting[_]] = Seq(
@@ -47,11 +47,11 @@ object BuildSettings {
       Dependencies.scalafixScaluzzi,
       Dependencies.scalafixOrganizeImports
     ),
-    scalacOptions ++= {
+    scalacOptions := {
       CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((3, _)) => Seq("-source:future", "-language:adhocExtensions")
-        case Some((2, _)) => Seq("-Xsource:3")
-        case _            => Seq.empty
+        case Some((3, _)) => scalacOptions.value ++ Seq("-source:future", "-language:adhocExtensions")
+        case Some((2, _)) => scalacOptions.value.filterNot(_ == "-Xfatal-warnings") ++ Seq("-Xsource:3")
+        case _            => scalacOptions.value
       }
     },
     Compile / doc / scalacOptions -= "-Xfatal-warnings",

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.0
diff --git a/pureconfig/src/test/scala-2/com/avast/sst/pureconfig/PureConfigModuleTest.scala b/pureconfig/src/test/scala-2/com/avast/sst/pureconfig/PureConfigModuleTest.scala
@@ -4,9 +4,12 @@ import cats.data.NonEmptyList
 import cats.effect.SyncIO
 import org.scalatest.funsuite.AnyFunSuite
 import pureconfig.error.ConfigReaderException
-import pureconfig.generic.semiauto._
+import pureconfig.generic.semiauto.*
 import pureconfig.{ConfigReader, ConfigSource}
 
+import scala.annotation.nowarn
+
+@nowarn("msg=unused value")
 class PureConfigModuleTest extends AnyFunSuite {
 
   private val source = ConfigSource.string("""|number = 123

diff --git a/pureconfig/src/test/scala-2/com/avast/sst/pureconfig/ToggleTest.scala b/pureconfig/src/test/scala-2/com/avast/sst/pureconfig/ToggleTest.scala
@@ -6,6 +6,9 @@ import com.avast.sst.pureconfig.util.Toggle.{Disabled, Enabled}
 import org.scalatest.diagrams.Diagrams
 import org.scalatest.funsuite.AnyFunSuite
 
+import scala.annotation.nowarn
+
+@nowarn("msg=unused value")
 class ToggleTest extends AnyFunSuite with Diagrams {
 
   test("has Functor instance and map method works correctly") {