From f4c5ab84fbc463543930af9467a0adc39af5f4bc Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 29 Sep 2022 20:45:04 +0200 Subject: [PATCH 1/4] Drop Java 8 --- .github/workflows/build-test.yml | 12 ++++++------ .github/workflows/publish.yml | 2 +- project/plugins.sbt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 36e2c7cf..4ed53caf 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -15,17 +15,17 @@ concurrency: jobs: check-code-style: name: Code Style - uses: playframework/.github/.github/workflows/cmd.yml@v2 + uses: playframework/.github/.github/workflows/cmd.yml@v3 with: cmd: sbt scalafmtCheckAll scalafmtSbtCheck check-binary-compatibility: name: Binary Compatibility - uses: playframework/.github/.github/workflows/binary-check.yml@v2 + uses: playframework/.github/.github/workflows/binary-check.yml@v3 check-docs: name: Docs - uses: playframework/.github/.github/workflows/cmd.yml@v2 + uses: playframework/.github/.github/workflows/cmd.yml@v3 with: cmd: sbt docs/scalafmtCheckAll docs/scalafmtSbtCheck docs/test docs/validateDocs @@ -35,9 +35,9 @@ jobs: - "check-code-style" - "check-binary-compatibility" - "check-docs" - uses: playframework/.github/.github/workflows/cmd.yml@v2 + uses: playframework/.github/.github/workflows/cmd.yml@v3 with: - java: 11, 8 + java: 17, 11 scala: 2.12.17, 2.13.8 cmd: sbt ++$MATRIX_SCALA test @@ -46,4 +46,4 @@ jobs: if: github.event_name == 'pull_request' needs: # Should be last - "tests" - uses: playframework/.github/.github/workflows/rtm.yml@v2 + uses: playframework/.github/.github/workflows/rtm.yml@v3 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9e999302..92e6f544 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,5 +11,5 @@ on: jobs: publish-artifacts: name: Publish / Artifacts - uses: playframework/.github/.github/workflows/publish.yml@v2 + uses: playframework/.github/.github/workflows/publish.yml@v3 secrets: inherit diff --git a/project/plugins.sbt b/project/plugins.sbt index 51c9a7f8..16988744 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ resolvers ++= Seq( addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.props.getOrElse("play.version", "2.8.16")) addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.8.16")) -addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.get("interplay.version").getOrElse("3.0.6")) +addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.get("interplay.version").getOrElse("3.1.0-RC3")) addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1") From 9652ca5a8fbad1b96b8265d9e9058c447f8f7ae4 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 4 Oct 2022 12:03:57 +0200 Subject: [PATCH 2/4] Unstable Play 2.9 release --- project/plugins.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 16988744..1241f220 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,8 +4,8 @@ resolvers ++= Seq( Resolver.sonatypeRepo("snapshots"), // used by deploy nightlies, which publish here & use -Dplay.version ) -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.props.getOrElse("play.version", "2.8.16")) -addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.8.16")) +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.props.getOrElse("play.version", "2.9.0-M2")) +addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.0-M2")) addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.get("interplay.version").getOrElse("3.1.0-RC3")) addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") From 28adee1cf5c93d489cdd6fe04e5b088b88bf2844 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 5 Oct 2022 00:20:14 +0200 Subject: [PATCH 3/4] Adjust Scala versions --- .github/workflows/build-test.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 4ed53caf..d929abc7 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -38,7 +38,7 @@ jobs: uses: playframework/.github/.github/workflows/cmd.yml@v3 with: java: 17, 11 - scala: 2.12.17, 2.13.8 + scala: 2.13.8 cmd: sbt ++$MATRIX_SCALA test finish: diff --git a/build.sbt b/build.sbt index 357cee32..c83edcd1 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ lazy val commonSettings = Seq( // Work around https://issues.scala-lang.org/browse/SI-9311 scalacOptions ~= (_.filterNot(_ == "-Xfatal-warnings")), scalaVersion := "2.13.8", // scala213, - crossScalaVersions := Seq("2.13.8", scala212), // scala213, + crossScalaVersions := Seq("2.13.8"), // scala213, pomExtra := scala.xml.NodeSeq.Empty, // Can be removed when dropping interplay developers += Developer( "playframework", From 7b6cf8a4a123c544171918c8b2d53a07981a69af Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 5 Oct 2022 00:20:47 +0200 Subject: [PATCH 4/4] Workaround scala-xml conflicts --- project/plugins.sbt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1241f220..912f6ad4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,7 @@ +lazy val plugins = (project in file(".")).settings( + scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021 +) + resolvers ++= DefaultOptions.resolvers(snapshot = true) resolvers ++= Seq( Resolver.sonatypeRepo("releases"),