Skip to content

Commit d24c0d8

Browse files
committed
upgrade scala3
1 parent 8467035 commit d24c0d8

File tree

8 files changed

+29
-8
lines changed

8 files changed

+29
-8
lines changed

build.sbt

+17-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import sbt.Keys.scalacOptions
2+
3+
import scala.collection.Seq
4+
15
def pureconfig = libraryDependencies ++= {
26
CrossVersion.partialVersion(scalaVersion.value) match {
37
case Some((3, _)) =>
@@ -628,12 +632,23 @@ lazy val site = project
628632
.settings(BuildSettings.common)
629633
.settings(BuildSettings.microsite)
630634
.settings(
631-
libraryDependencies += "org.scalameta" %% "mdoc" % "2.3.2" excludeAll (
635+
libraryDependencies += "org.scalameta" %% "mdoc" % "2.5.2" excludeAll (
632636
ExclusionRule(organization = "org.slf4j"),
633637
ExclusionRule(organization = "org.scala-lang.modules", name = "scala-collection-compat_2.13")
634638
),
635639
publish / skip := true,
636-
scalacOptions := scalacOptions.value.filterNot(_ == "-Xfatal-warnings").filterNot(_ == "-Xlint:infer-any")
640+
scalacOptions --= Seq(
641+
"-Xfatal-warnings",
642+
"-Xlint:infer-any",
643+
"-Wvalue-discard",
644+
"-Wnonunit-statement",
645+
"-Wunused:implicits",
646+
"-Wunused:explicits",
647+
"-Wunused:imports",
648+
"-Wunused:locals",
649+
"-Wunused:params",
650+
"-Wunused:privates"
651+
)
637652
)
638653

639654
lazy val sslConfig = project

http4s-server-micrometer/src/test/scala/com/avast/sst/http4s/server/micrometer/MicrometerHttp4sMetricsOpsModuleTest.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import org.http4s.{Method, Status}
66
import org.scalatest.funsuite.AnyFunSuite
77

88
import java.util.concurrent.{Executors, TimeUnit}
9-
9+
import scala.annotation.nowarn
1010
import scala.concurrent.ExecutionContext
1111

12+
@nowarn("msg=unused value")
1213
class MicrometerHttp4sMetricsOpsModuleTest extends AnyFunSuite {
1314

1415
test("http4s MetricsOps for Micrometer") {

http4s-server-micrometer/src/test/scala/com/avast/sst/http4s/server/micrometer/RouteMetricsTest.scala

+2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import org.http4s.Response
66
import org.scalatest.funsuite.AnyFunSuite
77

88
import java.util.concurrent.TimeUnit
9+
import scala.annotation.nowarn
910

11+
@nowarn("msg=unused value")
1012
class RouteMetricsTest extends AnyFunSuite {
1113

1214
test("Single route metrics") {

project/BuildSettings.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ object BuildSettings {
1515

1616
private val scala212 = "2.12.19"
1717
private val scala213 = "2.13.13"
18-
private val scala3 = "3.1.1"
18+
private val scala3 = "3.3.3"
1919

2020
lazy val common: Seq[Def.Setting[_]] = Seq(
2121
Global / onChangedBuildSource := ReloadOnSourceChanges,

pureconfig/src/main/scala/com/avast/sst/pureconfig/WithConfig.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.avast.sst.pureconfig
33
import com.typesafe.config.Config
44
import pureconfig.ConfigReader
55

6-
/** Used to retrieve both parsed configuration object and underlying [[Config]] instance. */
6+
/** Used to retrieve both parsed configuration object and underlying [[config]] instance. */
77
final case class WithConfig[T](value: T, config: Config)
88

99
object WithConfig {

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

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ import pureconfig.error.ConfigReaderException
77
import pureconfig.{ConfigReader, ConfigSource}
88
import pureconfig.generic.derivation.default.*
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-3/com/avast/sst/pureconfig/ToggleTest.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package com.avast.sst.pureconfig
33
import cats.{Applicative, Eq, FlatMap, Functor, Monad, Monoid}
44
import com.avast.sst.pureconfig.util.Toggle
55
import com.avast.sst.pureconfig.util.Toggle.{Disabled, Enabled}
6-
import com.avast.sst.pureconfig.util.Toggle.TogglePureConfigInstances.*
7-
import com.typesafe.config.ConfigRenderOptions
86
import org.scalatest.diagrams.Diagrams
97
import org.scalatest.funsuite.AnyFunSuite
108

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

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

sentry-pureconfig/src/main/scala-3/com/avast/sst/sentry/pureconfig/ConfigReaders.scala

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.avast.sst.sentry.pureconfig
33
import com.avast.sst.sentry.SentryConfig
44
import pureconfig.ConfigReader
55
import pureconfig.generic.derivation.default.*
6-
import pureconfig.generic.derivation.default.*
76

87
trait ConfigReaders {
98

0 commit comments

Comments
 (0)