Skip to content

Commit

Permalink
Drop support for scala 2.11 and 2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
tmccombs committed Oct 2, 2023
1 parent a754e1e commit 0a8cb15
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 23 deletions.
2 changes: 0 additions & 2 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,4 @@ rewrite.rules = [
SortImports,
]
runner.fatalWarnings = true
# old versions of scala don't support trailing commas
trailingCommas = never
newlines.afterCurlyLambdaParams = keep
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
http://lucidsoftware.github.io/relate/

[![Build Status](https://travis-ci.com/lucidsoftware/relate.svg)](https://travis-ci.com/lucidsoftware/relate)
[![Maven Version](https://img.shields.io/maven-central/v/com.lucidchart/relate_2.12.svg)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.lucidchart%22%20AND%20a%3A%22relate_2.12%22)
[![Maven Version](https://img.shields.io/maven-central/v/com.lucidchart/relate_2.13.svg)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.lucidchart%22%20AND%20a%3A%22relate_2.13%22)
[![Join the chat at https://gitter.im/lucidsoftware/relate](https://badges.gitter.im/lucidsoftware/relate.svg)](https://gitter.im/lucidsoftware/relate?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Relate is a lightweight, blazingly fast database access layer for Scala that abstracts the idiosyncricies of the JDBC while keeping complete control over the SQL.
Expand Down
18 changes: 6 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,26 +1,20 @@
import com.lucidchart.sbtcross.ProjectAggregateArgument.toArgument

lazy val macros = project.in(file("macros")).cross.dependsOn(relate)
lazy val `macros2.11` = macros("2.11.12")
lazy val `macros2.12` = macros("2.12.11")
lazy val `macros2.13` = macros("2.13.2")
lazy val macrosAggregate = macros.aggregate(`macros2.11`, `macros2.12`, `macros2.13`).settings(
lazy val `macros2.13` = macros("2.13.12")
lazy val macrosAggregate = macros.aggregate( `macros2.13`).settings(
publish / skip := true
)

lazy val relate = project.in(file("relate")).cross
lazy val `relate2.11` = relate("2.11.12")
lazy val `relate2.12` = relate("2.12.11")
lazy val `relate2.13` = relate("2.13.2")
lazy val relateAggregate = relate.aggregate(`relate2.11`, `relate2.12`, `relate2.13`).settings(
lazy val `relate2.13` = relate("2.13.12")
lazy val relateAggregate = relate.aggregate(`relate2.13`).settings(
publish / skip := true
)

lazy val postgres = project.in(file("postgres")).cross.dependsOn(relate)
lazy val `postgres2.11` = postgres("2.11.12")
lazy val `postgres2.12` = postgres("2.12.11")
lazy val `postgres2.13` = postgres("2.13.2")
lazy val postgresAggregate = postgres.aggregate(`postgres2.11`, `postgres2.12`, `postgres2.13`).settings(
lazy val `postgres2.13` = postgres("2.13.12")
lazy val postgresAggregate = postgres.aggregate(`postgres2.13`).settings(
publish / skip := true
)

Expand Down
5 changes: 0 additions & 5 deletions macros/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ libraryDependencies ++= Seq(
"org.specs2" %% "specs2-mock" % "4.6.0" % Test,
)

libraryDependencies ++= (CrossVersion.binaryScalaVersion(scalaVersion.value) match {
case "2.11" | "2.12" => Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full))
case _ => Seq.empty
})

moduleName := "relate-macros"

scalacOptions += "-language:experimental.macros"
Expand Down
3 changes: 0 additions & 3 deletions relate/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ libraryDependencies ++= Seq(
)

libraryDependencies ++= (CrossVersion.binaryScalaVersion(scalaVersion.value) match {
case "2.10" => Seq("com.typesafe.play" %% "anorm" % "2.4.0" % Benchmark)
case "2.11" => Seq("com.typesafe.play" %% "anorm" % "2.5.2" % Benchmark)
case "2.12" => Seq("com.typesafe.play" %% "anorm" % "2.6.0-M1" % Benchmark)
case "2.13" => Seq("org.playframework.anorm" %% "anorm" % "2.6.7" % Benchmark)
})

Expand Down

0 comments on commit 0a8cb15

Please sign in to comment.