[DC-7958] - PR-Commenter Recommendations and update dependencies (#1262)

* [DC-7958] Update build.sbt config to fix the repeatedly, routes and unused imports

* [DC-7958] Update libraries' version

* [DC-7958] Remove deprecated ApplicationCrypto class and update Test configuration to fix warnings

* [DC-7958] Remove redundant dependencies that are coming from bootstrap

* [DC-7958] Update Play framework version

Author: tyagikumarvineet

app/uk/gov/hmrc/hmrcemailrenderer/config/ErrorHandler.scala

@@ -17,7 +17,6 @@
 package uk.gov.hmrc.hmrcemailrenderer.config
 
 import play.api.i18n.{ I18nSupport, MessagesApi }
-import play.api.mvc.Request
 import play.twirl.api.Html
 import uk.gov.hmrc.play.bootstrap.frontend.http.FrontendErrorHandler
 import preview.views.html.error_template

app/uk/gov/hmrc/hmrcemailrenderer/connectors/PreferencesConnector.scala

@@ -18,7 +18,8 @@ package uk.gov.hmrc.hmrcemailrenderer.connectors
 
 import com.google.inject.{ Inject, Singleton }
 import play.api.libs.json.{ Json, OFormat }
-import uk.gov.hmrc.crypto.{ ApplicationCrypto, PlainText }
+import uk.gov.hmrc.crypto.PlainText
+import uk.gov.hmrc.play.bootstrap.frontend.filters.crypto.ApplicationCrypto
 import uk.gov.hmrc.hmrcemailrenderer.model.Language
 import uk.gov.hmrc.http.HeaderCarrier
 import uk.gov.hmrc.http.client.HttpClientV2

build.sbt

@@ -4,15 +4,15 @@ import uk.gov.hmrc.versioning.SbtGitVersioning.autoImport.majorVersion
 val appName = "hmrc-email-renderer"
 
 ThisBuild / majorVersion := 3
-ThisBuild / scalaVersion := "3.4.2"
+ThisBuild / scalaVersion := "3.6.3"
 
 val appDependencies: Seq[ModuleID] = AppDependencies()
 
 lazy val playSettings: Seq[Setting[?]] = Seq.empty
 
 lazy val microservice = Project(appName, file("."))
   .enablePlugins(play.sbt.PlayScala, SbtDistributablesPlugin)
-  .disablePlugins(JUnitXmlReportPlugin) //Required to prevent https://github.com/scalatest/scalatest/issues/1427
+  .disablePlugins(JUnitXmlReportPlugin) // Required to prevent https://github.com/scalatest/scalatest/issues/1427
   .settings(playSettings *)
   .settings(scalaSettings *)
   .settings(defaultSettings() *)
@@ -21,17 +21,32 @@ lazy val microservice = Project(appName, file("."))
     retrieveManaged := true
   )
   .settings(routesGenerator := InjectedRoutesGenerator)
+  .settings(
+    scalacOptions := scalacOptions.value.diff(Seq("-Wunused:all")),
+    scalacOptions += "-language:implicitConversions",
+    scalacOptions ++= List(
+      "-Wconf:msg=Flag.*repeatedly:s",
+      "-Wconf:src=routes/.*:s",
+      "-Wconf:src=templates/.*:s",
+      "-Wconf:src=preview/.*:s"
+    )
+  )
   .settings(ScoverageSettings())
 
 lazy val it = Project(id = "it", base = file("it"))
   .enablePlugins(PlayScala, ScalafmtPlugin)
   .dependsOn(microservice % "test->test") // the "test->test" allows reusing test code and test dependencies
-  .settings(libraryDependencies ++= appDependencies ++ AppDependencies.it)
+  .settings(
+    libraryDependencies ++= appDependencies ++ AppDependencies.it,
+    scalacOptions ++= List("-Wconf:msg=Flag.*repeatedly:s")
+  )
+
+Test / scalacOptions ++= List("-Wconf:src=services/.*:s")
 
 Test / test := (Test / test)
   .dependsOn(scalafmtCheckAll)
   .value
 
 it / test := (it / Test / test)
-  .dependsOn(scalafmtCheckAll, it/scalafmtCheckAll)
+  .dependsOn(scalafmtCheckAll, it / scalafmtCheckAll)
   .value

