diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 897c8736b..b7dbba9ea 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 diff --git a/.scalafmt.conf b/.scalafmt.conf index ce6345c81..3cf485977 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.8.2" +version = "3.8.3" runner.dialect = Scala213Source3 project.includePaths = [] # disables formatting diff --git a/build.sbt b/build.sbt index 24ba9ea77..f884c0073 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,9 @@ ThisBuild / tlBaseVersion := "0.6" // Our Scala versions. -lazy val `scala-2.12` = "2.12.19" -lazy val `scala-2.13` = "2.13.14" -lazy val `scala-3.0` = "3.3.3" +lazy val `scala-2.12` = "2.12.20" +lazy val `scala-2.13` = "2.13.15" +lazy val `scala-3.0` = "3.3.4" ThisBuild / scalaVersion := `scala-2.13` ThisBuild / crossScalaVersions := @@ -60,7 +60,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( ) // This is used in a couple places -lazy val fs2Version = "3.10.2" +lazy val fs2Version = "3.11.0" lazy val natchezVersion = "0.3.7" // Global Settings @@ -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.4", + "org.typelevel" %%% "cats-effect" % "3.5.6", "co.fs2" %%% "fs2-core" % fs2Version, "co.fs2" %%% "fs2-io" % fs2Version, "org.scodec" %%% "scodec-bits" % "1.1.38", @@ -187,12 +187,12 @@ 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", "org.typelevel" %%% "cats-laws" % "2.11.0", - "org.typelevel" %%% "cats-effect-testkit" % "3.5.4", + "org.typelevel" %%% "cats-effect-testkit" % "3.5.6", "org.typelevel" %%% "discipline-munit" % "2.0.0-M3", "org.typelevel" %%% "cats-time" % "0.5.1", ), diff --git a/modules/core/shared/src/main/scala/net/message/Query.scala b/modules/core/shared/src/main/scala/net/message/Query.scala index a105310bf..5c56faf63 100644 --- a/modules/core/shared/src/main/scala/net/message/Query.scala +++ b/modules/core/shared/src/main/scala/net/message/Query.scala @@ -4,7 +4,6 @@ package skunk.net.message -import scodec.Attempt import scodec.bits._ import scodec._ @@ -21,4 +20,4 @@ object Query { Attempt.Successful(BitVector(barrʹ)) } -} \ No newline at end of file +} diff --git a/modules/docs/src/main/scala/mdoc/Main.scala b/modules/docs/src/main/scala/mdoc/Main.scala index 49de84ecd..e75eb214d 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) } diff --git a/project/build.properties b/project/build.properties index ee4c672cd..db1723b08 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 +sbt.version=1.10.5 diff --git a/project/plugins.sbt b/project/plugins.sbt index dddeeab23..1e65b1c52 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,10 +3,10 @@ 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.scoverage" % "sbt-scoverage" % "2.2.1") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.3.0")