From 840eb4afde58292eace2db9e161c99452caca82a Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Wed, 29 Oct 2025 16:59:56 +0900 Subject: [PATCH] sbt 2 build setting --- .github/workflows/build.yml | 2 +- build.sbt | 27 ++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f29e61..8a5d4b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,4 +21,4 @@ jobs: java-version: ${{ matrix.java }} - uses: sbt/setup-sbt@v1 - name: Run tests - run: sbt test + run: sbt "+ update" test diff --git a/build.sbt b/build.sbt index d84adf5..cfcba37 100644 --- a/build.sbt +++ b/build.sbt @@ -8,12 +8,29 @@ libraryDependencies ++= Seq( (pluginCrossBuild / sbtBinaryVersion).value, (pluginCrossBuild / scalaBinaryVersion).value ), - Defaults.sbtPluginExtra( - "org.playframework.twirl" % "sbt-twirl" % "2.0.9", - (pluginCrossBuild / sbtBinaryVersion).value, - (pluginCrossBuild / scalaBinaryVersion).value - ), + { + val v = scalaBinaryVersion.value match { + case "2.12" => + "2.0.9" + case "3" => + "2.1.0-M5" + } + Defaults.sbtPluginExtra( + "org.playframework.twirl" % "sbt-twirl" % v, + (pluginCrossBuild / sbtBinaryVersion).value, + (pluginCrossBuild / scalaBinaryVersion).value + ) + } ) +pluginCrossBuild / sbtVersion := { + scalaBinaryVersion.value match { + case "2.12" => + sbtVersion.value + case _ => + "2.0.0-RC6" + } +} +crossScalaVersions += "3.7.3" scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature") publishTo := (if (isSnapshot.value) None else localStaging.value) publishMavenStyle := true