project/AppDependencies.scala

@@ -2,29 +2,26 @@ import sbt.*
 import play.sbt.PlayImport.*
 
 private object AppDependencies {
-  private val bootstrapVersion = "9.19.0"
+  private val bootstrapVersion = "10.3.0"
 
   def apply(): Seq[ModuleID] = Seq(
     ws,
-    "uk.gov.hmrc"            %% "bootstrap-frontend-play-30"  % bootstrapVersion,
-    "uk.gov.hmrc"            %% "domain-play-30"              % "10.0.0",
-    "net.codingwell"         %% "scala-guice"                 % "6.0.0",
-    "org.jsoup"              %  "jsoup"                       % "1.13.1"         % Test,
-    "uk.gov.hmrc"            %% "bootstrap-test-play-30"      % bootstrapVersion % Test,
-    "org.scalatestplus.play" %% "scalatestplus-play"          % "7.0.1"          % Test,
-    "org.mockito"            %  "mockito-core"                % "4.7.0"          % Test,
-    "org.scalatestplus"      %% "mockito-4-11"                % "3.2.17.0"       % Test,
-    "com.github.tomakehurst" %  "wiremock"                    % "2.27.2"         % Test,
-    "com.vladsch.flexmark"   %  "flexmark-all"                % "0.35.10"        % Test
+    "uk.gov.hmrc"           %% "bootstrap-frontend-play-30" % bootstrapVersion,
+    "uk.gov.hmrc"           %% "domain-play-30"             % "13.0.0",
+    "net.codingwell"        %% "scala-guice"                % "6.0.0",
+    "org.jsoup"              % "jsoup"                      % "1.13.1"         % Test,
+    "uk.gov.hmrc"           %% "bootstrap-test-play-30"     % bootstrapVersion % Test,
+    "org.mockito"            % "mockito-core"               % "4.7.0"          % Test,
+    "com.github.tomakehurst" % "wiremock"                   % "2.27.2"         % Test
   )
 
-  val it = Seq(
-    "uk.gov.hmrc"            %% "bootstrap-test-play-30"      % bootstrapVersion % "it/test",
-    "org.scalatestplus.play" %% "scalatestplus-play"          % "7.0.1"          % "it/test",
-    "org.scalatestplus"      %% "mockito-4-11"                % "3.2.17.0"       % "it/test",
-    "org.pegdown"            %  "pegdown"                     % "1.6.0"          % "it/test",
-    "org.mockito"            %  "mockito-core"                % "4.7.0"          % "it/test",
-    "com.github.tomakehurst" %  "wiremock"                    % "2.27.2"         % "it/test",
-    "com.vladsch.flexmark"   %  "flexmark-all"                % "0.35.10"        % "it/test"
+  val it: Seq[ModuleID] = Seq(
+    "uk.gov.hmrc"            %% "bootstrap-test-play-30" % bootstrapVersion % "it/test",
+    "org.scalatestplus.play" %% "scalatestplus-play"     % "7.0.1"          % "it/test",
+    "org.scalatestplus"      %% "mockito-4-11"           % "3.2.17.0"       % "it/test",
+    "org.pegdown"             % "pegdown"                % "1.6.0"          % "it/test",
+    "org.mockito"             % "mockito-core"           % "4.7.0"          % "it/test",
+    "com.github.tomakehurst"  % "wiremock"               % "2.27.2"         % "it/test",
+    "com.vladsch.flexmark"    % "flexmark-all"           % "0.35.10"        % "it/test"
   )
 }

project/plugins.sbt

@@ -1,9 +1,10 @@
 resolvers += MavenRepository("HMRC-open-artefacts-maven2", "https://open.artefacts.tax.service.gov.uk/maven2")
 resolvers += Resolver.url("HMRC-open-artefacts-ivy", url("https://open.artefacts.tax.service.gov.uk/ivy2"))(
-  Resolver.ivyStylePatterns)
+  Resolver.ivyStylePatterns
+)
 
