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
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ jobs:
fail-fast: false
matrix:
java:
- '8'
- '11'
- '17'
- '21'
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '8'
java-version: '17'
cache: 'sbt'
- uses: sbt/setup-sbt@v1
- run: sbt ci-release
Expand Down
11 changes: 7 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import scala.util.Properties.isJavaAtLeast

inThisBuild(List(
// version is set dynamically by sbt-dynver, but let's adjust it
version := {
Expand Down Expand Up @@ -37,7 +39,7 @@ inThisBuild(List(
),
),
scalaVersion := "2.12.21",
crossScalaVersions += "3.7.4",
crossScalaVersions += { if (isJavaAtLeast("17")) "3.8.1" else "3.7.4" },
packageDoc / publishArtifact := insideCI.value,
packageSrc / publishArtifact := insideCI.value,
))
Expand All @@ -62,9 +64,8 @@ lazy val plugin = project.enablePlugins(SbtPlugin, ScriptedPlugin).settings(
// We honestly probably don't need to, so if this ever causes issues, rip it out.
pluginCrossBuild / sbtVersion := {
scalaBinaryVersion.value match {
case "2.12" =>
if (scala.util.Properties.isJavaAtLeast("17")) "1.9.0" else "1.2.8"
case _ => "2.0.0-RC6"
case "2.12" => if (isJavaAtLeast("17")) "1.12.1" else "1.2.8"
case _ => "2.0.0-RC8"
}
},
conflictWarning := {
Expand All @@ -73,6 +74,8 @@ lazy val plugin = project.enablePlugins(SbtPlugin, ScriptedPlugin).settings(
case _ => conflictWarning.value
}
},
scalacOptions ++=
{ if (scalaVersion.value.startsWith("3.8.")) Nil else Seq("-release:8") },
)

// For some reason, it doesn't work if this is defined in globalSettings in PublishPlugin.
Expand Down
Loading