Merge pull request #132 from scala-steward/update/sbt-typelevel-0.4.3

Update sbt-typelevel, sbt-typelevel-site to 0.4.3
http4s · Jan 28, 2022 · b0b9fba · b0b9fba
2 parents 9b28ea4 + 2dbccb0
commit b0b9fba
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -74,30 +74,37 @@ jobs:
         run: sbt '++${{ matrix.scala }}' 'project /' githubWorkflowCheck
 
       - name: Check headers and formatting
+        if: matrix.java == 'temurin@8'
         run: sbt '++${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: Test
         run: sbt '++${{ matrix.scala }}' test
 
       - name: Check binary compatibility
+        if: matrix.java == 'temurin@8'
         run: sbt '++${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
+        if: matrix.java == 'temurin@8'
         run: sbt '++${{ matrix.scala }}' doc
 
       - name: Check unused compile dependencies
+        if: matrix.java == 'temurin@8'
         run: sbt '++${{ matrix.scala }}' unusedCompileDependenciesTest
 
       - name: Make target directories
+        if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
         run: mkdir -p target core/target site/target project/target
 
       - name: Compress target directories
+        if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
         run: tar cf targets.tar target core/target site/target project/target
 
       - name: Upload target directories
+        if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
         uses: actions/upload-artifact@v2
         with:
-          name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
+          name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
           path: targets.tar
 
   publish:
@@ -152,7 +159,7 @@ jobs:
       - name: Download target directories (2.12.15)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }}
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.15
 
       - name: Inflate target directories (2.12.15)
         run: |
@@ -221,7 +228,7 @@ jobs:
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
       - name: Generate site
-        run: sbt '++${{ matrix.scala }}' tlSite
+        run: sbt '++${{ matrix.scala }}' docs/tlSite
 
       - name: Publish site
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'

diff --git a/build.sbt b/build.sbt
@@ -15,7 +15,7 @@ lazy val core = project
 
 lazy val docs = project.in(file("site")).enablePlugins(Http4sOrgSitePlugin)
 
-ThisBuild / tlBaseVersion := "0.10"
+ThisBuild / tlBaseVersion := "0.11"
 ThisBuild / crossScalaVersions := Seq("2.12.15")
 ThisBuild / developers := List(
   Developer(

diff --git a/core/build.sbt b/core/build.sbt
@@ -1,4 +1,4 @@
-val sbtTypelevelVersion = "0.4.1"
+val sbtTypelevelVersion = "0.4.3"
 addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
 addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
 addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16")
diff --git a/core/src/main/scala/org/http4s/sbt/Http4sOrgPlugin.scala b/core/src/main/scala/org/http4s/sbt/Http4sOrgPlugin.scala
@@ -32,22 +32,29 @@ object Http4sOrgPlugin extends AutoPlugin {
 
   override def buildSettings = organizationSettings ++ githubActionsSettings
 
-  val organizationSettings: Seq[Setting[_]] =
+  lazy val organizationSettings: Seq[Setting[_]] =
     Seq(
       organization := "org.http4s",
       organizationName := "http4s.org"
     )
 
-  val githubActionsSettings: Seq[Setting[_]] =
+  lazy val githubActionsSettings: Seq[Setting[_]] =
     Seq(
       githubWorkflowJavaVersions := List("8", "11", "17").map(JavaSpec.temurin(_)),
       githubWorkflowBuildPostamble ++= Seq(
         WorkflowStep.Sbt(
           List("unusedCompileDependenciesTest"),
-          name = Some("Check unused compile dependencies"))
+          name = Some("Check unused compile dependencies"),
+          cond = Some(primaryJavaCond.value)
+        )
       ),
       githubWorkflowBuildMatrixFailFast := Some(false),
       githubWorkflowTargetBranches := Seq("**")
     )
 
+  private val primaryJavaCond = Def.setting {
+    val java = githubWorkflowJavaVersions.value.head
+    s"matrix.java == '${java.render}'"
+  }
+
 }