-addSbtPlugin("uk.gov.hmrc"               %  "sbt-auto-build"         % "3.24.0")
-addSbtPlugin("uk.gov.hmrc"               %  "sbt-distributables"     % "2.6.0")
-addSbtPlugin("org.playframework"         %  "sbt-plugin"             % "3.0.8")
-addSbtPlugin("org.scoverage"             %  "sbt-scoverage"          % "2.2.2")
-addSbtPlugin("org.scalameta"             %  "sbt-scalafmt"           % "2.5.2")
+addSbtPlugin("uk.gov.hmrc"       % "sbt-auto-build"     % "3.24.0")
+addSbtPlugin("uk.gov.hmrc"       % "sbt-distributables" % "2.6.0")
+addSbtPlugin("org.playframework" % "sbt-plugin"         % "3.0.9")
+addSbtPlugin("org.scoverage"     % "sbt-scoverage"      % "2.2.2")
+addSbtPlugin("org.scalameta"     % "sbt-scalafmt"       % "2.5.2")

test/uk/gov/hmrc/hmrcemailrenderer/connectors/PreferencesConnectorSpec.scala

@@ -19,15 +19,15 @@ package uk.gov.hmrc.hmrcemailrenderer.connectors
 import org.mockito.Mockito.*
 import org.mockito.ArgumentMatchers.any
 import org.scalatestplus.play.guice.GuiceOneAppPerSuite
-import uk.gov.hmrc.crypto.{ ApplicationCrypto, PlainText }
+import uk.gov.hmrc.crypto.PlainText
+import uk.gov.hmrc.play.bootstrap.frontend.filters.crypto.ApplicationCrypto
 import uk.gov.hmrc.hmrcemailrenderer.model.Language
-import uk.gov.hmrc.http.HeaderCarrier
+import uk.gov.hmrc.http.{ HeaderCarrier, HttpReads }
 import uk.gov.hmrc.http.client.HttpClientV2
 import uk.gov.hmrc.http.client.RequestBuilder
 import uk.gov.hmrc.play.bootstrap.config.ServicesConfig
 import org.scalatest.OptionValues
 
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.{ ExecutionContext, Future }
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.matchers.should.Matchers
@@ -41,29 +41,34 @@ class PreferencesConnectorSpec
 
     "return English if preference returns English" in new TestCase {
       when(httpClient.get(any)(any)).thenReturn(requestBuilder)
-      when(requestBuilder.execute(any, any))
+      when(requestBuilder.execute(using any[HttpReads[Language]], any[ExecutionContext]))
         .thenReturn(Future.successful(Language.English))
+
       preferencesConnector.languageByEmail(email).futureValue shouldBe (Language.English)
 
     }
 
     "return Welsh if preference returns Welsh" in new TestCase {
       when(httpClient.get(any)(any)).thenReturn(requestBuilder)
-      when(requestBuilder.execute(any, any)).thenReturn(Future.successful(Language.Welsh))
+      when(requestBuilder.execute(using any[HttpReads[Language]], any[ExecutionContext]))
+        .thenReturn(Future.successful(Language.Welsh))
+
       preferencesConnector.languageByEmail(email).futureValue shouldBe (Language.Welsh)
     }
   }
 
   trait TestCase {
     implicit val headerCarrier: HeaderCarrier = new HeaderCarrier()
+    implicit val ec: ExecutionContext = scala.concurrent.ExecutionContext.Implicits.global
+
+    val httpClient: HttpClientV2 = mock[HttpClientV2]
+    val requestBuilder: RequestBuilder = mock[RequestBuilder]
 
-    val httpClient = mock[HttpClientV2]
-    val requestBuilder = mock[RequestBuilder]
-    val crypto = app.injector.instanceOf[ApplicationCrypto]
-    val servicesConfig = app.injector.instanceOf[ServicesConfig]
+    val crypto: ApplicationCrypto = app.injector.instanceOf[ApplicationCrypto]
+    val servicesConfig: ServicesConfig = app.injector.instanceOf[ServicesConfig]
     val preferencesConnector = new PreferencesConnector(servicesConfig, httpClient, crypto)
     val email = "[email protected]"
     val encryptedEmail = new String(crypto.QueryParameterCrypto.encrypt(PlainText(email)).toBase64)
-    val url = servicesConfig.baseUrl("preferences") + s"/preferences/language/$encryptedEmail"
+    val url: String = servicesConfig.baseUrl("preferences") + s"/preferences/language/$encryptedEmail"
   }
 }