Merge pull request #1149 from Karry/update/micrometer-core-1.10.13-sc…

…ala3 Update micrometer-core, ... from 1.10.3 to 1.10.13
avast · May 28, 2024 · 8721c98 · 8721c98
2 parents 93baab8 + 237c240
commit 8721c98
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 16 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,3 +1,7 @@
+import sbt.Keys.scalacOptions
+
+import scala.collection.Seq
+
 def pureconfig = libraryDependencies ++= {
   CrossVersion.partialVersion(scalaVersion.value) match {
     case Some((3, _)) =>
@@ -628,12 +632,23 @@ lazy val site = project
   .settings(BuildSettings.common)
   .settings(BuildSettings.microsite)
   .settings(
-    libraryDependencies += "org.scalameta" %% "mdoc" % "2.3.2" excludeAll (
+    libraryDependencies += "org.scalameta" %% "mdoc" % "2.5.2" excludeAll (
       ExclusionRule(organization = "org.slf4j"),
       ExclusionRule(organization = "org.scala-lang.modules", name = "scala-collection-compat_2.13")
     ),
     publish / skip := true,
-    scalacOptions := scalacOptions.value.filterNot(_ == "-Xfatal-warnings").filterNot(_ == "-Xlint:infer-any")
+    scalacOptions --= Seq(
+      "-Xfatal-warnings",
+      "-Xlint:infer-any",
+      "-Wvalue-discard",
+      "-Wnonunit-statement",
+      "-Wunused:implicits",
+      "-Wunused:explicits",
+      "-Wunused:imports",
+      "-Wunused:locals",
+      "-Wunused:params",
+      "-Wunused:privates"
+    )
   )
 
 lazy val sslConfig = project

diff --git a/...t/scala/com/avast/sst/http4s/server/micrometer/MicrometerHttp4sMetricsOpsModuleTest.scala b/...t/scala/com/avast/sst/http4s/server/micrometer/MicrometerHttp4sMetricsOpsModuleTest.scala
@@ -6,9 +6,10 @@ import org.http4s.{Method, Status}
 import org.scalatest.funsuite.AnyFunSuite
 
 import java.util.concurrent.{Executors, TimeUnit}
-
+import scala.annotation.nowarn
 import scala.concurrent.ExecutionContext
 
+@nowarn("msg=unused value")
 class MicrometerHttp4sMetricsOpsModuleTest extends AnyFunSuite {
 
   test("http4s MetricsOps for Micrometer") {

diff --git a/...r-micrometer/src/test/scala/com/avast/sst/http4s/server/micrometer/RouteMetricsTest.scala b/...r-micrometer/src/test/scala/com/avast/sst/http4s/server/micrometer/RouteMetricsTest.scala
@@ -6,7 +6,9 @@ import org.http4s.Response
 import org.scalatest.funsuite.AnyFunSuite
 
 import java.util.concurrent.TimeUnit
+import scala.annotation.nowarn
 
+@nowarn("msg=unused value")
 class RouteMetricsTest extends AnyFunSuite {
 
   test("Single route metrics") {

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -15,7 +15,7 @@ object BuildSettings {
 
   private val scala212 = "2.12.19"
   private val scala213 = "2.13.13"
-  private val scala3 = "3.1.1"
+  private val scala3 = "3.3.3"
 
   lazy val common: Seq[Def.Setting[_]] = Seq(
     Global / onChangedBuildSource := ReloadOnSourceChanges,
@@ -31,7 +31,7 @@ object BuildSettings {
     description := "Functional programming toolkit for building server applications in Scala.",
     licenses := Seq("MIT" -> url("https://raw.githubusercontent.com/avast/scala-server-toolkit/master/LICENSE")),
     developers := List(Developer("jakubjanecek", "Jakub Janecek", "janecek@avast.com", url("https://www.avast.com"))),
-    scalaVersion := scala3,
+    scalaVersion := scala213,
     crossScalaVersions := List(scala213, scala212, scala3),
     fork := true,
     libraryDependencies ++= (if (!isScala3(scalaVersion.value)) List(compilerPlugin(Dependencies.kindProjector)) else List.empty) ++ List(
@@ -48,8 +48,9 @@ object BuildSettings {
       Dependencies.scalafixOrganizeImports
     ),
     scalacOptions := {
+      // TODO: solve compilation warnings on Scala 3
       CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((3, _)) => scalacOptions.value ++ Seq("-source:future", "-language:adhocExtensions")
+        case Some((3, _)) => scalacOptions.value.filterNot(_ == "-Xfatal-warnings") ++ Seq("-source:future", "-language:adhocExtensions")
         case Some((2, _)) => scalacOptions.value.filterNot(_ == "-Xfatal-warnings") ++ Seq("-Xsource:3")
         case _            => scalacOptions.value
       }

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -51,10 +51,10 @@ object Dependencies {
     val doobie = "0.13.4"
     val grpc = "1.64.0"
     val http4s = "0.22.14"
-    val micrometerCore = "1.10.3"
-    val micrometerJmx = "1.10.3"
-    val micrometerStatsD = "1.10.3"
-    val micrometerPrometheus = "1.10.3"
+    val micrometerCore = "1.10.13"
+    val micrometerJmx = "1.10.13"
+    val micrometerStatsD = "1.10.13"
+    val micrometerPrometheus = "1.10.13"
     val monix = "3.4.1"
     val pureConfig = "0.17.1"
 

diff --git a/pureconfig/src/main/scala/com/avast/sst/pureconfig/WithConfig.scala b/pureconfig/src/main/scala/com/avast/sst/pureconfig/WithConfig.scala
@@ -3,7 +3,7 @@ package com.avast.sst.pureconfig
 import com.typesafe.config.Config
 import pureconfig.ConfigReader
 
-/** Used to retrieve both parsed configuration object and underlying [[Config]] instance. */
+/** Used to retrieve both parsed configuration object and underlying [[config]] instance. */
 final case class WithConfig[T](value: T, config: Config)
 
 object WithConfig {

diff --git a/pureconfig/src/test/scala-3/com/avast/sst/pureconfig/PureConfigModuleTest.scala b/pureconfig/src/test/scala-3/com/avast/sst/pureconfig/PureConfigModuleTest.scala
@@ -7,6 +7,9 @@ import pureconfig.error.ConfigReaderException
 import pureconfig.{ConfigReader, ConfigSource}
 import pureconfig.generic.derivation.default.*
 
+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-3/com/avast/sst/pureconfig/ToggleTest.scala b/pureconfig/src/test/scala-3/com/avast/sst/pureconfig/ToggleTest.scala
@@ -3,11 +3,12 @@ package com.avast.sst.pureconfig
 import cats.{Applicative, Eq, FlatMap, Functor, Monad, Monoid}
 import com.avast.sst.pureconfig.util.Toggle
 import com.avast.sst.pureconfig.util.Toggle.{Disabled, Enabled}
-import com.avast.sst.pureconfig.util.Toggle.TogglePureConfigInstances.*
-import com.typesafe.config.ConfigRenderOptions
 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") {

diff --git a/sentry-pureconfig/src/main/scala-3/com/avast/sst/sentry/pureconfig/ConfigReaders.scala b/sentry-pureconfig/src/main/scala-3/com/avast/sst/sentry/pureconfig/ConfigReaders.scala
@@ -3,7 +3,6 @@ package com.avast.sst.sentry.pureconfig
 import com.avast.sst.sentry.SentryConfig
 import pureconfig.ConfigReader
 import pureconfig.generic.derivation.default.*
-import pureconfig.generic.derivation.default.*
 
 trait ConfigReaders {
 

diff --git a/site/docs/subprojects/pureconfig.md b/site/docs/subprojects/pureconfig.md
@@ -56,11 +56,11 @@ import com.avast.sst.pureconfig.PureConfigModule
 import pureconfig.ConfigReader
 import zio.interop.catz.*
 import zio.Task
-import pureconfig.generic.derivation.default.*
+import pureconfig.generic.semiauto._
 
 final case class ServerConfiguration(listenAddress: String, listenPort: Int)
 
-implicit val serverConfigurationReader: ConfigReader[ServerConfiguration] = ConfigReader.derived
+implicit val serverConfigurationReader: ConfigReader[ServerConfiguration] = deriveReader[ServerConfiguration]
 
 val maybeConfiguration = PureConfigModule.make[Task, ServerConfiguration]
 ```