Skip to content
Merged
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
12 changes: 10 additions & 2 deletions .github/renovate-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,30 @@ module.exports = {
matchManagers: ["sbt"],
allowedVersions: "/^\\d+(?:\\.\\d+)+$/",
},
{
description: "Pin the JDK to Java 21 (LTS)",
matchManagers: ["github-actions"],
matchPackageNames: ["java-jdk"],
allowedVersions: "21",
},
{
description: "Keep sbt on the 1.x line (2.x is not yet supported)",
matchManagers: ["sbt"],
matchPackageNames: ["sbt/sbt"],
allowedVersions: "/^1\\.\\d+\\.\\d+$/",
},
{
description: "Keep Scala on the 3.9.x LTS line (no minor upgrades)",
matchManagers: ["sbt"],
matchPackageNames: ["org.scala-lang:scala3-library_3"],
allowedVersions: "/^3\\.9\\.\\d+$/",
separateMinorPatch: false,
},
{
description: "Keep wartremover below 3.6.x until it is cross-published for Scala 3.8",
description: "Keep wartremover on the 3.6.x line (cross-published for Scala 3.9)",
matchManagers: ["sbt"],
matchPackageNames: ["org.wartremover:sbt-wartremover"],
allowedVersions: "/^3\\.5\\.\\d+$/",
allowedVersions: "/^3\\.6\\.\\d+$/",
},
{
description: "Disable updates for libraryDependencySchemes entries (not real versions)",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- uses: actions/checkout@v7
- name: Set up JDK ${{ matrix.java-version }}
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
cache: 'sbt'
java-version: ${{ matrix.java-version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manual-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
ref: ${{ inputs.ref_to_publish }}

- name: Setup JDK
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
distribution: temurin
java-version: '21'
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
ref: ${{ inputs.ref_to_publish }}

- name: Setup JDK
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
distribution: temurin
java-version: '21'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renovate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
private-key: ${{ secrets.AUTOMATION_APP_PRIVATE_KEY }}

- name: Renovate
uses: renovatebot/github-action@v46.2.2
uses: renovatebot/github-action@v46.3.7
with:
configurationFile: .github/renovate-config.js
token: ${{ steps.automation-token.outputs.token }}
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ val props =
inThisBuild(
Seq(
organization := "org.funfix",
scalaVersion := "3.8.4",
scalaVersion := "3.9.0",
// Configure for Sonatype Central Portal
usePgpKeyHex(sys.env.getOrElse("PGP_KEY_ID", "")),
publishTo := {
Expand Down Expand Up @@ -75,7 +75,7 @@ lazy val continuations4s = crossProject(JSPlatform, JVMPlatform, NativePlatform)
name := "continuations4s",
libraryDependencies ++= Seq(
// Testing
"org.scalameta" %%% "munit" % "1.3.5" % Test
"org.scalameta" %%% "munit" % "1.3.6" % Test
),
testFrameworks += new TestFramework("munit.Framework"),
Compile / doc / scalacOptions ++= Seq(
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.2")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.7")
// 3.6.x is not cross-published for Scala 3.8 (the project's Scala version)
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.5.8")
// 3.6.x is required by Scala 3.9 (the project's Scala version)
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.6.3")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.2")
addSbtPlugin("com.eed3si9n" % "sbt-salad-days" % "0.2.0")

Expand Down
Loading