From 51bf9b2bc9a7932cb72ad03d135ea22f854e65ec Mon Sep 17 00:00:00 2001 From: Frederick Roth Date: Wed, 26 Feb 2025 16:26:36 +0100 Subject: [PATCH 1/2] Update dependencies Updates scala and all dependencies Removed support for scala 2.11 as it has reached EOL in 2016 --- build.sbt | 17 ++++++++--------- project/build.properties | 2 +- project/plugins.sbt | 12 ++++++------ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/build.sbt b/build.sbt index 94a7f9b..a1a5268 100644 --- a/build.sbt +++ b/build.sbt @@ -2,10 +2,9 @@ import ReleaseTransformations._ ThisBuild / organization := "com.github.dwickern" -lazy val scala3 = "3.0.2" -lazy val scala213 = "2.13.7" -lazy val scala212 = "2.12.15" -lazy val scala211 = "2.11.12" +lazy val scala3 = "3.6.3" +lazy val scala213 = "2.13.16" +lazy val scala212 = "2.12.20" lazy val root = project.in(file(".")) .aggregate(nameof.projectRefs: _*) @@ -27,20 +26,20 @@ lazy val nameof = (projectMatrix in file(".")) releaseCrossBuild := true, ideSkipProject := true, libraryDependencies ++= Seq( - "org.scalatest" %% "scalatest" % "3.2.10" % Test, - "javax.annotation" % "javax.annotation-api" % "1.3.1" % Test, + "org.scalatest" %% "scalatest" % "3.2.19" % Test, + "javax.annotation" % "javax.annotation-api" % "1.3.2" % Test, ), ) .jvmPlatform(scalaVersions = Seq(scala3), Seq( libraryDependencies ++= Seq( - "org.typelevel" %% "shapeless3-test" % "3.0.4" % Test, + "org.typelevel" %% "shapeless3-test" % "3.4.3" % Test, ) )) - .jvmPlatform(scalaVersions = Seq(scala213, scala212, scala211), Seq( + .jvmPlatform(scalaVersions = Seq(scala213, scala212), Seq( libraryDependencies ++= Seq( "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided, "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided, - "com.chuusai" %% "shapeless" % "2.3.7" % Test, + "com.chuusai" %% "shapeless" % "2.3.12" % Test, ), )) diff --git a/project/build.properties b/project/build.properties index 8378cad..49214c4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.5.7 +sbt.version = 1.9.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index ac09d80..e2e3b88 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,8 @@ logLevel := Level.Warn -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") -addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") -addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.0") -addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.23" ) +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") +addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0") +addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.2") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.4" ) From 1c4bd8cbb9eb0842ce191cae3bd7d6775e9b309c Mon Sep 17 00:00:00 2001 From: Frederick Roth Date: Thu, 27 Feb 2025 07:31:50 +0100 Subject: [PATCH 2/2] Use correct Scala LTS version --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a1a5268..24ffd50 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ import ReleaseTransformations._ ThisBuild / organization := "com.github.dwickern" -lazy val scala3 = "3.6.3" +lazy val scala3 = "3.3.5" lazy val scala213 = "2.13.16" lazy val scala212 = "2.12.20"