no longer support 2.12

phelps-sg · Mar 3, 2024 · 03d63d5 · 03d63d5
1 parent 40773bf
commit 03d63d5
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 32 deletions.
diff --git a/.github/workflows/continouos-integration.yml b/.github/workflows/continouos-integration.yml
@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        scala: [ '2.12.19', '2.13.13' ]
+        scala: [ '2.13.13' ]
 
     steps:
       - uses: actions/checkout@v3
@@ -70,7 +70,7 @@ jobs:
       matrix:
         distribution: [ 'corretto' ]
         jdk: [ '11' ]
-        scala: [ '2.12.19', '2.13.13' ]
+        scala: [ '2.13.13' ]
         experimental: [ false ]
         include:
           - jdk: '17'

diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,4 @@
 import Common._
-import Dependencies.Version.scala212
 import Dependencies.Version.scala213
 
 name := """play-hmac-signatures"""
@@ -9,7 +8,7 @@ enablePlugins(Common, Dependencies)
 inThisBuild(
   List(
     scalaVersion := scala213,
-    crossScalaVersions := Seq(scala212, scala213),
+    crossScalaVersions := Seq(scala213),
     scalafixScalaBinaryVersion := "2.13",
     versionScheme := Some("early-semver"),
     semanticdbEnabled := true,

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -5,7 +5,6 @@ import sbt.plugins.JvmPlugin
 object Dependencies extends AutoPlugin {
 
   object Version {
-    val scala212 = "2.12.19"
     val scala213 = "2.13.13"
 
     val play = "2.9.2"

diff --git a/src/main/scala/com/mesonomics/playhmacsignatures/SignatureVerifyAction.scala b/src/main/scala/com/mesonomics/playhmacsignatures/SignatureVerifyAction.scala
@@ -146,10 +146,9 @@ abstract class SignatureVerifyAction(
     )(_, _, _)
 
   protected def getTimestamp[A](request: Request[A]): Option[EpochSeconds] = {
-    import Utils.LongStringScala212
     for {
       timestampStr <- request.headers.get(headerKeyTimestamp)
-      t <- timestampStr.toLongOpt
+      t <- timestampStr.toLongOption
     } yield EpochSeconds(t)
   }
 

diff --git a/src/main/scala/com/mesonomics/playhmacsignatures/Utils.scala b/src/main/scala/com/mesonomics/playhmacsignatures/Utils.scala