Skip to content

Commit

Permalink
Drop Akka 2.4, default to scala 2.13
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvanoosten committed Aug 13, 2023
1 parent 2d24819 commit 4ea48fb
Showing 1 changed file with 2 additions and 20 deletions.
22 changes: 2 additions & 20 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import sbt.librarymanagement.{CrossVersion, ModuleID}

lazy val commonSettings = Seq(
organization := "nl.grons",
scalaVersion := "2.12.17",
scalaVersion := "2.13.10",
crossVersion := CrossVersion.binary,
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.2.16" % Test,
Expand Down Expand Up @@ -38,7 +38,7 @@ lazy val commonSettings = Seq(
ThisBuild / publishTo := sonatypePublishTo.value

lazy val root = (project in file("."))
.aggregate(metricsScala, metricsScalaHdr, metricsAkka24, metricsAkka25, metricsAkka26)
.aggregate(metricsScala, metricsScalaHdr, metricsAkka25, metricsAkka26)
.settings(
crossScalaVersions := Nil,
publishArtifact := false,
Expand Down Expand Up @@ -110,24 +110,6 @@ lazy val metricsAkka25 = (project in file("metrics-akka-25"))
mimaPreviousArtifacts := mimaPrevious(scalaVersion.value)
)

lazy val metricsAkka24 = (project in file("metrics-akka-24"))
.dependsOn(metricsScala)
.settings(
commonSettings,
crossScalaVersions := Seq("2.12.17", "2.11.12"),
name := "metrics4-akka_a24",
description := "metrics-scala for Akka 2.4 and 2.5 and Scala " + CrossVersion.binaryScalaVersion(scalaVersion.value),
libraryDependencies ++= Seq(
// Stay on Akka 2.4 to guarantee backward compatibility:
// scala-steward:off
"com.typesafe.akka" %% "akka-actor" % "2.4.20",
"com.typesafe.akka" %% "akka-testkit" % "2.4.20" % Test
// scala-steward:on
),
sourceDirectory := baseDirectory.value.getParentFile / "metrics-akka" / "src",
mimaPreviousArtifacts := mimaPrevious(scalaVersion.value)
)

// 2.11.x are the only pre-2.12 scala versions that are used in this build
def before212(scalaVersion: String): Boolean = scalaVersion.startsWith("2.11.")

Expand Down

0 comments on commit 4ea48fb

Please sign in to comment.