From e137b61983db64638b49eb86bca96e3a0b6f2e95 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 29 Nov 2022 12:08:54 -0800 Subject: [PATCH 01/11] Use `hostedApiUrl` as fallback for `apiURL` --- .../main/scala/org/typelevel/sbt/TypelevelSonatypePlugin.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonatype/src/main/scala/org/typelevel/sbt/TypelevelSonatypePlugin.scala b/sonatype/src/main/scala/org/typelevel/sbt/TypelevelSonatypePlugin.scala index 7b010be1..b041d231 100644 --- 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 = From 0edddee350b5b5114012abe0a3acde250210b088 Mon Sep 17 00:00:00 2001 From: zetashift Date: Tue, 20 Dec 2022 18:16:34 +0100 Subject: [PATCH 02/11] Add Inkuire in ScalaDoc settings, enables searching by function for Scala 3.2.1+ --- .../scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala b/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala index 2ffc3b29..385c742f 100644 --- a/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala +++ b/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala @@ -194,6 +194,14 @@ object TypelevelSettingsPlugin extends AutoPlugin { } } }, + Compile / doc / scalacOptions ++= { + scalaVersion.value match { + case V(V(3, minor, Some(build), _)) if minor >= 2 && build >= 1 => + Seq("-Ygenerate-inkuire") + case _ => + Seq.empty + } + }, javacOptions ++= Seq( "-encoding", "utf8", From 3523b6561d0f85147d7ef3adfc88fa76355355b2 Mon Sep 17 00:00:00 2001 From: zetashift Date: Tue, 20 Dec 2022 19:54:12 +0100 Subject: [PATCH 03/11] Fix pattern match for Inkuire support --- .../scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala b/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala index 385c742f..3d06f598 100644 --- a/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala +++ b/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala @@ -195,8 +195,11 @@ object TypelevelSettingsPlugin extends AutoPlugin { } }, Compile / doc / scalacOptions ++= { + // Enable Inkuire for Scala 3.2.1+ scalaVersion.value match { - case V(V(3, minor, Some(build), _)) if minor >= 2 && build >= 1 => + case V(V(3, 2, Some(build), _)) if build >= 1 => + Seq("-Ygenerate-inkuire") + case V(V(3, minor, _, _)) if minor >= 2 => Seq("-Ygenerate-inkuire") case _ => Seq.empty From 5a8ccddd58ccbf2b68c2c4f6e19de0e70a0b33f7 Mon Sep 17 00:00:00 2001 From: zetashift Date: Tue, 20 Dec 2022 19:58:28 +0100 Subject: [PATCH 04/11] Update pattern match clause for minor version Changes the minor version from 2 to 3, because the patter match for build already takes care of minor version 2. Co-authored-by: Arman Bilge --- .../main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala b/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala index 3d06f598..d58e4f08 100644 --- a/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala +++ b/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala @@ -199,7 +199,7 @@ object TypelevelSettingsPlugin extends AutoPlugin { scalaVersion.value match { case V(V(3, 2, Some(build), _)) if build >= 1 => Seq("-Ygenerate-inkuire") - case V(V(3, minor, _, _)) if minor >= 2 => + case V(V(3, minor, _, _)) if minor >= 3 => Seq("-Ygenerate-inkuire") case _ => Seq.empty From 7ad12d508e3493ede8f0bb72a3ee403fa1ba6cc5 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 16:31:33 +0000 Subject: [PATCH 05/11] Update coursier to 2.1.0-RC4 --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index c7c1b80e..c039d7b4 100644 --- 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" ) From b05c068e26ebc47e9cec677fb50d465c80ae1652 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Wed, 28 Dec 2022 19:52:46 -0500 Subject: [PATCH 06/11] Bump actions to Node 16 versions --- .../scala/org/typelevel/sbt/gha/GenerativePlugin.scala | 2 +- .../main/scala/org/typelevel/sbt/gha/WorkflowStep.scala | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala index d7d70a5b..a477d695 100644 --- a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala +++ b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala @@ -662,7 +662,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)} Seq( WorkflowStep.Use( - UseRef.Public("actions", "cache", "v2"), + UseRef.Public("actions", "cache", "v3"), name = Some("Cache sbt"), params = Map( "path" -> Seq( diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowStep.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowStep.scala index ef874389..47d834a7 100644 --- a/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowStep.scala +++ b/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowStep.scala @@ -26,12 +26,12 @@ sealed trait WorkflowStep extends Product with Serializable { object WorkflowStep { val CheckoutFull: WorkflowStep = Use( - UseRef.Public("actions", "checkout", "v2"), + UseRef.Public("actions", "checkout", "v3"), name = Some("Checkout current branch (full)"), params = Map("fetch-depth" -> "0")) val Checkout: WorkflowStep = Use( - UseRef.Public("actions", "checkout", "v2"), + UseRef.Public("actions", "checkout", "v3"), name = Some("Checkout current branch (fast)")) def SetupJava(versions: List[JavaSpec]): List[WorkflowStep] = @@ -56,7 +56,7 @@ object WorkflowStep { params = Map("distribution" -> dist.rendering, "java-version" -> version) ), WorkflowStep.Use( - UseRef.Public("actions", "setup-java", "v2"), + UseRef.Public("actions", "setup-java", "v3"), name = Some(s"Setup Java (${jv.render})"), cond = cond, params = Map( @@ -69,7 +69,7 @@ object WorkflowStep { case jv @ JavaSpec(dist, version) => WorkflowStep.Use( - UseRef.Public("actions", "setup-java", "v2"), + UseRef.Public("actions", "setup-java", "v3"), name = Some(s"Setup Java (${jv.render})"), cond = Some(s"matrix.java == '${jv.render}'"), params = Map("distribution" -> dist.rendering, "java-version" -> version) From e8374d2b5540f8900e6a16b68cccac8c795cf9da Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Wed, 28 Dec 2022 20:14:24 -0500 Subject: [PATCH 07/11] I guess we self-host our own workflow --- .github/workflows/ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8955f04f..28d83624 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -48,7 +48,7 @@ jobs: - name: Setup Java (temurin@8) if: matrix.java == 'temurin@8' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 8 @@ -64,14 +64,14 @@ jobs: - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 17 jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.sbt @@ -131,7 +131,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -145,7 +145,7 @@ jobs: - name: Setup Java (temurin@8) if: matrix.java == 'temurin@8' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 8 @@ -161,14 +161,14 @@ jobs: - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 17 jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.sbt @@ -213,7 +213,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -227,7 +227,7 @@ jobs: - name: Setup Java (temurin@8) if: matrix.java == 'temurin@8' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 8 @@ -243,14 +243,14 @@ jobs: - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 17 jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.sbt From 54e57499f170d2162ee482142874bd6522b62150 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Fri, 30 Dec 2022 04:00:01 +0000 Subject: [PATCH 08/11] Bump more actions --- .github/workflows/ci.yml | 18 +++++++++--------- .../typelevel/sbt/gha/GenerativePlugin.scala | 4 ++-- .../org/typelevel/sbt/gha/WorkflowStep.scala | 4 ++-- .../typelevel/sbt/TypelevelSitePlugin.scala | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28d83624..b38b2255 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: - name: Download Java (temurin@8) id: download-java-temurin-8 if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v1 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 8 @@ -57,7 +57,7 @@ jobs: - name: Download Java (temurin@17) id: download-java-temurin-17 if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v1 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 17 @@ -114,7 +114,7 @@ jobs: - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.4') - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} path: targets.tar @@ -138,7 +138,7 @@ jobs: - name: Download Java (temurin@8) id: download-java-temurin-8 if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v1 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 8 @@ -154,7 +154,7 @@ jobs: - name: Download Java (temurin@17) id: download-java-temurin-17 if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v1 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 17 @@ -180,7 +180,7 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Download target directories (2.12.17, rootJVM) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM @@ -220,7 +220,7 @@ jobs: - name: Download Java (temurin@8) id: download-java-temurin-8 if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v1 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 8 @@ -236,7 +236,7 @@ jobs: - name: Download Java (temurin@17) id: download-java-temurin-17 if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v1 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 17 @@ -266,7 +266,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/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala index a477d695..b268c1c2 100644 --- a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala +++ b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala @@ -592,7 +592,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)} (List("os", "java", "scala") ::: keys).map(k => s"$${{ matrix.$k }}").mkString("-") val upload = WorkflowStep.Use( - UseRef.Public("actions", "upload-artifact", "v2"), + UseRef.Public("actions", "upload-artifact", "v3"), name = Some(s"Upload target directories"), params = Map("name" -> s"target-$artifactId", "path" -> "targets.tar"), cond = Some(publicationCond.value) @@ -639,7 +639,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)} val pretty = v.mkString(", ") val download = WorkflowStep.Use( - UseRef.Public("actions", "download-artifact", "v2"), + UseRef.Public("actions", "download-artifact", "v3"), name = Some(s"Download target directories ($pretty)"), params = Map("name" -> s"target-$${{ matrix.os }}-$${{ matrix.java }}-${v.mkString("-")}") diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowStep.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowStep.scala index 47d834a7..4ac539d5 100644 --- a/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowStep.scala +++ b/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowStep.scala @@ -49,7 +49,7 @@ object WorkflowStep { val id = s"download-java-${dist.rendering}-$version" List( WorkflowStep.Use( - UseRef.Public("typelevel", "download-java", "v1"), + UseRef.Public("typelevel", "download-java", "v2"), name = Some(s"Download Java (${jv.render})"), id = Some(id), cond = cond, @@ -77,7 +77,7 @@ object WorkflowStep { } val Tmate: WorkflowStep = - Use(UseRef.Public("mxschmitt", "action-tmate", "v2"), name = Some("Setup tmate session")) + Use(UseRef.Public("mxschmitt", "action-tmate", "v3"), name = Some("Setup tmate session")) def ComputeVar(name: String, cmd: String): WorkflowStep = Run( diff --git a/site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala b/site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala index c2220ed0..122a8ce8 100644 --- a/site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala +++ b/site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala @@ -203,7 +203,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) From 283557d2a78b60dfc92c6573addde36ac925fb7f Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Fri, 30 Dec 2022 04:17:17 +0000 Subject: [PATCH 09/11] Only run fmt/header/mima etc. checks on primary os --- .github/workflows/ci.yml | 8 ++++---- .../org/typelevel/sbt/TypelevelCiPlugin.scala | 17 +++++++++-------- .../org/typelevel/sbt/TypelevelPlugin.scala | 5 ----- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b38b2255..06ced96e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,22 +86,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 diff --git a/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala b/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala index ddb1f24e..111dd2d1 100644 --- a/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala +++ b/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala @@ -63,7 +63,7 @@ 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 @@ -71,7 +71,7 @@ object TypelevelCiPlugin extends AutoPlugin { WorkflowStep.Sbt( List("headerCheckAll"), name = Some("Check headers"), - cond = Some(primaryJavaCond.value) + cond = Some(primaryJavaOSCond.value) ) ) case (false, true) => // formatting @@ -79,7 +79,7 @@ object TypelevelCiPlugin extends AutoPlugin { WorkflowStep.Sbt( List("scalafmtCheckAll", "project /", "scalafmtSbtCheck"), name = Some("Check formatting"), - cond = Some(primaryJavaCond.value) + cond = Some(primaryJavaOSCond.value) ) ) case (false, false) => Nil // nada @@ -95,7 +95,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 @@ -106,7 +106,7 @@ object TypelevelCiPlugin extends AutoPlugin { WorkflowStep.Sbt( List("mimaReportBinaryIssues"), name = Some("Check binary compatibility"), - cond = Some(primaryJavaCond.value) + cond = Some(primaryJavaOSCond.value) )) else Nil @@ -116,7 +116,7 @@ object TypelevelCiPlugin extends AutoPlugin { WorkflowStep.Sbt( List("doc"), name = Some("Generate API documentation"), - cond = Some(primaryJavaCond.value) + cond = Some(primaryJavaOSCond.value) ) ) else Nil @@ -126,9 +126,10 @@ object TypelevelCiPlugin extends AutoPlugin { githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8")) ) - 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 index 720aaed4..fb64e8b7 100644 --- a/core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala +++ b/core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala @@ -115,9 +115,4 @@ object TypelevelPlugin extends AutoPlugin { // override for bincompat override def projectSettings = immutable.Seq.empty - private val primaryJavaCond = Def.setting { - val java = githubWorkflowJavaVersions.value.head - s"matrix.java == '${java.render}'" - } - } From e54f2ef14b4a1f378bf5ba229e789193191f7b66 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 4 Jan 2023 13:47:38 +0000 Subject: [PATCH 10/11] Set `startYear` to 2022 --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 7c5ce872..d94cb3c1 100644 --- a/build.sbt +++ b/build.sbt @@ -10,6 +10,7 @@ ThisBuild / developers := List( tlGitHubDev("ChristopherDavenport", "Christopher Davenport"), tlGitHubDev("djspiewak", "Daniel Spiewak") ) +ThisBuild / startYear := Some(2022) ThisBuild / githubWorkflowJavaVersions += JavaSpec.temurin("17") From b65f2e6d7b42b79f72c6ee53f9500862fb6ee30f Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Sat, 7 Jan 2023 00:57:46 +0000 Subject: [PATCH 11/11] Remove unused import --- core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala b/core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala index 2a0f60ce..20e1c892 100644 --- 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._ /**