Merge pull request #118 from armanbilge/fix/default-scala

Read default scala version from `ThisBuild`
typelevel · Jan 30, 2022 · a1f9c9a · a1f9c9a
2 parents 9bbbf6c + cc7702e
commit a1f9c9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala b/core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala
@@ -57,10 +57,10 @@ object TypelevelPlugin extends AutoPlugin {
     tlCiReleaseBranches := Seq("main"),
     Def.derive(tlFatalWarnings := (tlFatalWarningsInCi.value && githubIsWorkflowBuild.value)),
     githubWorkflowBuildMatrixExclusions ++= {
+      val defaultScala = (ThisBuild / scalaVersion).value
       for {
-        // default scala is last in the list, default java first
-        scala <- githubWorkflowScalaVersions.value.init
-        java <- githubWorkflowJavaVersions.value.tail
+        scala <- githubWorkflowScalaVersions.value.filterNot(_ == defaultScala)
+        java <- githubWorkflowJavaVersions.value.tail // default java is head
       } yield MatrixExclude(Map("scala" -> scala, "java" -> java.render))
     },
     githubWorkflowBuild := {

diff --git a/site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala b/site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala
@@ -145,7 +145,7 @@ object TypelevelSitePlugin extends AutoPlugin {
       WorkflowJob(
         "site",
         "Generate Site",
-        scalas = List(crossScalaVersions.value.last),
+        scalas = List((ThisBuild / scalaVersion).value),
         javas = List(githubWorkflowJavaVersions.value.head),
         steps =
           githubWorkflowJobSetup.value.toList ++ tlSiteGenerate.value ++ tlSitePublish.value