Skip to content

Commit 93baab8

Browse files
authored
Merge pull request #1143 from scala-steward/update/sbt-1.10.0
Update sbt from 1.9.9 to 1.10.0
2 parents 66fb48a + 4ff3b83 commit 93baab8

File tree

8 files changed

+26
-12
lines changed

8 files changed

+26
-12
lines changed

fs2-kafka/src/test/scala-2/com/avast/sst/fs2kafka/Fs2KafkaModuleTest.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.avast.sst.fs2kafka
22

3-
import cats.effect.{IO, Resource}
4-
import cats.syntax.flatMap._
3+
import cats.effect.{ContextShift, IO, Resource, Timer}
4+
import cats.syntax.flatMap.*
55
import com.dimafeng.testcontainers.{ForAllTestContainer, KafkaContainer}
66
import fs2.kafka.{AutoOffsetReset, ProducerRecord, ProducerRecords}
77
import org.scalatest.funsuite.AsyncFunSuite
@@ -10,10 +10,10 @@ import scala.concurrent.ExecutionContext.Implicits.global
1010

1111
class Fs2KafkaModuleTest extends AsyncFunSuite with ForAllTestContainer {
1212

13-
override val container = KafkaContainer()
13+
override val container: KafkaContainer = KafkaContainer()
1414

15-
implicit private val cs = IO.contextShift(global)
16-
implicit private val timer = IO.timer(global)
15+
implicit private val cs: ContextShift[IO] = IO.contextShift(global)
16+
implicit private val timer: Timer[IO] = IO.timer(global)
1717

1818
test("producer") {
1919
val io = for {

fs2-kafka/src/test/scala-2/com/avast/sst/fs2kafka/KafkaConfigTest.scala

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ package com.avast.sst.fs2kafka
22

33
import org.scalatest.funsuite.AnyFunSuite
44

5+
import scala.annotation.nowarn
6+
7+
@nowarn("msg=unused value")
58
class KafkaConfigTest extends AnyFunSuite {
69

710
test("verify ConsumerConfig defaults") {

grpc-server/src/main/scala/com/avast/sst/grpc/server/interceptor/LoggingServerInterceptor.scala

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import io.grpc.ForwardingServerCallListener.SimpleForwardingServerCallListener
55
import io.grpc.*
66
import org.slf4j.Logger
77

8+
import scala.annotation.nowarn
9+
810
/** Adds basic logging around each gRPC call. */
911
class LoggingServerInterceptor(logger: Logger) extends ServerInterceptor {
1012

@@ -18,6 +20,7 @@ class LoggingServerInterceptor(logger: Logger) extends ServerInterceptor {
1820
new OnMessageServerCallListener(methodName, next.startCall(finalCall, headers))
1921
}
2022

23+
@nowarn("msg=a type was inferred to be `Object`")
2124
private class CloseServerCall[A, B](methodName: String, delegate: ServerCall[A, B]) extends SimpleForwardingServerCall[A, B](delegate) {
2225
override def close(status: Status, trailers: Metadata): Unit = {
2326
import io.grpc.Status

http4s-server/src/test/scala/com/avast/sst/http4s/server/middleware/CorrelationIdMiddlewareTest.scala

+2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ import org.scalatest.funsuite.AsyncFunSuite
1010
import org.typelevel.ci.CIString
1111

1212
import java.net.InetSocketAddress
13+
import scala.annotation.nowarn
1314
import scala.concurrent.ExecutionContext
1415

16+
@nowarn("msg=unused value")
1517
@SuppressWarnings(Array("scalafix:Disable.get", "scalafix:Disable.toString", "scalafix:Disable.createUnresolved"))
1618
class CorrelationIdMiddlewareTest extends AsyncFunSuite with Http4sDsl[IO] {
1719

project/BuildSettings.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object BuildSettings {
1414
private def isScala3(scalaVersion: String): Boolean = CrossVersion.partialVersion(scalaVersion).exists(_._1 == 3)
1515

1616
private val scala212 = "2.12.19"
17-
private val scala213 = "2.13.8"
17+
private val scala213 = "2.13.13"
1818
private val scala3 = "3.1.1"
1919

2020
lazy val common: Seq[Def.Setting[_]] = Seq(
@@ -47,11 +47,11 @@ object BuildSettings {
4747
Dependencies.scalafixScaluzzi,
4848
Dependencies.scalafixOrganizeImports
4949
),
50-
scalacOptions ++= {
50+
scalacOptions := {
5151
CrossVersion.partialVersion(scalaVersion.value) match {
52-
case Some((3, _)) => Seq("-source:future", "-language:adhocExtensions")
53-
case Some((2, _)) => Seq("-Xsource:3")
54-
case _ => Seq.empty
52+
case Some((3, _)) => scalacOptions.value ++ Seq("-source:future", "-language:adhocExtensions")
53+
case Some((2, _)) => scalacOptions.value.filterNot(_ == "-Xfatal-warnings") ++ Seq("-Xsource:3")
54+
case _ => scalacOptions.value
5555
}
5656
},
5757
Compile / doc / scalacOptions -= "-Xfatal-warnings",

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.0

pureconfig/src/test/scala-2/com/avast/sst/pureconfig/PureConfigModuleTest.scala

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ import cats.data.NonEmptyList
44
import cats.effect.SyncIO
55
import org.scalatest.funsuite.AnyFunSuite
66
import pureconfig.error.ConfigReaderException
7-
import pureconfig.generic.semiauto._
7+
import pureconfig.generic.semiauto.*
88
import pureconfig.{ConfigReader, ConfigSource}
99

10+
import scala.annotation.nowarn
11+
12+
@nowarn("msg=unused value")
1013
class PureConfigModuleTest extends AnyFunSuite {
1114

1215
private val source = ConfigSource.string("""|number = 123

pureconfig/src/test/scala-2/com/avast/sst/pureconfig/ToggleTest.scala

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ import com.avast.sst.pureconfig.util.Toggle.{Disabled, Enabled}
66
import org.scalatest.diagrams.Diagrams
77
import org.scalatest.funsuite.AnyFunSuite
88

9+
import scala.annotation.nowarn
10+
11+
@nowarn("msg=unused value")
912
class ToggleTest extends AnyFunSuite with Diagrams {
1013

1114
test("has Functor instance and map method works correctly") {

0 commit comments

Comments
 (0)