mcc-1326235 compile fixes

Author: jdepassos-mdsol

build.sbt

@@ -128,7 +128,7 @@ lazy val `mauth-signer-http4s-022` = scalaModuleProject("mauth-signer-http4s-022
     libraryDependencies ++=
       Dependencies.provided(http4sClient022) ++
         Dependencies.compile(enumeratum) ++
-        Dependencies.test(munitCatsEffect2, http4sDsl022)
+        Dependencies.test(munitCatsEffect, http4sDsl022)
   )
 
 // A separate module to sign and send sttp request using akka-http backend

modules/mauth-authenticator-scala/src/test/scala/com/mdsol/mauth/MauthProtocolSuiteSpec.scala

@@ -24,7 +24,7 @@ class MauthProtocolSuiteSpec extends AnyFlatSpec with BeforeAndAfterAll with Mat
 
   behavior of "MauthProtocolSuiteSpec"
 
-  val signingConfig = ProtocolTestSuiteHelper.SIGNING_CONFIG
+  lazy val signingConfig: SigningConfig = ProtocolTestSuiteHelper.SIGNING_CONFIG
   if (signingConfig == null) {
     fail("Signing Configuration is not available.")
   }
@@ -33,13 +33,13 @@ class MauthProtocolSuiteSpec extends AnyFlatSpec with BeforeAndAfterAll with Mat
     fail("Public Key is not available.")
   }
 
-  val publicKey = MAuthKeysHelper.getPublicKeyFromString(ProtocolTestSuiteHelper.PUBLIC_KEY)
-  val uuid = UUID.fromString(signingConfig.getAppUuid)
-  val privateKey = getPrivateKeyFromString(signingConfig.getPrivateKey)
+  private val publicKey = MAuthKeysHelper.getPublicKeyFromString(ProtocolTestSuiteHelper.PUBLIC_KEY)
+  private val uuid = UUID.fromString(signingConfig.getAppUuid)
+  private val privateKey = getPrivateKeyFromString(signingConfig.getPrivateKey)
   val mAuthSigner = new DefaultSigner(uuid, privateKey, mockEpochTimeProvider, java.util.Arrays.asList(MAuthVersion.MWSV2))
 
   // run the tests
-  val testSpecifications = ProtocolTestSuiteHelper.TEST_SPECIFICATIONS
+  private val testSpecifications = ProtocolTestSuiteHelper.TEST_SPECIFICATIONS
   testSpecifications.foreach { testSpec =>
     testSpec.getType match {
       case CaseType.AUTHENTICATION_ONLY =>

modules/mauth-signer-akka-http/src/test/scala/com/mdsol/mauth/MAuthRequestAkkaSignerSpec.scala

@@ -14,7 +14,7 @@ import com.mdsol.mauth.http.Implicits._
 import com.mdsol.mauth.models.{UnsignedRequest => NewUnsignedRequest}
 import com.mdsol.mauth.test.utils.TestFixtures._
 import com.mdsol.mauth.util.EpochTimeProvider
-import org.apache.http.HttpStatus
+import org.apache.hc.core5.http.HttpStatus
 import org.bouncycastle.jce.provider.BouncyCastleProvider
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.concurrent.PatienceConfiguration.Timeout

modules/mauth-signer-http4s-022/src/main/scala/com/mdsol/mauth/http4s022/client/MAuthSigner.scala

@@ -6,11 +6,11 @@ import com.mdsol.mauth.RequestSigner
 import com.mdsol.mauth.models.UnsignedRequest
 import org.http4s.Request
 import org.http4s.client.Client
-
+import org.http4s.EntityDecoder.byteArrayDecoder
 import java.net.URI
 
 object MAuthSigner {
-  def apply[F[_]: Sync](signer: RequestSigner)(client: Client[F]): Client[F] =
+  def apply[F[_]: Concurrent](signer: RequestSigner)(client: Client[F]): Client[F] =
     Client { req =>
       for {
         req <- Resource.eval(req.as[Array[Byte]].flatMap { byteArray =>

project/BuildSettings.scala

@@ -26,7 +26,6 @@ object BuildSettings {
       "-Wconf:msg=.*(Uns|S)ignedRequest|signRequest|(decrypt|encrypt)Signature|" +
         "generateRequestHeaders|extract(MwsTime|MAuth)Header|" +
         "generateDigestedMessageV1|generateUnencryptedSignature:s",
-      "-Wnonunit-statement",
       "-Wconf:msg=type Seq in package scala has changed semantics:s",
       "-Wconf:msg=type IndexedSeq in package scala has changed semantics:s",
       "-Wconf:msg=constructor modifiers are assumed by synthetic:s",
@@ -35,8 +34,26 @@ object BuildSettings {
       "-Wconf:msg=which is not part of the implicit scope in Scala 3:s",
       "-Wconf:msg=Synthetic case companion used as a function.:s",
       "-Wconf:cat=deprecation:s"
-    ), // Stop these being errors, they are fine.
-    Test / scalacOptions -= "-Wnonunit-statement",
+    ) ++ (CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, n)) if n >= 13 =>
+        List(
+          "-Wnonunit-statement",
+          // other scalac options for 2.13+
+        )
+      case _ =>
+        List(
+        )
+    }), // Stop these being errors, they are fine.
+    Test / scalacOptions --= (CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, n)) if n >= 13 =>
+        List(
+          "-Wnonunit-statement",
+          // other scalac options for 2.13+
+        )
+      case _ =>
+        List(
+        )
+    }),
     scalacOptions --= {
       if (sys.env.contains("CI"))
         Seq.empty

project/Dependencies.scala

@@ -64,7 +64,6 @@ object Dependencies extends DependencyUtils {
   val scalaTest: ModuleID = "org.scalatest"             %% "scalatest"           % "3.2.19"
   val wiremock: ModuleID = "com.github.tomakehurst"      % "wiremock"            % "3.0.1"
   val munitCatsEffect: ModuleID = "org.typelevel"       %% "munit-cats-effect-3" % "1.0.7"
-  val munitCatsEffect2: ModuleID = "org.typelevel"      %% "munit-cats-effect-2" % "1.0.7"
   val log4catsNoop: ModuleID = "org.typelevel"          %% "log4cats-noop"       % Version.log4cats
   val scalaCacheCaffeine: ModuleID = "com.github.cb372" %% "scalacache-caffeine" % "1.0.0-M6"