From 52ccb6b0ca7e39b5596ebfd031b4e0fb38eaa8a5 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:25:09 +0000 Subject: [PATCH 1/7] Update scala-library to 2.12.20 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 21e67a83..cf88c4af 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ ThisBuild / tlBaseVersion := "0.6" // Our Scala versions. -lazy val `scala-2.12` = "2.12.19" +lazy val `scala-2.12` = "2.12.20" lazy val `scala-2.13` = "2.13.14" lazy val `scala-3.0` = "3.3.3" From 2e636c6d97fe2361cb3e942c13a8177bb0e073cd Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:11:01 +0000 Subject: [PATCH 2/7] Update junit-interface to 1.0.2 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 21e67a83..8b8262d3 100644 --- a/build.sbt +++ b/build.sbt @@ -187,7 +187,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) tlFatalWarnings := false, libraryDependencies ++= Seq( "org.scalameta" %%% "munit" % "1.0.0", - "org.scalameta" % "junit-interface" % "1.0.0", + "org.scalameta" % "junit-interface" % "1.0.2", "org.typelevel" %%% "scalacheck-effect-munit" % "2.0.0-M2", "org.typelevel" %%% "munit-cats-effect" % "2.0.0", "org.typelevel" %%% "cats-free" % "2.11.0", From dbfb003727da0796b767e6e23c316ae1d12b51c9 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 04:34:03 +0000 Subject: [PATCH 3/7] Update sbt-typelevel, sbt-typelevel-site to 0.7.4 in series/0.6.x --- project/plugins.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index dddeeab2..2e7f5697 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,8 +3,8 @@ ThisBuild / libraryDependencySchemes ++= Seq( "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always ) -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.2") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.4") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") From 74a4c06a6c59a4183cd539ab2c548a625ec1f894 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 04:34:35 +0000 Subject: [PATCH 4/7] Run prePR with sbt-typelevel Executed command: sbt tlPrePrBotHook --- .github/workflows/ci.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 897c8736..b7dbba9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,8 +35,7 @@ jobs: timeout-minutes: 60 steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -118,8 +117,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -261,7 +259,7 @@ jobs: dependency-submission: name: Submit Dependencies - if: github.event_name != 'pull_request' + if: github.event.repository.fork == false && github.event_name != 'pull_request' strategy: matrix: os: [ubuntu-latest] @@ -269,8 +267,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -336,8 +333,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -383,8 +379,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 From cc9e99f49ec86cd683da2a9b73c804a359c10167 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 00:38:03 +0000 Subject: [PATCH 5/7] Update sbt to 1.10.5 in series/0.6.x --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 09feeeed..db1723b0 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.4 +sbt.version=1.10.5 From 1a48159dacc781535a8b03716fc45b521df0ad58 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 00:25:14 +0000 Subject: [PATCH 6/7] Update cats-effect, cats-effect-testkit to 3.5.6 in series/0.6.x --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 974e785d..12988b80 100644 --- a/build.sbt +++ b/build.sbt @@ -110,7 +110,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) description := "Tagless, non-blocking data access library for Postgres.", libraryDependencies ++= Seq( "org.typelevel" %%% "cats-core" % "2.11.0", - "org.typelevel" %%% "cats-effect" % "3.5.5", + "org.typelevel" %%% "cats-effect" % "3.5.6", "co.fs2" %%% "fs2-core" % fs2Version, "co.fs2" %%% "fs2-io" % fs2Version, "org.scodec" %%% "scodec-bits" % "1.1.38", @@ -192,7 +192,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) "org.typelevel" %%% "munit-cats-effect" % "2.0.0", "org.typelevel" %%% "cats-free" % "2.11.0", "org.typelevel" %%% "cats-laws" % "2.11.0", - "org.typelevel" %%% "cats-effect-testkit" % "3.5.5", + "org.typelevel" %%% "cats-effect-testkit" % "3.5.6", "org.typelevel" %%% "discipline-munit" % "2.0.0-M3", "org.typelevel" %%% "cats-time" % "0.5.1", ), From 543d5f8fc39fc86ec4745982482dbd823820e73e Mon Sep 17 00:00:00 2001 From: Michael Pilquist Date: Tue, 19 Nov 2024 21:15:01 -0500 Subject: [PATCH 7/7] Fix doc generation based on upstream changes --- modules/docs/src/main/scala/mdoc/Main.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/docs/src/main/scala/mdoc/Main.scala b/modules/docs/src/main/scala/mdoc/Main.scala index 49de84ec..e75eb214 100644 --- a/modules/docs/src/main/scala/mdoc/Main.scala +++ b/modules/docs/src/main/scala/mdoc/Main.scala @@ -7,7 +7,6 @@ package mdoc import java.io.{ ByteArrayOutputStream, PrintStream } import java.nio.file.Path import scala.meta.internal.io.PathIO -import scala.meta.io.AbsolutePath import mdoc.internal.cli.MainOps import mdoc.internal.cli.Settings import mdoc.internal.io.ConsoleReporter @@ -52,8 +51,7 @@ object Main { } def process(args: Array[String], reporter: Reporter, cwd: Path): Int = { - val base = Settings.default(AbsolutePath(cwd)).copy(variablePrinter = ReplVariablePrinter(pprinter = custom)) - val ctx = Settings.fromCliArgs(args.toList, base) + val ctx = Settings.fromCliArgs(args.toList, cwd).map(_.copy(variablePrinter = ReplVariablePrinter(pprinter = custom))) MainOps.process(ctx, reporter) }