drop support for 2.12

CJSmith-0141 · Dec 22, 2023 · f329241 · f329241
1 parent 398bb95
commit f329241
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3, 2.13, 2.12]
+        scala: [3, 2.13]
         java: [temurin@17]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
@@ -119,16 +119,6 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12)
-        uses: actions/download-artifact@v3
-        with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
-
-      - name: Inflate target directories (2.12)
-        run: |
-          tar xf targets.tar
-          rm targets.tar
-
       - name: Import signing key
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
         env:

diff --git a/.mergify.yml b/.mergify.yml
@@ -12,7 +12,6 @@ pull_request_rules:
   - body~=labels:.*early-semver-patch
   - status-success=Build and Test (ubuntu-latest, 3, temurin@17)
   - status-success=Build and Test (ubuntu-latest, 2.13, temurin@17)
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@17)
   actions:
     merge: {}
 - name: Label core PRs

diff --git a/build.sbt b/build.sbt
@@ -1,8 +1,7 @@
 lazy val V = new {
-  val SCALA_2_12 = "2.12.18"
   val SCALA_2_13 = "2.13.12"
   val SCALA_3    = "3.3.1"
-  val Scalas     = Seq(SCALA_3, SCALA_2_13, SCALA_2_12)
+  val Scalas     = Seq(SCALA_3, SCALA_2_13)
 }
 
 ThisBuild / scalaVersion       := V.Scalas.head
@@ -30,7 +29,7 @@ ThisBuild / githubWorkflowBuild := Seq(
 )
 ThisBuild / tlJdkRelease                := Option(8)
 ThisBuild / githubWorkflowJavaVersions  := Seq(JavaSpec.temurin("17"))
-ThisBuild / githubWorkflowScalaVersions := Seq("3", "2.13", "2.12")
+ThisBuild / githubWorkflowScalaVersions := Seq("3", "2.13")
 ThisBuild / tlCiReleaseBranches         := Seq("main")
 ThisBuild / tlBaseVersion               := "0.6"
 ThisBuild / tlSonatypeUseLegacyHost     := false

diff --git a/core/src/main/scala-2/com/dwolla/security/crypto/package-platform.scala b/core/src/main/scala-2/com/dwolla/security/crypto/package-platform.scala
@@ -13,20 +13,23 @@ package object crypto {
   type ChunkSize = ChunkSize.Type
   object ChunkSize extends NewtypeWrapped[PosInt]
 
-  def attemptTagChunkSize(pi: Int): Either[String, ChunkSize] = refineV[Positive](pi).map(ChunkSize(_))
+  def attemptTagChunkSize(pi: Int): Either[String, ChunkSize] =
+    refineV[Positive](pi).map(ChunkSize(_))
 
-  val defaultChunkSize: ChunkSize = ChunkSize(4096)
+  val defaultChunkSize: ChunkSize                        = ChunkSize(4096)
   private[crypto] val objectIteratorChunkSize: ChunkSize = ChunkSize(1)
 
-  implicit class RefinedNewtypeOps[RNT](val refinedNewtype: RNT) extends AnyVal {
+  implicit class RefinedNewtypeOps[RNT](val refinedNewtype: RNT)
+      extends AnyVal {
     def unrefined[X, R[_, _], T, P](implicit
-                                    ex: HasExtractor.Aux[RNT, X],
-                                    x: X =:= R[T, P],
-                                    rt: RefType[R],
-                                   ): T = {
+        ex: HasExtractor.Aux[RNT, X],
+        x: X =:= R[T, P],
+        rt: RefType[R]
+    ): T = {
       rt.unwrap(x(ex.extract(refinedNewtype)))
     }
   }
 
-  private[crypto] implicit def SLogger[F[_] : Logger]: Logger[Stream[F, *]] = Logger[F].mapK(Stream.functionKInstance[F])
+  private[crypto] implicit def SLogger[F[_]: Logger]: Logger[Stream[F, *]] =
+    Logger[F].mapK(Stream.functionKInstance[F])
 }
diff --git a/project/BouncyCastlePlugin.scala b/project/BouncyCastlePlugin.scala
@@ -56,15 +56,6 @@ object BouncyCastlePlugin extends AutoPlugin {
         case Some((2, n)) if n >= 13 => "-Ymacro-annotations" :: Nil
         case _                       => Nil
       }
-    },
-    libraryDependencies ++= {
-      CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((2, n)) if n < 13 =>
-          compilerPlugin(
-            "org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full
-          ) :: Nil
-        case _ => Nil
-      }
     }
   )
 

diff --git a/testkit/src/main/scala-2/com/dwolla/testutils/PgpArbitrariesPlatform.scala b/testkit/src/main/scala-2/com/dwolla/testutils/PgpArbitrariesPlatform.scala
@@ -7,7 +7,7 @@ import eu.timepit.refined.predicates.all.*
 private[testutils] trait PgpArbitrariesPlatform { self: PgpArbitraries =>
   type KeySizePred = GreaterEqual[W.`384`.T]
 
-  protected val KeySize512: KeySize = 512
+  protected val KeySize512: KeySize  = 512
   protected val KeySize2048: KeySize = 2048
   protected val KeySize4096: KeySize = 4096
 }