From 5bfe3bd9bfcdadcaf2b32567895525870c0725a0 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 12 Oct 2024 14:11:50 -0400 Subject: [PATCH] Enable sbt 2.x cross building --- .github/workflows/ci.yml | 2 +- build.sbt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d4f92b..987a4f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,4 +13,4 @@ jobs: java-version: 8 cache: sbt - uses: sbt/setup-sbt@v1 - - run: sbt compile + - run: sbt +compile diff --git a/build.sbt b/build.sbt index b0db712..82df7f9 100644 --- a/build.sbt +++ b/build.sbt @@ -16,25 +16,25 @@ inThisBuild( url("https://geirsson.com") ) ), - crossScalaVersions := Seq(scala212) ) ) onLoadMessage := s"Welcome to sbt-ci-release ${version.value}" - +crossScalaVersions := Nil publish / skip := true // don't publish the root project lazy val plugin = project .enablePlugins(SbtPlugin) .settings( moduleName := "sbt-ci-release", + crossScalaVersions := Seq(scala212, scala3), (pluginCrossBuild / sbtVersion) := { scalaBinaryVersion.value match { case "2.12" => "1.5.8" case _ => "2.0.0-M2" } }, - addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1"), + addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0"), addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0"), addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0"), addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")