diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e7bded0..6d6ceeb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,10 +12,13 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK 21 + uses: actions/setup-java@v4 with: - java-version: 11 + distribution: 'temurin' + java-version: 21 + - name: Set up SBT + uses: sbt/setup-sbt@v1.1.8 - name: Publish env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} diff --git a/.github/workflows/publish_branch.yaml b/.github/workflows/publish_branch.yaml index b1627f3..37a6c14 100644 --- a/.github/workflows/publish_branch.yaml +++ b/.github/workflows/publish_branch.yaml @@ -11,10 +11,13 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK 21 + uses: actions/setup-java@v4 with: - java-version: 11 + distribution: 'temurin' + java-version: 21 + - name: Set up SBT + uses: sbt/setup-sbt@v1.1.8 - name: Publish env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 8d7d61c..b61c06d 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -7,13 +7,16 @@ on: branches: [ master ] jobs: - java11: + java21: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK 21 + uses: actions/setup-java@v4 with: - java-version: 11 + distribution: 'temurin' + java-version: 21 + - name: Set up SBT + uses: sbt/setup-sbt@v1.1.8 - name: Run tests run: sbt scalafmtSbtCheck scalafmtCheckAll +testOnly diff --git a/build.sbt b/build.sbt index 669c6c4..79aaa1c 100644 --- a/build.sbt +++ b/build.sbt @@ -1,15 +1,20 @@ import Dependencies._ inThisBuild( - List(organization := "com.stackstate", scalaVersion := "2.12.13", crossScalaVersions := Seq(scalaVersion.value, "2.13.5"), libraryDependencies ++= { - // Silencer - val silencerVersion = "1.7.3" + List( + organization := "com.stackstate", + scalaVersion := "2.12.20", + crossScalaVersions := Seq(scalaVersion.value, "2.13.16"), + libraryDependencies ++= { + // Silencer + val silencerVersion = "1.7.19" - Seq( - compilerPlugin(("com.github.ghik" %% "silencer-plugin" % silencerVersion).cross(CrossVersion.full)), - ("com.github.ghik" %% "silencer-lib" % silencerVersion % Provided).cross(CrossVersion.full) - ) - }) + Seq( + compilerPlugin(("com.github.ghik" %% "silencer-plugin" % silencerVersion).cross(CrossVersion.full)), + ("com.github.ghik" %% "silencer-lib" % silencerVersion % Provided).cross(CrossVersion.full) + ) + } + ) ) lazy val root = (project in file(".")).settings( diff --git a/project/Scapegoat.scala b/project/Scapegoat.scala index 7060f64..8f58b0e 100644 --- a/project/Scapegoat.scala +++ b/project/Scapegoat.scala @@ -11,7 +11,7 @@ object Scapegoat extends AutoPlugin { import ScapegoatSbtPlugin.autoImport._ override def projectSettings = Seq( - ThisBuild / scapegoatVersion := "1.4.8", + ThisBuild / scapegoatVersion := "3.1.9", scapegoatReports := Seq("text"), // xml in 2.13 require extra dep scapegoatDisabledInspections := Seq("FinalModifierOnCaseClass"), pomPostProcess := { diff --git a/project/build.properties b/project/build.properties index dbae93b..cc68b53 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.9 +sbt.version=1.10.11 diff --git a/project/plugins.sbt b/project/plugins.sbt index 5a8d0b9..b5dbcc2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,6 +2,6 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.8") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") -addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0") +addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")