From 5b0f356ffd380b8523b614ede1dc6d3a43988fdd Mon Sep 17 00:00:00 2001 From: pierscin <30854591+pierscin@users.noreply.github.com> Date: Thu, 24 Sep 2026 11:15:16 +0200 Subject: [PATCH] Migrate to sbt 2.0.9 and sbt-softwaremill 3.0.1 Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci.yml | 4 ++-- build.sbt | 10 ++++------ project/build.properties | 2 +- project/plugins.sbt | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2aa8e9c..7656cd6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,8 +26,8 @@ jobs: distribution: 'temurin' cache: 'sbt' java-version: 21 - - uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1, specifically v1.1.14 + - uses: sbt/setup-sbt@ce95da69b39609ea153bad087708da5f37366897 # v1, specifically v1.5.10 - name: Compile run: sbt -v compile - name: Test - run: sbt -v test + run: sbt -v testFull diff --git a/build.sbt b/build.sbt index 606fd37..f43afbc 100644 --- a/build.sbt +++ b/build.sbt @@ -1,19 +1,17 @@ import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings -lazy val commonSettings = commonSmlBuildSettings ++ Seq( - organization := "com.softwaremill.xxx", - scalaVersion := "2.13.12" -) +commonSmlBuildSettings + +organization := "com.softwaremill.xxx" +scalaVersion := "2.13.12" val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" % Test lazy val rootProject = (project in file(".")) - .settings(commonSettings: _*) .settings(publishArtifact := false, name := "root") .aggregate(core) lazy val core: Project = (project in file("core")) - .settings(commonSettings: _*) .settings( name := "core", libraryDependencies ++= Seq( diff --git a/project/build.properties b/project/build.properties index 01a16ed..ddca111 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.7 +sbt.version=2.0.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index 1583d49..e91977c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -val sbtSoftwareMillVersion = "2.0.20" +val sbtSoftwareMillVersion = "3.0.1" addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % sbtSoftwareMillVersion)