Merge pull request #446 from armanbilge/topic/merge-0.4-main-2023-01-06

Merge 0.4 -> main
typelevel · Jan 7, 2023 · 9904f04 · 9904f04
2 parents 159c2c4 + b65f2e6
commit 9904f04
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -100,22 +100,22 @@ jobs:
         run: sbt githubWorkflowCheck
 
       - name: Check headers and formatting
-        if: matrix.java == 'temurin@8'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: Test
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
 
       - name: Check scalafix lints
-        if: matrix.java == 'temurin@8'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check'
 
       - name: Check binary compatibility
-        if: matrix.java == 'temurin@8'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
-        if: matrix.java == 'temurin@8'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
 
       - name: Make target directories
@@ -392,7 +392,7 @@ jobs:
 
       - name: Publish site
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/series/0.4'
-        uses: peaceiris/actions-gh-pages@v3.8.0
+        uses: peaceiris/actions-gh-pages@v3.9.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: mdocs/target/docs/site

diff --git a/build.sbt b/build.sbt
@@ -9,6 +9,7 @@ ThisBuild / developers ++= List(
   tlGitHubDev("ChristopherDavenport", "Christopher Davenport"),
   tlGitHubDev("djspiewak", "Daniel Spiewak")
 )
+ThisBuild / startYear := Some(2022)
 
 ThisBuild / githubWorkflowJavaVersions ++=
   Seq(JavaSpec.temurin("17"), JavaSpec(JavaSpec.Distribution.GraalVM("latest"), "17"))

diff --git a/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala b/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala
@@ -71,23 +71,23 @@ object TypelevelCiPlugin extends AutoPlugin {
             WorkflowStep.Sbt(
               List("headerCheckAll", "scalafmtCheckAll", "project /", "scalafmtSbtCheck"),
               name = Some("Check headers and formatting"),
-              cond = Some(primaryJavaCond.value)
+              cond = Some(primaryJavaOSCond.value)
             )
           )
         case (true, false) => // headers
           List(
             WorkflowStep.Sbt(
               List("headerCheckAll"),
               name = Some("Check headers"),
-              cond = Some(primaryJavaCond.value)
+              cond = Some(primaryJavaOSCond.value)
             )
           )
         case (false, true) => // formatting
           List(
             WorkflowStep.Sbt(
               List("scalafmtCheckAll", "project /", "scalafmtSbtCheck"),
               name = Some("Check formatting"),
-              cond = Some(primaryJavaCond.value)
+              cond = Some(primaryJavaOSCond.value)
             )
           )
         case (false, false) => Nil // nada
@@ -103,7 +103,7 @@ object TypelevelCiPlugin extends AutoPlugin {
             WorkflowStep.Sbt(
               List("scalafixAll --check"),
               name = Some("Check scalafix lints"),
-              cond = Some(primaryJavaCond.value)
+              cond = Some(primaryJavaOSCond.value)
             )
           )
         else Nil
@@ -114,7 +114,7 @@ object TypelevelCiPlugin extends AutoPlugin {
             WorkflowStep.Sbt(
               List("mimaReportBinaryIssues"),
               name = Some("Check binary compatibility"),
-              cond = Some(primaryJavaCond.value)
+              cond = Some(primaryJavaOSCond.value)
             ))
         else Nil
 
@@ -124,7 +124,7 @@ object TypelevelCiPlugin extends AutoPlugin {
             WorkflowStep.Sbt(
               List("doc"),
               name = Some("Generate API documentation"),
-              cond = Some(primaryJavaCond.value)
+              cond = Some(primaryJavaOSCond.value)
             )
           )
         else Nil
@@ -151,9 +151,10 @@ object TypelevelCiPlugin extends AutoPlugin {
     }
   )
 
-  private val primaryJavaCond = Def.setting {
+  private val primaryJavaOSCond = Def.setting {
     val java = githubWorkflowJavaVersions.value.head
-    s"matrix.java == '${java.render}'"
+    val os = githubWorkflowOSes.value.head
+    s"matrix.java == '${java.render}' && matrix.os == '${os}'"
   }
 
 }
diff --git a/core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala b/core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala
@@ -21,8 +21,6 @@ import org.typelevel.sbt.gha.GenerativePlugin
 import org.typelevel.sbt.gha.GitHubActionsPlugin
 import sbt._
 
-import scala.collection.immutable
-
 import Keys._
 
 /**
@@ -112,6 +110,4 @@ object TypelevelPlugin extends AutoPlugin {
     )
   )
 
-  // override for bincompat
-  override def projectSettings = immutable.Seq.empty
 }
diff --git a/project/build.sbt b/project/build.sbt
@@ -26,5 +26,5 @@ Compile / unmanagedResourceDirectories ++= modules.map { module =>
 }
 
 libraryDependencies ++= Seq(
-  "io.get-coursier" %% "coursier" % "2.1.0-RC2"
+  "io.get-coursier" %% "coursier" % "2.1.0-RC4"
 )
diff --git a/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala b/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala
@@ -193,6 +193,17 @@ object TypelevelSettingsPlugin extends AutoPlugin {
         Seq("-project-version", version.value)
       else Nil
     },
+    Compile / doc / scalacOptions ++= {
+      // Enable Inkuire for Scala 3.2.1+
+      scalaVersion.value match {
+        case V(V(3, 2, Some(build), _)) if build >= 1 =>
+          Seq("-Ygenerate-inkuire")
+        case V(V(3, minor, _, _)) if minor >= 3 =>
+          Seq("-Ygenerate-inkuire")
+        case _ =>
+          Seq.empty
+      }
+    },
     javacOptions ++= Seq(
       "-encoding",
       "utf8",

diff --git a/site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala b/site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala
@@ -159,7 +159,7 @@ object TypelevelSitePlugin extends AutoPlugin {
       def publishSiteWorkflowStep(publishPredicate: RefPredicate) =
         List(
           WorkflowStep.Use(
-            UseRef.Public("peaceiris", "actions-gh-pages", "v3.8.0"),
+            UseRef.Public("peaceiris", "actions-gh-pages", "v3.9.0"),
             Map(
               "github_token" -> s"$${{ secrets.GITHUB_TOKEN }}",
               "publish_dir" -> (ThisBuild / baseDirectory)

diff --git a/sonatype/src/main/scala/org/typelevel/sbt/TypelevelSonatypePlugin.scala b/sonatype/src/main/scala/org/typelevel/sbt/TypelevelSonatypePlugin.scala
@@ -65,7 +65,7 @@ object TypelevelSonatypePlugin extends AutoPlugin {
           "s01.oss.sonatype.org"
       }
     },
-    apiURL := apiURL.value.orElse(javadocioUrl.value)
+    apiURL := apiURL.value.orElse(hostedApiUrl.value)
   )
 
   private[sbt] lazy val hostedApiUrl =