BDOG-3112 Drops Scala 2.12

hmrc · May 14, 2024 · cb43e70 · cb43e70
1 parent dfdfd49
commit cb43e70
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -167,6 +167,10 @@ val optValue: Option[T] = decrypter.reads(encryptedValue).asOpt.map(_.decryptedV
 
 ## Changes
 
+### Version 8.0.0
+
+Built for Scala 3 and Scala 2.13 - drops Scala 2.12.
+
 ### Version 7.6.0
 
 Adds support for Play 2.9 and Play 3.0

diff --git a/build.sbt b/build.sbt
@@ -1,15 +1,10 @@
-val scala2_12 = "2.12.18"
 val scala2_13 = "2.13.12"
 val scala3    = "3.3.3"
 
-ThisBuild / majorVersion     := 7
+ThisBuild / majorVersion     := 8
 ThisBuild / scalaVersion     := scala2_13
 ThisBuild / isPublicArtefact := true
-ThisBuild / scalacOptions    ++= Seq("-feature") ++
-                                 (CrossVersion.partialVersion(scalaVersion.value) match {
-                                   case Some((3, _ )) => Seq("-explain")
-                                   case _             => Seq.empty
-                                 })
+ThisBuild / scalacOptions    ++= Seq("-feature")
 
 lazy val library = Project("library", file("."))
   .settings(publish / skip := true)
@@ -22,7 +17,7 @@ lazy val library = Project("library", file("."))
 
 lazy val crypto = Project("crypto", file("crypto"))
   .settings(
-    crossScalaVersions := Seq(scala2_12, scala2_13, scala3),
+    crossScalaVersions := Seq(scala2_13, scala3),
     libraryDependencies ++= LibDependencies.cryptoCompile ++ LibDependencies.cryptoTest
   )
 
@@ -35,7 +30,7 @@ def shareSources(location: String) = Seq(
 
 lazy val cryptoJsonPlay28 = Project("crypto-json-play-28", file("crypto-json-play-28"))
   .settings(
-    crossScalaVersions := Seq(scala2_12, scala2_13),
+    crossScalaVersions := Seq(scala2_13),
     shareSources("crypto-json"),
     libraryDependencies ++= LibDependencies.cryptoJsonPlay28Compile ++ LibDependencies.cryptoTest
   ).dependsOn(crypto)

diff --git a/crypto/src/main/scala/uk/gov/hmrc/crypto/AesCrypto.scala b/crypto/src/main/scala/uk/gov/hmrc/crypto/AesCrypto.scala
@@ -38,7 +38,6 @@ trait AesCrypto extends Encrypter with Decrypter {
     plain match {
       case PlainBytes(bytes) => Crypted(encrypter.encrypt(bytes))
       case PlainText(text)   => Crypted(encrypter.encrypt(text))
-      case _                 => throw new Exception(s"Unable to encrypt unkown message type: $plain")
     }
 
   override def decrypt(encrypted: Crypted): PlainText =

diff --git a/crypto/src/main/scala/uk/gov/hmrc/crypto/AesGCMCrypto.scala b/crypto/src/main/scala/uk/gov/hmrc/crypto/AesGCMCrypto.scala
@@ -40,7 +40,6 @@ trait AesGCMCrypto extends Encrypter with Decrypter {
     plain match {
       case PlainBytes(bytes) => Crypted(fromEncryptedValue(crypto.encrypt(bytes        , emptyAssociatedData)))
       case PlainText(text)   => Crypted(fromEncryptedValue(crypto.encrypt(text.getBytes, emptyAssociatedData)))
-      case _                 => throw new RuntimeException(s"Unable to encrypt unknown message type: $plain")
     }
 
   private def fromEncryptedValue(ev: EncryptedBytes): String = {

diff --git a/crypto/src/main/scala/uk/gov/hmrc/crypto/CompositeSymmetricCrypto.scala b/crypto/src/main/scala/uk/gov/hmrc/crypto/CompositeSymmetricCrypto.scala
@@ -35,7 +35,7 @@ trait CompositeSymmetricCrypto extends Encrypter with Decrypter {
     decrypt(d => Try(d.decryptAsBytes(scrambled)))
 
   private def decrypt[T <: PlainContent](tryDecryption: Decrypter => Try[T]): T = {
-    val decrypterStream = (currentCrypto +: previousCryptos).toStream
+    val decrypterStream = (currentCrypto +: previousCryptos).to(LazyList)
 
     val message =
       decrypterStream

diff --git a/crypto/src/main/scala/uk/gov/hmrc/crypto/SymmetricCryptoFactory.scala b/crypto/src/main/scala/uk/gov/hmrc/crypto/SymmetricCryptoFactory.scala
@@ -37,7 +37,7 @@ object SymmetricCryptoFactory {
         decrypt(d => Try(d.decryptAsBytes(scrambled)))
 
       private def decrypt[T <: PlainContent](tryDecryption: Decrypter => Try[T]): T = {
-        val decrypterStream = (currentCrypto +: previousDecrypters).toStream
+        val decrypterStream = (currentCrypto +: previousDecrypters).to(LazyList)
         decrypterStream
           .map(tryDecryption)
           .collectFirst { case Success(msg) => msg }
@@ -95,7 +95,7 @@ object SymmetricCryptoFactory {
         currentCrypto.encrypt(valueToEncrypt, associatedText)
 
       override def decrypt(valueToDecrypt: EncryptedValue, associatedText: String): String = {
-        val decrypterStream = (currentCrypto +: previousDecrypters).toStream
+        val decrypterStream = (currentCrypto +: previousDecrypters).to(LazyList)
         decrypterStream
           .map(crypter => Try(crypter.decrypt(valueToDecrypt, associatedText)))
           .collectFirst { case Success(msg) => msg }

diff --git a/crypto/src/main/scala/uk/gov/hmrc/crypto/ValueFinder.scala b/crypto/src/main/scala/uk/gov/hmrc/crypto/ValueFinder.scala
@@ -17,7 +17,7 @@
 package uk.gov.hmrc.crypto
 
 import com.typesafe.config.Config
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import scala.util.Try
 

diff --git a/crypto/src/test/scala/uk/gov/hmrc/crypto/ApplicationCryptoSpec.scala b/crypto/src/test/scala/uk/gov/hmrc/crypto/ApplicationCryptoSpec.scala
@@ -20,7 +20,7 @@ import com.typesafe.config.ConfigFactory
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class ApplicationCryptoSpec extends AnyWordSpecLike with Matchers {
 

diff --git a/crypto/src/test/scala/uk/gov/hmrc/crypto/CompositeOneWayCryptoSpec.scala b/crypto/src/test/scala/uk/gov/hmrc/crypto/CompositeOneWayCryptoSpec.scala
@@ -22,7 +22,7 @@ import org.scalatest.wordspec.AnyWordSpecLike
 import org.scalatestplus.mockito.MockitoSugar
 
 import java.util.Base64
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 @annotation.nowarn("msg=deprecated")
 class CompositeOneWayCryptoSpec extends AnyWordSpecLike with Matchers with MockitoSugar {

diff --git a/crypto/src/test/scala/uk/gov/hmrc/crypto/CryptoGCMWithKeysFromConfigSpec.scala b/crypto/src/test/scala/uk/gov/hmrc/crypto/CryptoGCMWithKeysFromConfigSpec.scala
@@ -23,7 +23,7 @@ import org.scalatestplus.mockito.MockitoSugar
 
 import java.security.SecureRandom
 import java.util.Base64
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 @annotation.nowarn("msg=deprecated")
 class CryptoGCMWithKeysFromConfigSpec extends AnyWordSpecLike with Matchers with MockitoSugar {

diff --git a/crypto/src/test/scala/uk/gov/hmrc/crypto/CryptoWithKeysFromConfigSpec.scala b/crypto/src/test/scala/uk/gov/hmrc/crypto/CryptoWithKeysFromConfigSpec.scala
@@ -22,7 +22,7 @@ import org.scalatest.wordspec.AnyWordSpecLike
 import org.scalatestplus.mockito.MockitoSugar
 
 import java.util.Base64
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 @annotation.nowarn("msg=deprecated")
 class CryptoWithKeysFromConfigSpec extends AnyWordSpecLike with Matchers with MockitoSugar {

diff --git a/project/LibDependencies.scala b/project/LibDependencies.scala
@@ -15,14 +15,14 @@ object LibDependencies {
   )
 
   val cryptoJsonPlay28Compile = Seq(
-    "com.typesafe.play" %% "play-json" % "2.8.1" // version provided by Play 2.8
+    "com.typesafe.play" %% "play-json" % "2.8.2" // version provided by Play 2.8
   )
 
   val cryptoJsonPlay29Compile = Seq(
-    "com.typesafe.play" %% "play-json" % "2.10.2" // version provided by Play 2.9
+    "com.typesafe.play" %% "play-json" % "2.10.5" // version provided by Play 2.9
   )
 
   val cryptoJsonPlay30Compile = Seq(
-    "org.playframework" %% "play-json" % "3.0.2" // version provided by Play 3.0
+    "org.playframework" %% "play-json" % "3.0.3" // version provided by Play 3.0
   )
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.9.9