From 4af07a56a329c938bd45506d323cebee872af9e6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 12 Jul 2022 00:24:25 +0000 Subject: [PATCH 1/3] Update sbt, scripted-plugin to 1.7.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index c8fcab5..5b12c1d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.7.0 From 9ac9e0f6e5abb97ae65ac65e6acbb8c489a0bea3 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 12 Jul 2022 09:41:46 +0200 Subject: [PATCH 2/3] Update build.properties --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 5b12c1d..22af262 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.0 +sbt.version=1.7.1 From 142dc5ec537edd5a6286ce51ac01f070c1572abf Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 12 Jul 2022 09:45:06 +0200 Subject: [PATCH 3/3] Update more versions --- .github/workflows/build-test.yml | 2 +- src/main/scala/interplay/PlaySbtBuildBase.scala | 2 +- src/main/scala/interplay/Versions.scala | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 701c47f..25036be 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -18,7 +18,7 @@ jobs: uses: playframework/.github/.github/workflows/cmd.yml@v2 with: java: 11, 8 - scala: 2.12.15 + scala: 2.12.16 env: | BUILD_REASON=IndividualCI PGP_SECRET=foo diff --git a/src/main/scala/interplay/PlaySbtBuildBase.scala b/src/main/scala/interplay/PlaySbtBuildBase.scala index a805384..47af8a8 100644 --- a/src/main/scala/interplay/PlaySbtBuildBase.scala +++ b/src/main/scala/interplay/PlaySbtBuildBase.scala @@ -11,7 +11,7 @@ private[interplay] object PlaySbtBuildBase extends AutoPlugin { override def projectSettings = Seq( scalaVersion := ScalaVersions.scala212, crossScalaVersions := Seq(ScalaVersions.scala212), - pluginCrossBuild / sbtVersion := SbtVersions.sbt16, + pluginCrossBuild / sbtVersion := SbtVersions.sbt17, compile / javacOptions ++= Seq("-source", "1.8", "-target", "1.8"), doc / javacOptions := Seq("-source", "1.8") ) diff --git a/src/main/scala/interplay/Versions.scala b/src/main/scala/interplay/Versions.scala index 2f143fe..1583c87 100644 --- a/src/main/scala/interplay/Versions.scala +++ b/src/main/scala/interplay/Versions.scala @@ -1,11 +1,11 @@ package interplay object ScalaVersions { - val scala212 = "2.12.15" + val scala212 = "2.12.16" val scala213 = "2.13.8" - val scala3 = "3.1.2" + val scala3 = "3.1.3" } object SbtVersions { - val sbt16 = "1.6.1" + val sbt17 = "1.7.1" }