Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- name: Publish
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/publish_branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- name: Publish
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- name: Run tests
run: sbt scalafmtSbtCheck scalafmtCheckAll +testOnly
21 changes: 13 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion project/Scapegoat.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 := {
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.9
sbt.version=1.10.11
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")