From e5109e7dd6ecb340dfb317504710f3e88fdc580b Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 8 Oct 2024 10:01:51 +0200 Subject: [PATCH 1/2] Latest sbt (cherry picked from commit 30fae856c0ac52abe1291bdc9d9b6c140b9cca6b) --- project/build.properties | 2 +- samples/compile-timeDI/project/build.properties | 2 +- samples/runtimeDI/project/build.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/build.properties b/project/build.properties index ee4c672..0b699c3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 +sbt.version=1.10.2 diff --git a/samples/compile-timeDI/project/build.properties b/samples/compile-timeDI/project/build.properties index ee4c672..0b699c3 100644 --- a/samples/compile-timeDI/project/build.properties +++ b/samples/compile-timeDI/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 +sbt.version=1.10.2 diff --git a/samples/runtimeDI/project/build.properties b/samples/runtimeDI/project/build.properties index ee4c672..0b699c3 100644 --- a/samples/runtimeDI/project/build.properties +++ b/samples/runtimeDI/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 +sbt.version=1.10.2 From d2e076a33b06c65e93c6ad238a270ad35cfaeb87 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 8 Oct 2024 10:03:25 +0200 Subject: [PATCH 2/2] Latest Scala versions (cherry picked from commit 78b48ff0ec2020219c4c0243e627b5d2befe777a) --- project/Dependencies.scala | 4 ++-- samples/compile-timeDI/build.sbt | 4 ++-- samples/runtimeDI/build.sbt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 48e2b79..e36be10 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,8 +2,8 @@ import sbt._ object Dependencies { // scalaVersion needs to be kept in sync with ci - val Scala213 = "2.13.14" - val Scala3 = "3.3.3" + val Scala213 = "2.13.15" + val Scala3 = "3.3.4" val ScalaVersions = Seq(Scala213, Scala3) val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.5")) diff --git a/samples/compile-timeDI/build.sbt b/samples/compile-timeDI/build.sbt index 7849fa7..1b4f30f 100644 --- a/samples/compile-timeDI/build.sbt +++ b/samples/compile-timeDI/build.sbt @@ -7,9 +7,9 @@ ThisBuild / dynverVTagPrefix := false ThisBuild / dynverSonatypeSnapshots := true -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" -crossScalaVersions := Seq("2.13.14", "3.3.3") +crossScalaVersions := Seq("2.13.15", "3.3.4") libraryDependencies ++= Seq( "com.typesafe.play" %% "play-mailer" % version.value, diff --git a/samples/runtimeDI/build.sbt b/samples/runtimeDI/build.sbt index 0401aea..56ba7f8 100644 --- a/samples/runtimeDI/build.sbt +++ b/samples/runtimeDI/build.sbt @@ -7,9 +7,9 @@ ThisBuild / dynverVTagPrefix := false ThisBuild / dynverSonatypeSnapshots := true -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" -crossScalaVersions := Seq("2.13.14", "3.3.3") +crossScalaVersions := Seq("2.13.15", "3.3.4") libraryDependencies ++= Seq( "com.typesafe.play" %% "play-mailer-guice" % version.value,