From 92c0cfa3807da6c6fb7a0764b114217eed2ae65f Mon Sep 17 00:00:00 2001 From: Luka Jacobowitz Date: Mon, 29 Nov 2021 13:26:13 -0500 Subject: [PATCH 01/64] Flesh out Refined module a bit --- build.sbt | 3 +- .../src/main/scala/codec/NumericCodecs.scala | 43 ------------------- .../skunk/refined/codec/RefTypeCodecs.scala | 26 +++++++++++ .../skunk/refined/codec/RefinedCodecs.scala | 23 ++++++++++ .../scala/skunk/refined/codec/Syntax.scala | 26 +++++++++++ .../test/scala/codec/RefinedCodecTest.scala | 21 +++++++++ 6 files changed, 98 insertions(+), 44 deletions(-) delete mode 100644 modules/refined/src/main/scala/codec/NumericCodecs.scala create mode 100644 modules/refined/src/main/scala/skunk/refined/codec/RefTypeCodecs.scala create mode 100644 modules/refined/src/main/scala/skunk/refined/codec/RefinedCodecs.scala create mode 100644 modules/refined/src/main/scala/skunk/refined/codec/Syntax.scala create mode 100644 modules/tests/shared/src/test/scala/codec/RefinedCodecTest.scala diff --git a/build.sbt b/build.sbt index e28c31552..738bd969b 100644 --- a/build.sbt +++ b/build.sbt @@ -164,7 +164,7 @@ lazy val circe = crossProject(JVMPlatform, JSPlatform, NativePlatform) lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) .crossType(CrossType.Full) .in(file("modules/tests")) - .dependsOn(core, circe) + .dependsOn(core, circe, refined) .enablePlugins(AutomateHeaderPlugin, NoPublishPlugin) .settings(commonSettings) .settings( @@ -178,6 +178,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) "org.typelevel" %%% "cats-laws" % "2.9.0", "org.typelevel" %%% "discipline-munit" % "2.0.0-M3", "org.typelevel" %%% "cats-time" % "0.5.1", + "eu.timepit" %%% "refined-cats" % "0.10.3", ), testFrameworks += new TestFramework("munit.Framework"), testOptions += { diff --git a/modules/refined/src/main/scala/codec/NumericCodecs.scala b/modules/refined/src/main/scala/codec/NumericCodecs.scala deleted file mode 100644 index 92eb94977..000000000 --- a/modules/refined/src/main/scala/codec/NumericCodecs.scala +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) 2018-2021 by Rob Norris -// This software is licensed under the MIT License (MIT). -// For more information see LICENSE or https://opensource.org/licenses/MIT - -package skunk.refined.codec - -import eu.timepit.refined.boolean.And -import eu.timepit.refined.api.Validate -import skunk.Codec -import skunk.data.Type -import eu.timepit.refined._ -import eu.timepit.refined.api.Refined - -trait Scale[N] -trait Precision[N] - -trait NumericCodecs { - - def validateScale[N <: Int](n: Int): Validate.Plain[BigDecimal, Scale[N]] = - Validate.fromPredicate[BigDecimal, Scale[N]]( - _.scale <= n, d => s"($d has scale ≤ $n)", new Scale[N] {}) - - def validatePrecision[N <: Int](n: Int): Validate.Plain[BigDecimal, Precision[N]] = - Validate.fromPredicate[BigDecimal, Precision[N]]( - _.precision <= n, d => s"($d has precision ≤ $n)", new Precision[N] {}) - - implicit class NumericOps(num: Codec[BigDecimal]) { - def apply[S <: Int, P <: Int](precision: P, scale: S): Codec[BigDecimal Refined (Precision[P] And Scale[S])] = { - implicit val __s: Validate.Plain[BigDecimal, Scale[S]] = validateScale(scale) - implicit val __p: Validate.Plain[BigDecimal, Precision[P]] = validatePrecision(precision) - Codec.simple( - bd => bd.toString, - st => refineV[Precision[P] And Scale[S]](BigDecimal(st)), - Type.numeric - ) - } - } - - skunk.codec.numeric.numeric(3, 4) - -} - -object numeric extends NumericCodecs \ No newline at end of file diff --git a/modules/refined/src/main/scala/skunk/refined/codec/RefTypeCodecs.scala b/modules/refined/src/main/scala/skunk/refined/codec/RefTypeCodecs.scala new file mode 100644 index 000000000..97599501c --- /dev/null +++ b/modules/refined/src/main/scala/skunk/refined/codec/RefTypeCodecs.scala @@ -0,0 +1,26 @@ +// Copyright (c) 2018-2021 by Rob Norris +// This software is licensed under the MIT License (MIT). +// For more information see LICENSE or https://opensource.org/licenses/MIT + +package skunk.refined.codec + +import skunk.{ Codec, Encoder, Decoder } +import eu.timepit.refined.api.{ RefType, Validate } + +trait RefTypeCodecs { + def refTypeCodec[T, P, F[_,_]](codecT: Codec[T])( + implicit validate: Validate[T, P], refType: RefType[F]): Codec[F[T, P]] = + codecT.eimap[F[T,P]]( + refType.refine[P](_)(validate))( + refType.unwrap + ) + + def refTypeEncoder[T, P, F[_,_]](writeT: Encoder[T])(implicit refType: RefType[F]): Encoder[F[T,P]] = + writeT.contramap[F[T,P]](refType.unwrap) + + def refTypeDecoder[T, P, F[_,_]](readT: Decoder[T])( + implicit validate: Validate[T, P], refType: RefType[F]): Decoder[F[T,P]] = + readT.emap[F[T,P]](refType.refine[P](_)(validate)) +} + +object refType extends RefTypeCodecs diff --git a/modules/refined/src/main/scala/skunk/refined/codec/RefinedCodecs.scala b/modules/refined/src/main/scala/skunk/refined/codec/RefinedCodecs.scala new file mode 100644 index 000000000..6d4219b7e --- /dev/null +++ b/modules/refined/src/main/scala/skunk/refined/codec/RefinedCodecs.scala @@ -0,0 +1,23 @@ +// Copyright (c) 2018-2021 by Rob Norris +// This software is licensed under the MIT License (MIT). +// For more information see LICENSE or https://opensource.org/licenses/MIT + +package skunk.refined.codec + +import skunk.{ Codec, Encoder, Decoder } +import eu.timepit.refined.api.{ Refined, Validate } + +trait RefinedCodecs { + + def refinedCodec[T, P](codecT: Codec[T])(implicit v: Validate[T, P]): Codec[Refined[T, P]] = + refType.refTypeCodec[T, P, Refined](codecT) + + def refinedDecoder[T, P](decoderT: Decoder[T])(implicit v: Validate[T, P]): Decoder[Refined[T, P]] = + refType.refTypeDecoder[T, P, Refined](decoderT) + + def refinedEncoder[T, P](encoderT: Encoder[T]): Encoder[Refined[T, P]] = + refType.refTypeEncoder[T, P, Refined](encoderT) + +} + +object refined extends RefinedCodecs \ No newline at end of file diff --git a/modules/refined/src/main/scala/skunk/refined/codec/Syntax.scala b/modules/refined/src/main/scala/skunk/refined/codec/Syntax.scala new file mode 100644 index 000000000..3784fe15f --- /dev/null +++ b/modules/refined/src/main/scala/skunk/refined/codec/Syntax.scala @@ -0,0 +1,26 @@ +// Copyright (c) 2018-2021 by Rob Norris +// This software is licensed under the MIT License (MIT). +// For more information see LICENSE or https://opensource.org/licenses/MIT + +package skunk.refined.codec + +import skunk.{ Codec, Encoder, Decoder } +import eu.timepit.refined.api.{ Refined, Validate } + + +object syntax { + implicit class RefineCodecOps[T](val c: Codec[T]) { + def refine[P](implicit v: Validate[T, P]): Codec[Refined[T, P]] = + refined.refinedCodec(c) + } + + implicit class RefineEncoderOps[T](val c: Encoder[T]) { + def refine[P]: Encoder[Refined[T, P]] = + refined.refinedEncoder(c) + } + + implicit class RefineDecoderOps[T](val c: Decoder[T]) { + def refine[P](implicit v: Validate[T, P]): Decoder[Refined[T, P]] = + refined.refinedDecoder(c) + } +} diff --git a/modules/tests/shared/src/test/scala/codec/RefinedCodecTest.scala b/modules/tests/shared/src/test/scala/codec/RefinedCodecTest.scala new file mode 100644 index 000000000..97dd3ac91 --- /dev/null +++ b/modules/tests/shared/src/test/scala/codec/RefinedCodecTest.scala @@ -0,0 +1,21 @@ +// Copyright (c) 2018-2021 by Rob Norris +// This software is licensed under the MIT License (MIT). +// For more information see LICENSE or https://opensource.org/licenses/MIT + +package tests.codec + +import skunk.codec.all._ +import skunk.refined.codec.syntax._ +import eu.timepit.refined.collection.NonEmpty +import eu.timepit.refined.types.string.NonEmptyString +import eu.timepit.refined.types.numeric.{PosInt, NonNaNDouble} +import eu.timepit.refined.numeric.{Positive, NonNaN} +import eu.timepit.refined.cats._ + +class RefinedCodecTest extends CodecTest { + + roundtripTest(varchar.refine[NonEmpty])(NonEmptyString.unsafeFrom("foo")) + roundtripTest(int4.refine[Positive])(PosInt.unsafeFrom(42)) + roundtripTest(float8.refine[NonNaN])(NonNaNDouble.unsafeFrom(2.0)) + +} From 1aa3ccd77f451eb26abf4ed0ba272f5842f60b3f Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 16 Jun 2023 20:08:11 +0000 Subject: [PATCH 02/64] Update refined to 0.11.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e28c31552..153c85774 100644 --- a/build.sbt +++ b/build.sbt @@ -143,7 +143,7 @@ lazy val refined = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings( name := "skunk-refined", libraryDependencies ++= Seq( - "eu.timepit" %%% "refined" % "0.10.3", + "eu.timepit" %%% "refined" % "0.11.0", ) ) From 6b77382decb018ed86d761c4631c5aeecedc4cd0 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 12 Jul 2023 09:18:30 -0700 Subject: [PATCH 03/64] Remove more unused plugins --- project/plugins.sbt | 2 -- 1 file changed, 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9b6f444be..842689c32 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,8 +5,6 @@ ThisBuild / libraryDependencySchemes ++= Seq( addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.20") addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.20") -addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") From f271cb3148623c80c7ebcd5b3cb06c4cc1d17eba Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 10 Aug 2023 20:36:50 +0000 Subject: [PATCH 04/64] Update to sbt-typelevel 0.5.0 --- .github/workflows/ci.yml | 263 +++++++++--------- build.sbt | 26 +- .../src/main/scala/net/message/openssl.scala | 3 + .../scala-2/syntax/StringContextOps.scala | 2 +- .../shared/src/main/scala-3/SqlState.scala | 1 - .../src/main/scala-3/util/Twiddler.scala | 1 - .../src/main/scala/codec/TemporalCodecs.scala | 1 + .../src/main/scala/net/message/Bind.scala | 1 - .../src/main/scala/net/message/Execute.scala | 1 - .../src/main/scala/net/message/Parse.scala | 1 - .../net/message/SASLInitialResponse.scala | 1 - .../scala/net/message/StartupMessage.scala | 1 - .../src/main/scala/net/protocol/Close.scala | 1 - .../src/main/scala/net/protocol/Parse.scala | 2 +- .../core/shared/src/main/scala/package.scala | 6 +- project/build.properties | 2 +- project/plugins.sbt | 6 +- 17 files changed, 155 insertions(+), 164 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4e70fb74..d0674ef6d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,56 +15,42 @@ on: tags: [v*] env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +concurrency: + group: ${{ github.workflow }} @ ${{ github.ref }} + cancel-in-progress: true + jobs: build: name: Build and Test strategy: matrix: os: [ubuntu-latest] - scala: [2.12.17, 2.13.10, 3.2.2] + scala: [2.12, 2.13, 3] java: [temurin@11] - project: [rootJS, rootJVM, rootNative] + project: [skunkJS, skunkJVM, skunkNative] runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: - name: Checkout current branch (full) uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Download Java (temurin@11) - id: download-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 11 - - name: Setup Java (temurin@11) + id: setup-java-temurin-11 if: matrix.java == 'temurin@11' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 11 - jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update - name: Start up Postgres run: | @@ -73,22 +59,22 @@ jobs: docker-compose up -d - name: Install brew formulae (ubuntu) - if: (matrix.project == 'rootNative') && startsWith(matrix.os, 'ubuntu') + if: (matrix.project == 'skunkNative') && startsWith(matrix.os, 'ubuntu') run: /home/linuxbrew/.linuxbrew/bin/brew install s2n utf8proc - name: Check that workflows are up to date run: sbt githubWorkflowCheck - - name: Check headers and formatting + - name: Check headers if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest' - run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll - name: scalaJSLink - if: matrix.project == 'rootJS' + if: matrix.project == 'skunkJS' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult - name: nativeLink - if: matrix.project == 'rootNative' + if: matrix.project == 'skunkNative' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink - name: Test @@ -104,11 +90,11 @@ jobs: - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.6.x') - run: mkdir -p modules/circe/.jvm/target target unidocs/target .js/target modules/core/native/target modules/docs/target modules/core/js/target modules/circe/.js/target modules/core/jvm/target modules/tests/js/target modules/refined/.native/target .jvm/target .native/target modules/refined/.js/target modules/refined/.jvm/target modules/circe/.native/target modules/tests/jvm/target modules/example/target modules/tests/native/target project/target + run: mkdir -p modules/circe/.jvm/target unidocs/target modules/core/native/target modules/core/js/target modules/circe/.js/target modules/core/jvm/target modules/refined/.native/target modules/refined/.js/target modules/refined/.jvm/target modules/circe/.native/target project/target - name: Compress target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.6.x') - run: tar cf targets.tar modules/circe/.jvm/target target unidocs/target .js/target modules/core/native/target modules/docs/target modules/core/js/target modules/circe/.js/target modules/core/jvm/target modules/tests/js/target modules/refined/.native/target .jvm/target .native/target modules/refined/.js/target modules/refined/.jvm/target modules/circe/.native/target modules/tests/jvm/target modules/example/target modules/tests/native/target project/target + run: tar cf targets.tar modules/circe/.jvm/target unidocs/target modules/core/native/target modules/core/js/target modules/circe/.js/target modules/core/jvm/target modules/refined/.native/target modules/refined/.js/target modules/refined/.jvm/target modules/circe/.native/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.6.x') @@ -124,7 +110,6 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -133,33 +118,18 @@ jobs: with: fetch-depth: 0 - - name: Download Java (temurin@11) - id: download-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 11 - - name: Setup Java (temurin@11) + id: setup-java-temurin-11 if: matrix.java == 'temurin@11' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 11 - jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update - name: Start up Postgres run: | @@ -167,116 +137,126 @@ jobs: export SERVER_CERT=$(cat world/server.crt) docker-compose up -d - - name: Download target directories (2.12.17, rootJS) + - name: Download target directories (2.12, skunkJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-skunkJS - - name: Inflate target directories (2.12.17, rootJS) + - name: Inflate target directories (2.12, skunkJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.17, rootJVM) + - name: Download target directories (2.12, skunkJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-skunkJVM - - name: Inflate target directories (2.12.17, rootJVM) + - name: Inflate target directories (2.12, skunkJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.17, rootNative) + - name: Download target directories (2.12, skunkNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-skunkNative - - name: Inflate target directories (2.12.17, rootNative) + - name: Inflate target directories (2.12, skunkNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.10, rootJS) + - name: Download target directories (2.13, skunkJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-skunkJS - - name: Inflate target directories (2.13.10, rootJS) + - name: Inflate target directories (2.13, skunkJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.10, rootJVM) + - name: Download target directories (2.13, skunkJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-skunkJVM - - name: Inflate target directories (2.13.10, rootJVM) + - name: Inflate target directories (2.13, skunkJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.10, rootNative) + - name: Download target directories (2.13, skunkNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-skunkNative - - name: Inflate target directories (2.13.10, rootNative) + - name: Inflate target directories (2.13, skunkNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.2, rootJS) + - name: Download target directories (3, skunkJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3-skunkJS - - name: Inflate target directories (3.2.2, rootJS) + - name: Inflate target directories (3, skunkJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.2, rootJVM) + - name: Download target directories (3, skunkJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3-skunkJVM - - name: Inflate target directories (3.2.2, rootJVM) + - name: Inflate target directories (3, skunkJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.2, rootNative) + - name: Download target directories (3, skunkNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3-skunkNative - - name: Inflate target directories (3.2.2, rootNative) + - name: Inflate target directories (3, skunkNative) run: | tar xf targets.tar rm targets.tar - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} run: echo $PGP_SECRET | base64 -di | gpg --import - name: Import signing key and strip passphrase if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != '' + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} run: | echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1) - name: Publish - run: sbt '++ ${{ matrix.scala }}' tlCiRelease - - coverage: - name: Generate coverage report (2.13.10 JVM only) + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} + run: sbt tlCiRelease + + dependency-submission: + name: Submit Dependencies + if: github.event_name != 'pull_request' strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -285,33 +265,18 @@ jobs: with: fetch-depth: 0 - - name: Download Java (temurin@11) - id: download-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 11 - - name: Setup Java (temurin@11) + id: setup-java-temurin-11 if: matrix.java == 'temurin@11' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 11 - jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update - name: Start up Postgres run: | @@ -319,17 +284,17 @@ jobs: export SERVER_CERT=$(cat world/server.crt) docker-compose up -d - - run: sbt '++ ${{ matrix.scala }}' coverage rootJVM/test coverageReport - - - name: Upload code coverage data - run: 'bash <(curl -s https://codecov.io/bash)' + - name: Submit Dependencies + uses: scalacenter/sbt-dependency-submission@v2 + with: + modules-ignore: skunk_2.12 skunk_2.13 skunk_3 docs_2.12 docs_2.13 docs_3 skunk_2.12 skunk_2.13 skunk_3 skunk_2.12 skunk_2.13 skunk_3 tests_sjs1_2.12 tests_sjs1_2.13 tests_sjs1_3 tests_2.12 tests_2.13 tests_3 example_2.12 example_2.13 example_3 tests_native0.4_2.12 tests_native0.4_2.13 tests_native0.4_3 + configs-ignore: test scala-tool scala-doc-tool test-internal site: name: Generate Site strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -338,33 +303,18 @@ jobs: with: fetch-depth: 0 - - name: Download Java (temurin@11) - id: download-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 11 - - name: Setup Java (temurin@11) + id: setup-java-temurin-11 if: matrix.java == 'temurin@11' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 11 - jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update - name: Start up Postgres run: | @@ -373,12 +323,49 @@ jobs: docker-compose up -d - name: Generate site - run: sbt '++ ${{ matrix.scala }}' docs/tlSite + run: sbt docs/tlSite - name: Publish site if: github.event_name != 'pull_request' && github.ref == 'refs/heads/series/0.6.x' - uses: peaceiris/actions-gh-pages@v3.9.0 + uses: peaceiris/actions-gh-pages@v3.9.3 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: modules/docs/target/docs/site keep_files: true + + coverage: + name: Generate coverage report (2.13 JVM only) + strategy: + matrix: + os: [ubuntu-latest] + scala: [2.13.10] + java: [temurin@11] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update + + - name: Start up Postgres + run: | + export SERVER_KEY=$(cat world/server.key) + export SERVER_CERT=$(cat world/server.crt) + docker-compose up -d + + - run: sbt '++ ${{ matrix.scala }}' coverage skunkJVM/test coverageReport + + - uses: codecov/codecov-action@v3 diff --git a/build.sbt b/build.sbt index c563d46b5..601364d48 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ ThisBuild / tlBaseVersion := "0.6" // Our Scala versions. lazy val `scala-2.12` = "2.12.17" lazy val `scala-2.13` = "2.13.10" -lazy val `scala-3.0` = "3.2.2" +lazy val `scala-3.0` = "3.3.0" ThisBuild / scalaVersion := `scala-2.13` ThisBuild / crossScalaVersions := @@ -16,6 +16,7 @@ ThisBuild / developers := List( ) ThisBuild / tlCiReleaseBranches += "series/0.6.x" +ThisBuild / tlCiScalafmtCheck := false ThisBuild / tlSitePublishBranch := Some("series/0.6.x") ThisBuild / tlSonatypeUseLegacyHost := false ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest") @@ -23,7 +24,7 @@ ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11")) ThisBuild / tlJdkRelease := Some(8) ThisBuild / githubWorkflowBuildPreamble ++= nativeBrewInstallWorkflowSteps.value -ThisBuild / nativeBrewInstallCond := Some("matrix.project == 'rootNative'") +ThisBuild / nativeBrewInstallCond := Some("matrix.project == 'skunkNative'") lazy val setupCertAndDocker = Seq( WorkflowStep.Run( @@ -38,15 +39,12 @@ ThisBuild / tlCiHeaderCheck := true ThisBuild / githubWorkflowAddedJobs += WorkflowJob( id = "coverage", - name = s"Generate coverage report (${`scala-2.13`} JVM only)", + name = s"Generate coverage report (2.13 JVM only)", scalas = List(`scala-2.13`), steps = githubWorkflowJobSetup.value.toList ++ List( - WorkflowStep.Sbt(List("coverage", "rootJVM/test", "coverageReport")), - WorkflowStep.Run( - List("bash <(curl -s https://codecov.io/bash)"), - name = Some("Upload code coverage data") - ) + WorkflowStep.Sbt(List("coverage", "skunkJVM/test", "coverageReport")), + WorkflowStep.Use(UseRef.Public("codecov", "codecov-action", "v3")) ) ) @@ -83,7 +81,7 @@ lazy val commonSettings = Seq( // Compilation scalacOptions -= "-language:experimental.macros", // doesn't work cross-version - Compile / doc / scalacOptions --= Seq("-Xfatal-warnings"), + Compile / doc / scalacOptions --= Seq("-Werror"), Compile / doc / scalacOptions ++= Seq( "-groups", "-sourcepath", (LocalRootProject / baseDirectory).value.getAbsolutePath, @@ -110,7 +108,6 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings( name := "skunk-core", description := "Tagless, non-blocking data access library for Postgres.", - scalacOptions ~= (_.filterNot(_ == "-source:3.0-migration")), libraryDependencies ++= Seq( "org.typelevel" %%% "cats-core" % "2.9.0", "org.typelevel" %%% "cats-effect" % "3.5.0", @@ -170,7 +167,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) .enablePlugins(AutomateHeaderPlugin, NoPublishPlugin) .settings(commonSettings) .settings( - scalacOptions -= "-Xfatal-warnings", + tlFatalWarnings := false, libraryDependencies ++= Seq( "org.scalameta" %%% "munit" % "1.0.0-M7", "org.scalameta" % "junit-interface" % "1.0.0-M7", @@ -233,7 +230,14 @@ lazy val docs = project .enablePlugins(TypelevelSitePlugin) .settings(commonSettings) .settings( + scalacOptions ~= { + _.map { + case opt if opt.startsWith("-Xlint") => s"$opt,-missing-interpolator" + case opt => opt + } + }, mdocIn := (Compile / sourceDirectory).value / "laika", + tlSiteIsTypelevelProject := Some(TypelevelProject.Affiliate), libraryDependencies ++= Seq( "org.tpolecat" %%% "natchez-jaeger" % natchezVersion, ), diff --git a/modules/core/native/src/main/scala/net/message/openssl.scala b/modules/core/native/src/main/scala/net/message/openssl.scala index 4efc92735..f5a03d7ed 100644 --- a/modules/core/native/src/main/scala/net/message/openssl.scala +++ b/modules/core/native/src/main/scala/net/message/openssl.scala @@ -4,8 +4,11 @@ package skunk.net.message +import org.typelevel.scalaccompat.annotation._ + import scala.scalanative.unsafe._ +@nowarn212 @link("crypto") @extern private[message] object openssl { diff --git a/modules/core/shared/src/main/scala-2/syntax/StringContextOps.scala b/modules/core/shared/src/main/scala-2/syntax/StringContextOps.scala index 4c51f88aa..b775256f6 100644 --- a/modules/core/shared/src/main/scala-2/syntax/StringContextOps.scala +++ b/modules/core/shared/src/main/scala-2/syntax/StringContextOps.scala @@ -149,7 +149,7 @@ object StringContextOps { } def identifier_impl(): Tree = { - val Apply(_, List(Apply(_, List(Literal(Constant(part: String)))))) = c.prefix.tree + val Apply(_, List(Apply(_, List(Literal(Constant(part: String)))))) = c.prefix.tree: @unchecked Identifier.fromString(part) match { case Left(s) => c.abort(c.enclosingPosition, s) case Right(Identifier(s)) => q"_root_.skunk.data.Identifier.fromString($s).fold(sys.error, identity)" diff --git a/modules/core/shared/src/main/scala-3/SqlState.scala b/modules/core/shared/src/main/scala-3/SqlState.scala index 70a0b9740..e6eb4df57 100644 --- a/modules/core/shared/src/main/scala-3/SqlState.scala +++ b/modules/core/shared/src/main/scala-3/SqlState.scala @@ -4,7 +4,6 @@ package skunk -import scala.collection.immutable.IndexedSeq import skunk.exception.PostgresErrorException /** diff --git a/modules/core/shared/src/main/scala-3/util/Twiddler.scala b/modules/core/shared/src/main/scala-3/util/Twiddler.scala index b905fb921..cc18342aa 100644 --- a/modules/core/shared/src/main/scala-3/util/Twiddler.scala +++ b/modules/core/shared/src/main/scala-3/util/Twiddler.scala @@ -6,7 +6,6 @@ package skunk package util import scala.annotation.implicitNotFound -import scala.quoted._ import scala.deriving.Mirror import skunk.implicits._ diff --git a/modules/core/shared/src/main/scala/codec/TemporalCodecs.scala b/modules/core/shared/src/main/scala/codec/TemporalCodecs.scala index 99ddfdf25..a9f8b2074 100644 --- a/modules/core/shared/src/main/scala/codec/TemporalCodecs.scala +++ b/modules/core/shared/src/main/scala/codec/TemporalCodecs.scala @@ -49,6 +49,7 @@ trait TemporalCodecs { .optionalStart .appendFraction(NANO_OF_SECOND, 0, precision, true) .optionalEnd + () } requiredPart.toFormatter(Locale.US) diff --git a/modules/core/shared/src/main/scala/net/message/Bind.scala b/modules/core/shared/src/main/scala/net/message/Bind.scala index 2231da3c4..aecb9fab9 100644 --- a/modules/core/shared/src/main/scala/net/message/Bind.scala +++ b/modules/core/shared/src/main/scala/net/message/Bind.scala @@ -5,7 +5,6 @@ package skunk.net.message import cats.syntax.all._ -import scodec.interop.cats._ import scodec._ import scodec.codecs._ diff --git a/modules/core/shared/src/main/scala/net/message/Execute.scala b/modules/core/shared/src/main/scala/net/message/Execute.scala index 59b402bea..a6bc54cd4 100644 --- a/modules/core/shared/src/main/scala/net/message/Execute.scala +++ b/modules/core/shared/src/main/scala/net/message/Execute.scala @@ -5,7 +5,6 @@ package skunk.net.message import cats.syntax.all._ -import scodec.interop.cats._ import scodec.codecs._ import scodec.Encoder diff --git a/modules/core/shared/src/main/scala/net/message/Parse.scala b/modules/core/shared/src/main/scala/net/message/Parse.scala index 50f8737a6..1137cb92f 100644 --- a/modules/core/shared/src/main/scala/net/message/Parse.scala +++ b/modules/core/shared/src/main/scala/net/message/Parse.scala @@ -5,7 +5,6 @@ package skunk.net.message import cats.syntax.all._ -import scodec.interop.cats._ import scodec.codecs._ import scodec.Encoder diff --git a/modules/core/shared/src/main/scala/net/message/SASLInitialResponse.scala b/modules/core/shared/src/main/scala/net/message/SASLInitialResponse.scala index 76b1e58af..2a3b56f99 100644 --- a/modules/core/shared/src/main/scala/net/message/SASLInitialResponse.scala +++ b/modules/core/shared/src/main/scala/net/message/SASLInitialResponse.scala @@ -5,7 +5,6 @@ package skunk.net.message import cats.syntax.all._ -import scodec.interop.cats._ import scodec.Encoder import scodec.bits.ByteVector import scodec.codecs.{bytes, int32, variableSizeBytes} diff --git a/modules/core/shared/src/main/scala/net/message/StartupMessage.scala b/modules/core/shared/src/main/scala/net/message/StartupMessage.scala index ae9a2af73..74df24924 100644 --- a/modules/core/shared/src/main/scala/net/message/StartupMessage.scala +++ b/modules/core/shared/src/main/scala/net/message/StartupMessage.scala @@ -5,7 +5,6 @@ package skunk.net.message import cats.syntax.all._ -import scodec.interop.cats._ import scodec._ import scodec.codecs._ diff --git a/modules/core/shared/src/main/scala/net/protocol/Close.scala b/modules/core/shared/src/main/scala/net/protocol/Close.scala index 573f37581..eb9f324af 100644 --- a/modules/core/shared/src/main/scala/net/protocol/Close.scala +++ b/modules/core/shared/src/main/scala/net/protocol/Close.scala @@ -8,7 +8,6 @@ package protocol import cats.FlatMap import cats.syntax.all._ import skunk.net.message.{ Close => CloseMessage, Flush, CloseComplete } -import skunk.net.MessageSocket import natchez.Trace trait Close[F[_]] { diff --git a/modules/core/shared/src/main/scala/net/protocol/Parse.scala b/modules/core/shared/src/main/scala/net/protocol/Parse.scala index 3ff2aea7f..bfa56d945 100644 --- a/modules/core/shared/src/main/scala/net/protocol/Parse.scala +++ b/modules/core/shared/src/main/scala/net/protocol/Parse.scala @@ -43,7 +43,7 @@ object Parse { _ <- Trace[F].put( "statement-name" -> id.value, "statement-sql" -> statement.sql, - "statement-parameter-types" -> os.map(n => ty.typeForOid(n, -1).getOrElse(n)).mkString("[", ", ", "]") + "statement-parameter-types" -> os.map(n => ty.typeForOid(n, -1).fold(n.toString)(_.toString)).mkString("[", ", ", "]") ) _ <- send(ParseMessage(id.value, statement.sql, os)) _ <- send(Flush) diff --git a/modules/core/shared/src/main/scala/package.scala b/modules/core/shared/src/main/scala/package.scala index 649b2ff29..c23e2129b 100644 --- a/modules/core/shared/src/main/scala/package.scala +++ b/modules/core/shared/src/main/scala/package.scala @@ -2,7 +2,10 @@ // This software is licensed under the MIT License (MIT). // For more information see LICENSE or https://opensource.org/licenses/MIT +package skunk + import cats.effect.Resource +import org.typelevel.scalaccompat.annotation._ import org.typelevel.twiddles.TwiddleCompat /** @@ -123,7 +126,8 @@ import org.typelevel.twiddles.TwiddleCompat * @groupname Companions Companion Objects * @groupprio Companions 999 */ -package object skunk extends TwiddleCompat { +@nowarn213("msg=package object inheritance is deprecated") +object `package` extends TwiddleCompat { // aka package object skunk, yes this actually works ... // we can use this to defeat value discarding warnings for erasable proof terms private[skunk] def void(a: Any*): Unit = (a, ())._2 diff --git a/project/build.properties b/project/build.properties index 46e43a97e..52413ab79 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.3 diff --git a/project/plugins.sbt b/project/plugins.sbt index 842689c32..061bfeee1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,12 +3,12 @@ ThisBuild / libraryDependencySchemes ++= Seq( "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always ) -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.20") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.20") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-RC11") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-RC11") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") -addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.1.3") +addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") From a7c23d0a1398a3d8f7b22003a96cefd97e35fe47 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 11 Aug 2023 20:08:40 +0000 Subject: [PATCH 05/64] Update opentelemetry-exporter-otlp, ... to 1.29.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 5d6d7a79a..e44cf7204 100644 --- a/build.sbt +++ b/build.sbt @@ -60,7 +60,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( // This is used in a couple places lazy val fs2Version = "3.7.0" -lazy val openTelemetryVersion = "1.28.0" +lazy val openTelemetryVersion = "1.29.0" lazy val otel4sVersion = "0.2.1" // Global Settings From 7dcb8af04439f2f8bc6120320e8794cda862ce75 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:57:17 +0000 Subject: [PATCH 06/64] Update fs2-core, fs2-io to 3.8.0 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 601364d48..2687d8993 100644 --- a/build.sbt +++ b/build.sbt @@ -59,7 +59,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( ) // This is used in a couple places -lazy val fs2Version = "3.7.0" +lazy val fs2Version = "3.8.0" lazy val natchezVersion = "0.3.1" // Global Settings From 7a2444ebf69547ee5c6bf1fe615796e607093c1a Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:57:29 +0000 Subject: [PATCH 07/64] Update epollcat to 0.1.5 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 601364d48..c7bbd1a56 100644 --- a/build.sbt +++ b/build.sbt @@ -191,7 +191,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) ) .nativeEnablePlugins(ScalaNativeBrewedConfigPlugin) .nativeSettings( - libraryDependencies += "com.armanbilge" %%% "epollcat" % "0.1.4", + libraryDependencies += "com.armanbilge" %%% "epollcat" % "0.1.5", Test / nativeBrewFormulas ++= Set("s2n", "utf8proc"), Test / envVars ++= Map("S2N_DONT_MLOCK" -> "1") ) From 83841ff1cfd8bc97348d68d68949fd984d8cdf56 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:57:40 +0000 Subject: [PATCH 08/64] Update enumeratum to 1.7.3 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 601364d48..20d460d63 100644 --- a/build.sbt +++ b/build.sbt @@ -121,7 +121,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) "org.scala-lang.modules" %%% "scala-collection-compat" % "2.10.0", "org.typelevel" %%% "twiddles-core" % "0.6.0", ) ++ Seq( - "com.beachape" %%% "enumeratum" % "1.7.2", + "com.beachape" %%% "enumeratum" % "1.7.3", ).filterNot(_ => tlIsScala3.value) ).jvmSettings( libraryDependencies += "com.ongres.scram" % "client" % "2.1", From 9b9d3ca83686c00512f74d852d0d33337987f44d Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:58:04 +0000 Subject: [PATCH 09/64] Update sbt-scala-native-crossproject to 1.3.2 in series/0.6.x --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 061bfeee1..ad34df62f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,5 +10,5 @@ addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") From 1cb45141f127ca930254cfa78122c9b424969e1a Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:58:14 +0000 Subject: [PATCH 10/64] Update sbt-scalajs to 1.13.2 in series/0.6.x --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 061bfeee1..767dcf5e4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-RC11") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") From c43941b7ffef58ef80eb4967c180191bea6a48e2 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:58:26 +0000 Subject: [PATCH 11/64] Update scala-library to 2.12.18 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 601364d48..c12bb9083 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.17" +lazy val `scala-2.12` = "2.12.18" lazy val `scala-2.13` = "2.13.10" lazy val `scala-3.0` = "3.3.0" From 667e05f0ec1982aedc66d2645c6e3558492da2cc Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 16 Aug 2023 09:58:44 -0700 Subject: [PATCH 12/64] Remove unused dep --- project/plugins.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ad34df62f..8e499ea2c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,5 +10,4 @@ addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") From e54f7dbf97e1b0a81968c26293a42b4740cb16b0 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:59:08 +0000 Subject: [PATCH 13/64] Update scala-library to 2.13.11 in series/0.6.x --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0674ef6d..a5b3fcc1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -338,7 +338,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10] + scala: [2.13.11] java: [temurin@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 601364d48..c92d05805 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ ThisBuild / tlBaseVersion := "0.6" // Our Scala versions. lazy val `scala-2.12` = "2.12.17" -lazy val `scala-2.13` = "2.13.10" +lazy val `scala-2.13` = "2.13.11" lazy val `scala-3.0` = "3.3.0" ThisBuild / scalaVersion := `scala-2.13` From 2af3d66612933920a97e702aa140044175117b1d Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:59:41 +0000 Subject: [PATCH 14/64] Update scala-collection-compat to 2.11.0 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 601364d48..ca5cfca82 100644 --- a/build.sbt +++ b/build.sbt @@ -118,7 +118,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) "org.scodec" %%% "scodec-cats" % "1.2.0", "org.tpolecat" %%% "natchez-core" % natchezVersion, "org.tpolecat" %%% "sourcepos" % "1.1.0", - "org.scala-lang.modules" %%% "scala-collection-compat" % "2.10.0", + "org.scala-lang.modules" %%% "scala-collection-compat" % "2.11.0", "org.typelevel" %%% "twiddles-core" % "0.6.0", ) ++ Seq( "com.beachape" %%% "enumeratum" % "1.7.2", From 7078d39db549e83a4a894ba32ee8ce16c1b75373 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:59:53 +0000 Subject: [PATCH 15/64] Update sbt-scala-native to 0.4.14 in series/0.6.x --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 061bfeee1..ae0924f3e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,6 +9,6 @@ addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") From 90e591937166aa02e45ae4cff19165a1181c4588 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:00:03 +0000 Subject: [PATCH 16/64] Update junit-interface, munit to 1.0.0-M8 in series/0.6.x --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 601364d48..50ebe9784 100644 --- a/build.sbt +++ b/build.sbt @@ -169,8 +169,8 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings( tlFatalWarnings := false, libraryDependencies ++= Seq( - "org.scalameta" %%% "munit" % "1.0.0-M7", - "org.scalameta" % "junit-interface" % "1.0.0-M7", + "org.scalameta" %%% "munit" % "1.0.0-M8", + "org.scalameta" % "junit-interface" % "1.0.0-M8", "org.typelevel" %%% "scalacheck-effect-munit" % "2.0.0-M2", "org.typelevel" %%% "munit-cats-effect" % "2.0.0-M3", "org.typelevel" %%% "cats-free" % "2.9.0", From f0ad30afe9ec054ca1f112ca298de81c865d25da Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:00:13 +0000 Subject: [PATCH 17/64] Update scalafmt-core to 3.7.12 in series/0.6.x --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index b9797fee4..ea53a263b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.7.3" +version = "3.7.12" runner.dialect = Scala213Source3 project.includePaths = [] # disables formatting From 4047661eb60f38514fe0fb27e0ad4e7f56829ad7 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:00:26 +0000 Subject: [PATCH 18/64] Update sbt-scoverage to 2.0.8 in series/0.6.x --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 061bfeee1..c27cd41e6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-RC11") addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-RC11") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") From 4ca361e69b36b107ad294f00aedf48dca1d43a74 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:00:46 +0000 Subject: [PATCH 19/64] Update natchez-core, natchez-honeycomb, ... to 0.3.3 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 601364d48..b421ceb5d 100644 --- a/build.sbt +++ b/build.sbt @@ -60,7 +60,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( // This is used in a couple places lazy val fs2Version = "3.7.0" -lazy val natchezVersion = "0.3.1" +lazy val natchezVersion = "0.3.3" // Global Settings lazy val commonSettings = Seq( From 79f2b2ef5cee5aa5828ba53340d5680c7cb888d7 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:00:58 +0000 Subject: [PATCH 20/64] Update cats-core, cats-free, cats-laws to 2.10.0 in series/0.6.x --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 601364d48..c7c299035 100644 --- a/build.sbt +++ b/build.sbt @@ -109,7 +109,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) name := "skunk-core", description := "Tagless, non-blocking data access library for Postgres.", libraryDependencies ++= Seq( - "org.typelevel" %%% "cats-core" % "2.9.0", + "org.typelevel" %%% "cats-core" % "2.10.0", "org.typelevel" %%% "cats-effect" % "3.5.0", "co.fs2" %%% "fs2-core" % fs2Version, "co.fs2" %%% "fs2-io" % fs2Version, @@ -173,8 +173,8 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) "org.scalameta" % "junit-interface" % "1.0.0-M7", "org.typelevel" %%% "scalacheck-effect-munit" % "2.0.0-M2", "org.typelevel" %%% "munit-cats-effect" % "2.0.0-M3", - "org.typelevel" %%% "cats-free" % "2.9.0", - "org.typelevel" %%% "cats-laws" % "2.9.0", + "org.typelevel" %%% "cats-free" % "2.10.0", + "org.typelevel" %%% "cats-laws" % "2.10.0", "org.typelevel" %%% "discipline-munit" % "2.0.0-M3", "org.typelevel" %%% "cats-time" % "0.5.1", ), From de270b29870a588a6b25e04f30fcf68da9fea773 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:01:09 +0000 Subject: [PATCH 21/64] Update cats-effect to 3.5.1 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 601364d48..f8f0490e1 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.9.0", - "org.typelevel" %%% "cats-effect" % "3.5.0", + "org.typelevel" %%% "cats-effect" % "3.5.1", "co.fs2" %%% "fs2-core" % fs2Version, "co.fs2" %%% "fs2-io" % fs2Version, "org.scodec" %%% "scodec-bits" % "1.1.37", From 0a28440cf79554b974bf3d74b589a4dcab24d236 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:01:20 +0000 Subject: [PATCH 22/64] Update sbt-typelevel, sbt-typelevel-site to 0.5.0-RC12 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 061bfeee1..954d1e778 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.5.0-RC11") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-RC11") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-RC12") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-RC12") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") From 4451a5e3f04dc8dcb83dd2e2154efee686822dbe Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 16 Aug 2023 10:14:32 -0700 Subject: [PATCH 23/64] Pin refined to 0.10.x in series/0.6 --- .scala-steward.conf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .scala-steward.conf diff --git a/.scala-steward.conf b/.scala-steward.conf new file mode 100644 index 000000000..37a45d8fb --- /dev/null +++ b/.scala-steward.conf @@ -0,0 +1,3 @@ +updates.pin = [ + { groupId = "eu.timepit", artifactId = "refined", version = "0.10" } +] From 49f454ca4450bb0a2feaa037d7ad8469e32ca8be Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 16 Aug 2023 10:15:04 -0700 Subject: [PATCH 24/64] Add trailing `.` --- .scala-steward.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index 37a45d8fb..f5de923ea 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -1,3 +1,3 @@ updates.pin = [ - { groupId = "eu.timepit", artifactId = "refined", version = "0.10" } + { groupId = "eu.timepit", artifactId = "refined", version = "0.10." } ] From 96eedc4997d9e8e94e59745676e847d95e10177d Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:24:59 +0000 Subject: [PATCH 25/64] Revert commit(s) e54f7db --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5b3fcc1d..d0674ef6d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -338,7 +338,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.11] + scala: [2.13.10] java: [temurin@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index c92d05805..601364d48 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ ThisBuild / tlBaseVersion := "0.6" // Our Scala versions. lazy val `scala-2.12` = "2.12.17" -lazy val `scala-2.13` = "2.13.11" +lazy val `scala-2.13` = "2.13.10" lazy val `scala-3.0` = "3.3.0" ThisBuild / scalaVersion := `scala-2.13` From 0421f79758e78d77b7478911991f58ddb1248d58 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:25:02 +0000 Subject: [PATCH 26/64] Update scala-library to 2.13.11 in series/0.6.x --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0674ef6d..a5b3fcc1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -338,7 +338,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10] + scala: [2.13.11] java: [temurin@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index d9eb51f67..1d6a775fa 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ ThisBuild / tlBaseVersion := "0.6" // Our Scala versions. lazy val `scala-2.12` = "2.12.18" -lazy val `scala-2.13` = "2.13.10" +lazy val `scala-2.13` = "2.13.11" lazy val `scala-3.0` = "3.3.0" ThisBuild / scalaVersion := `scala-2.13` From 543de16855d0ad52b63b1fd96e96fa4d59f2e72f Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:25:47 +0000 Subject: [PATCH 27/64] Revert commit(s) 7078d39 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ae0924f3e..061bfeee1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,6 +9,6 @@ addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") From baf540147e403ad14589dc64beb0d702c7e7f4cc Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:25:49 +0000 Subject: [PATCH 28/64] Update sbt-scala-native to 0.4.14 in series/0.6.x --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5f7214fae..f8ecf61d1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,5 +9,5 @@ addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") From 35aa7a47771587abd265822cc27cf0c8bb92e76d Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:25:55 +0000 Subject: [PATCH 29/64] Revert commit(s) 4047661 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c27cd41e6..061bfeee1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-RC11") addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-RC11") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") From dfa65a82b39a9c28561cd1d993de7bab16116a85 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:25:57 +0000 Subject: [PATCH 30/64] Update sbt-scoverage to 2.0.8 in series/0.6.x --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5f7214fae..274214ee6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-RC11") addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-RC11") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") From a0f6bd869aa52066bd50b93f6395f8af3ae0dbdd Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:26:14 +0000 Subject: [PATCH 31/64] Revert commit(s) 4ca361e --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b421ceb5d..601364d48 100644 --- a/build.sbt +++ b/build.sbt @@ -60,7 +60,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( // This is used in a couple places lazy val fs2Version = "3.7.0" -lazy val natchezVersion = "0.3.3" +lazy val natchezVersion = "0.3.1" // Global Settings lazy val commonSettings = Seq( From fcd48e14af108cab497707fc7252f3fe5b876959 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:26:16 +0000 Subject: [PATCH 32/64] Update natchez-core, natchez-honeycomb, ... to 0.3.3 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d9eb51f67..7218a02b5 100644 --- a/build.sbt +++ b/build.sbt @@ -60,7 +60,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( // This is used in a couple places lazy val fs2Version = "3.8.0" -lazy val natchezVersion = "0.3.1" +lazy val natchezVersion = "0.3.3" // Global Settings lazy val commonSettings = Seq( From 4f21132e9bfafb47d1cac9e5a1e4fd0a0e8d7a8b Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 16 Aug 2023 17:28:12 +0000 Subject: [PATCH 33/64] Regenerate workflow --- .github/workflows/ci.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0674ef6d..5e2c5be5f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -290,6 +290,31 @@ jobs: modules-ignore: skunk_2.12 skunk_2.13 skunk_3 docs_2.12 docs_2.13 docs_3 skunk_2.12 skunk_2.13 skunk_3 skunk_2.12 skunk_2.13 skunk_3 tests_sjs1_2.12 tests_sjs1_2.13 tests_sjs1_3 tests_2.12 tests_2.13 tests_3 example_2.12 example_2.13 example_3 tests_native0.4_2.12 tests_native0.4_2.13 tests_native0.4_3 configs-ignore: test scala-tool scala-doc-tool test-internal + validate-steward: + name: Validate Steward Config + strategy: + matrix: + os: [ubuntu-latest] + java: [temurin@11] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (fast) + uses: actions/checkout@v3 + + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + + - uses: coursier/setup-action@v1 + with: + apps: scala-steward + + - run: scala-steward validate-repo-config .scala-steward.conf + site: name: Generate Site strategy: From b5277cdf62a3d62b6852ca8dcf648dad8467aecf Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 14 Aug 2023 05:15:54 +0000 Subject: [PATCH 34/64] Fix Scala 3 compile --- modules/core/shared/src/main/scala/data/Arr.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/shared/src/main/scala/data/Arr.scala b/modules/core/shared/src/main/scala/data/Arr.scala index 1efe1e296..a7ad98deb 100644 --- a/modules/core/shared/src/main/scala/data/Arr.scala +++ b/modules/core/shared/src/main/scala/data/Arr.scala @@ -19,13 +19,13 @@ final class Arr[A] private ( ) extends ArrPlatform[A] { // Data and extent must be consistent. Should be guaranteed but let's check anyway. - assert((data.isEmpty && extent.isEmpty) || (data.length == extent.product)) + assert((data.isEmpty && extent.isEmpty) || (data.length == wrapIntArray(extent).product)) // In order to access elements we need the offsets associated with each dimension. But let's not // compute it unless we need to since these will be constructed in a tight loop when we unroll // a resultset that contains array columns. private lazy val _offsets: Array[Int] = - extent.tails.map(_.product).drop(1).toArray + extent.tails.map(wrapIntArray(_).product).drop(1).toArray /** * Attempt to reshape this `Arr` with the specified dimensions. This is possible if and only if From 2005f5a6bcfc2b503cee260b6e9c03dbe4e27a14 Mon Sep 17 00:00:00 2001 From: Massimo Siani Date: Sat, 3 Jun 2023 15:00:34 +0200 Subject: [PATCH 35/64] add grant completion --- .../shared/src/main/scala/data/Completion.scala | 1 + .../scala/net/message/CommandComplete.scala | 1 + .../shared/src/test/scala/CommandTest.scala | 17 +++++++++++++++++ 3 files changed, 19 insertions(+) diff --git a/modules/core/shared/src/main/scala/data/Completion.scala b/modules/core/shared/src/main/scala/data/Completion.scala index d5d70094d..0052099e9 100644 --- a/modules/core/shared/src/main/scala/data/Completion.scala +++ b/modules/core/shared/src/main/scala/data/Completion.scala @@ -61,6 +61,7 @@ object Completion { case object DropTrigger extends Completion case object SetConstraints extends Completion case object Explain extends Completion + case object Grant extends Completion // more ... /** diff --git a/modules/core/shared/src/main/scala/net/message/CommandComplete.scala b/modules/core/shared/src/main/scala/net/message/CommandComplete.scala index 6e9d36816..88079099e 100644 --- a/modules/core/shared/src/main/scala/net/message/CommandComplete.scala +++ b/modules/core/shared/src/main/scala/net/message/CommandComplete.scala @@ -99,6 +99,7 @@ object CommandComplete { case Patterns.Copy(s) => apply(Completion.Copy(s.toInt)) case "SET CONSTRAINTS" => apply(Completion.SetConstraints) case "EXPLAIN" => apply(Completion.Explain) + case "GRANT" => apply(Completion.Grant) // more .. fill in as we hit them case s => apply(Completion.Unknown(s)) diff --git a/modules/tests/shared/src/test/scala/CommandTest.scala b/modules/tests/shared/src/test/scala/CommandTest.scala index 5358e7a2c..2ab70e424 100644 --- a/modules/tests/shared/src/test/scala/CommandTest.scala +++ b/modules/tests/shared/src/test/scala/CommandTest.scala @@ -305,6 +305,13 @@ class CommandTest extends SkunkTest { ON city; """.command + val grant: Command[Void] = + sql""" + GRANT ALL PRIVILEGES + ON ALL TABLES IN SCHEMA public + TO skunk_role + """.command + sessionTest("create table, create index, drop index, alter table and drop table") { s => for { c <- s.execute(createTable) @@ -528,4 +535,14 @@ class CommandTest extends SkunkTest { .as("ok") } + sessionTest("grant") { s => + for{ + _ <- s.execute(createRole) + c <- s.execute(grant) + _ <- assert("completion", c == Completion.Grant) + _ <- s.execute(dropRole) + _ <- s.assertHealthy + } yield "ok" + } + } From 1f5877f510c3dc0bbde2209954a162490c6bcef2 Mon Sep 17 00:00:00 2001 From: Massimo Siani Date: Sat, 3 Jun 2023 15:19:20 +0200 Subject: [PATCH 36/64] add revoke --- .../core/shared/src/main/scala/data/Completion.scala | 1 + .../src/main/scala/net/message/CommandComplete.scala | 1 + modules/tests/shared/src/test/scala/CommandTest.scala | 11 ++++++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/core/shared/src/main/scala/data/Completion.scala b/modules/core/shared/src/main/scala/data/Completion.scala index 0052099e9..d8d8f629a 100644 --- a/modules/core/shared/src/main/scala/data/Completion.scala +++ b/modules/core/shared/src/main/scala/data/Completion.scala @@ -62,6 +62,7 @@ object Completion { case object SetConstraints extends Completion case object Explain extends Completion case object Grant extends Completion + case object Revoke extends Completion // more ... /** diff --git a/modules/core/shared/src/main/scala/net/message/CommandComplete.scala b/modules/core/shared/src/main/scala/net/message/CommandComplete.scala index 88079099e..30a597475 100644 --- a/modules/core/shared/src/main/scala/net/message/CommandComplete.scala +++ b/modules/core/shared/src/main/scala/net/message/CommandComplete.scala @@ -100,6 +100,7 @@ object CommandComplete { case "SET CONSTRAINTS" => apply(Completion.SetConstraints) case "EXPLAIN" => apply(Completion.Explain) case "GRANT" => apply(Completion.Grant) + case "REVOKE" => apply(Completion.Revoke) // more .. fill in as we hit them case s => apply(Completion.Unknown(s)) diff --git a/modules/tests/shared/src/test/scala/CommandTest.scala b/modules/tests/shared/src/test/scala/CommandTest.scala index 2ab70e424..e9e737dd0 100644 --- a/modules/tests/shared/src/test/scala/CommandTest.scala +++ b/modules/tests/shared/src/test/scala/CommandTest.scala @@ -312,6 +312,13 @@ class CommandTest extends SkunkTest { TO skunk_role """.command + val revoke: Command[Void] = + sql""" + REVOKE ALL PRIVILEGES + ON ALL TABLES IN SCHEMA public + FROM skunk_role + """.command + sessionTest("create table, create index, drop index, alter table and drop table") { s => for { c <- s.execute(createTable) @@ -535,11 +542,13 @@ class CommandTest extends SkunkTest { .as("ok") } - sessionTest("grant") { s => + sessionTest("grant, revoke") { s => for{ _ <- s.execute(createRole) c <- s.execute(grant) _ <- assert("completion", c == Completion.Grant) + c <- s.execute(revoke) + _ <- assert("completion", c == Completion.Revoke) _ <- s.execute(dropRole) _ <- s.assertHealthy } yield "ok" From b7b83a6d29ed2ab394e0694401e3ec2dbfecc047 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 00:45:28 +0000 Subject: [PATCH 37/64] Update sbt-typelevel, sbt-typelevel-site to 0.5.0 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 7586e1485..8f14a0ebc 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.5.0-RC12") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-RC12") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") From b535e58eb72cb9b29d879862fa3350d1895a5a44 Mon Sep 17 00:00:00 2001 From: Yilin Wei Date: Wed, 23 Aug 2023 13:27:14 +0100 Subject: [PATCH 38/64] Remove debug `println` from `bit`. --- modules/core/shared/src/main/scala/codec/BinaryCodecs.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/core/shared/src/main/scala/codec/BinaryCodecs.scala b/modules/core/shared/src/main/scala/codec/BinaryCodecs.scala index e8e35c571..05dd37f31 100644 --- a/modules/core/shared/src/main/scala/codec/BinaryCodecs.scala +++ b/modules/core/shared/src/main/scala/codec/BinaryCodecs.scala @@ -23,8 +23,7 @@ trait BinaryCodecs { def bit(length: Int): Codec[BitVector] = Codec.simple[BitVector]( _.toBin, - s => { println(s"got $s"); BitVector.fromBinDescriptive(s) }, - // BitVector.fromBinDescriptive(_), + BitVector.fromBinDescriptive(_), Type.bit(length) ) From 547faf03f7397aed12f268901b9b0d44118d3f09 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 00:39:08 +0000 Subject: [PATCH 39/64] Update sbt to 1.9.4 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 52413ab79..304098715 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.3 +sbt.version=1.9.4 From 2f58a9adb1b18d3c9f153f488dd7f7c96d973a51 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 00:17:42 +0000 Subject: [PATCH 40/64] Update epollcat to 0.1.6 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 4a8b0cf9c..f5434657a 100644 --- a/build.sbt +++ b/build.sbt @@ -191,7 +191,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) ) .nativeEnablePlugins(ScalaNativeBrewedConfigPlugin) .nativeSettings( - libraryDependencies += "com.armanbilge" %%% "epollcat" % "0.1.5", + libraryDependencies += "com.armanbilge" %%% "epollcat" % "0.1.6", Test / nativeBrewFormulas ++= Set("s2n", "utf8proc"), Test / envVars ++= Map("S2N_DONT_MLOCK" -> "1") ) From 5eee908b596c4f4e999971598ad275125d472a69 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 20:17:45 +0000 Subject: [PATCH 41/64] Update scalafmt-core to 3.7.13 in series/0.6.x --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index ea53a263b..b5429888e 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.7.12" +version = "3.7.13" runner.dialect = Scala213Source3 project.includePaths = [] # disables formatting From 219e6d60b4eeac2615a9a56cee89e28bf7cac647 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 04:09:04 +0000 Subject: [PATCH 42/64] Update fs2-core, fs2-io to 3.9.0 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f5434657a..458519aca 100644 --- a/build.sbt +++ b/build.sbt @@ -59,7 +59,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( ) // This is used in a couple places -lazy val fs2Version = "3.8.0" +lazy val fs2Version = "3.9.0" lazy val natchezVersion = "0.3.3" // Global Settings From 0b3ee9e5465ecb567797e00b8b36908e4566354c Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 30 Aug 2023 04:57:49 +0000 Subject: [PATCH 43/64] Fix deprecation --- modules/core/shared/src/main/scala/PreparedQuery.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/shared/src/main/scala/PreparedQuery.scala b/modules/core/shared/src/main/scala/PreparedQuery.scala index ca422e62f..4893cb6cb 100644 --- a/modules/core/shared/src/main/scala/PreparedQuery.scala +++ b/modules/core/shared/src/main/scala/PreparedQuery.scala @@ -74,7 +74,7 @@ object PreparedQuery { Stream.resource(proto.bind(args, or)).flatMap { cursor => def chunks: Stream[F, B] = Stream.eval(cursor.execute(chunkSize)).flatMap { case (bs, more) => - val s = Stream.chunk(Chunk.seq(bs)) + val s = Stream.chunk(Chunk.from(bs)) if (more) s ++ chunks else s } From 5a35c7b2a94b80a940c00458dbc3230f5be3d0b3 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 00:21:35 +0000 Subject: [PATCH 44/64] Update fs2-core, fs2-io to 3.9.1 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 458519aca..e0fb6a1c5 100644 --- a/build.sbt +++ b/build.sbt @@ -59,7 +59,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( ) // This is used in a couple places -lazy val fs2Version = "3.9.0" +lazy val fs2Version = "3.9.1" lazy val natchezVersion = "0.3.3" // Global Settings From 71f210b3e50cb1b58bf98e627b232aff6745c81a Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 00:21:38 +0000 Subject: [PATCH 45/64] Update circe-core, circe-parser to 0.14.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 458519aca..9dd0ae820 100644 --- a/build.sbt +++ b/build.sbt @@ -155,8 +155,8 @@ lazy val circe = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings( name := "skunk-circe", libraryDependencies ++= Seq( - "io.circe" %%% "circe-core" % "0.14.5", - "io.circe" %%% "circe-parser" % "0.14.5" + "io.circe" %%% "circe-core" % "0.14.6", + "io.circe" %%% "circe-parser" % "0.14.6" ) ) From bda635abbeb5f38d1c2512095a7d22d2175b5059 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 20:19:15 +0000 Subject: [PATCH 46/64] Update scalafmt-core to 3.7.14 in series/0.6.x --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index b5429888e..4588696a3 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.7.13" +version = "3.7.14" runner.dialect = Scala213Source3 project.includePaths = [] # disables formatting From 1853da62b7a1ba90493483460dcd9e6dc92f9308 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 12:13:09 +0000 Subject: [PATCH 47/64] Update nscplugin, sbt-scala-native, ... to 0.4.15 in series/0.6.x --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8f14a0ebc..03123c0f3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,5 +9,5 @@ addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.15") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") From f0511ae2a9211ea4d176d1020a88935f94013ab9 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 5 Sep 2023 13:10:14 +0000 Subject: [PATCH 48/64] Use `atUnsafe` --- .../scala/net/message/PasswordMessagePlatform.scala | 12 ++++++------ .../src/main/scala/net/message/ScramPlatform.scala | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/core/native/src/main/scala/net/message/PasswordMessagePlatform.scala b/modules/core/native/src/main/scala/net/message/PasswordMessagePlatform.scala index 08ad3a012..e39dc47ec 100644 --- a/modules/core/native/src/main/scala/net/message/PasswordMessagePlatform.scala +++ b/modules/core/native/src/main/scala/net/message/PasswordMessagePlatform.scala @@ -32,11 +32,11 @@ private[message] trait PasswordMessagePlatform { // First round if (EVP_DigestInit_ex(ctx, `type`, null) != 1) throw new RuntimeException("EVP_DigestInit_ex") - if (EVP_DigestUpdate(ctx, password.getBytes.at(0), password.length.toULong) != 1) + if (EVP_DigestUpdate(ctx, password.getBytes.atUnsafe(0), password.length.toULong) != 1) throw new RuntimeException("EVP_DigestUpdate") - if (EVP_DigestUpdate(ctx, user.getBytes.at(0), user.length.toULong) != 1) + if (EVP_DigestUpdate(ctx, user.getBytes.atUnsafe(0), user.length.toULong) != 1) throw new RuntimeException("EVP_DigestUpdate") - if (EVP_DigestFinal_ex(ctx, md.at(0), size) != 1) + if (EVP_DigestFinal_ex(ctx, md.atUnsafe(0), size) != 1) throw new RuntimeException("EVP_DigestFinal_ex") var hex = BigInt(1, md.take((!size).toInt)).toString(16) while (hex.length < 32) @@ -48,11 +48,11 @@ private[message] trait PasswordMessagePlatform { // Second round if (EVP_DigestInit_ex(ctx, `type`, null) != 1) throw new RuntimeException("EVP_DigestInit_ex") - if (EVP_DigestUpdate(ctx, hex.getBytes.at(0), 32.toULong) != 1) + if (EVP_DigestUpdate(ctx, hex.getBytes.atUnsafe(0), 32.toULong) != 1) throw new RuntimeException("EVP_DigestUpdate") - if (EVP_DigestUpdate(ctx, salt.at(0), salt.length.toULong) != 1) + if (EVP_DigestUpdate(ctx, salt.atUnsafe(0), salt.length.toULong) != 1) throw new RuntimeException("EVP_DigestUpdate") - if (EVP_DigestFinal_ex(ctx, md.at(0), size) != 1) + if (EVP_DigestFinal_ex(ctx, md.atUnsafe(0), size) != 1) throw new RuntimeException("EVP_DigestFinal_ex") hex = BigInt(1, md.take((!size).toInt)).toString(16) while (hex.length < 32) diff --git a/modules/core/native/src/main/scala/net/message/ScramPlatform.scala b/modules/core/native/src/main/scala/net/message/ScramPlatform.scala index 1de037737..2f0d22388 100644 --- a/modules/core/native/src/main/scala/net/message/ScramPlatform.scala +++ b/modules/core/native/src/main/scala/net/message/ScramPlatform.scala @@ -15,7 +15,7 @@ private[message] trait ScramPlatform { this: Scram.type => def clientFirstBareWithRandomNonce: ByteVector = { val buf = new Array[Byte](32) - if (RAND_bytes(buf.at(0), 32) != 1) + if (RAND_bytes(buf.atUnsafe(0), 32) != 1) throw new RuntimeException("RAND_bytes") val nonce = ByteVector.view(buf).toBase64 clientFirstBareWithNonce(nonce) @@ -27,7 +27,7 @@ private[message] trait ScramPlatform { this: Scram.type => throw new RuntimeException("EVP_get_digestbyname") val md = new Array[Byte](EVP_MAX_MD_SIZE) val mdLen = stackalloc[CUnsignedInt]() - if (openssl.HMAC(evpMd, key.toArrayUnsafe.at(0), key.size.toInt, str.toArrayUnsafe.at(0), str.size.toULong, md.at(0), mdLen) == null) + if (openssl.HMAC(evpMd, key.toArrayUnsafe.atUnsafe(0), key.size.toInt, str.toArrayUnsafe.atUnsafe(0), str.size.toULong, md.atUnsafe(0), mdLen) == null) throw new RuntimeException("HMAC") ByteVector.view(md, 0, (!mdLen).toInt) } @@ -38,7 +38,7 @@ private[message] trait ScramPlatform { this: Scram.type => val `type` = EVP_get_digestbyname(c"SHA256") if (`type` == null) throw new RuntimeException("EVP_get_digestbyname") - if (EVP_Digest(input.toArrayUnsafe.at(0), input.size.toULong, md.at(0), size, `type`, null) != 1) + if (EVP_Digest(input.toArrayUnsafe.atUnsafe(0), input.size.toULong, md.atUnsafe(0), size, `type`, null) != 1) throw new RuntimeException("EVP_Digest") ByteVector.view(md, 0, (!size).toInt) } @@ -48,7 +48,7 @@ private[message] trait ScramPlatform { this: Scram.type => if (digest == null) throw new RuntimeException("EVP_get_digestbyname") val out = new Array[Byte](32) - if (PKCS5_PBKDF2_HMAC(str.getBytes.at(0), str.length, salt.toArrayUnsafe.at(0), salt.size.toInt, iterations, digest, 32, out.at(0)) != 1) + if (PKCS5_PBKDF2_HMAC(str.getBytes.atUnsafe(0), str.length, salt.toArrayUnsafe.atUnsafe(0), salt.size.toInt, iterations, digest, 32, out.atUnsafe(0)) != 1) throw new RuntimeException("PKCS5_PBKDF2_HMAC") ByteVector.view(out) } From 7fa51d1082014618dfd9554a2d4c0da4d44b04d1 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 20:29:44 +0000 Subject: [PATCH 49/64] Update scala3-library, ... to 3.3.1 in series/0.6.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 24514500c..7292a7cb5 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ ThisBuild / tlBaseVersion := "0.6" // Our Scala versions. lazy val `scala-2.12` = "2.12.18" lazy val `scala-2.13` = "2.13.11" -lazy val `scala-3.0` = "3.3.0" +lazy val `scala-3.0` = "3.3.1" ThisBuild / scalaVersion := `scala-2.13` ThisBuild / crossScalaVersions := From 6a623a6c361a49f61bd76f5486c0ee68533b2fe2 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:11:13 +0000 Subject: [PATCH 50/64] Update sbt-scoverage to 2.0.9 in series/0.6.x --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 03123c0f3..cc72eebd4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0") addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.15") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") From 1db8aeeeae7ac497ce102b84f69da8ef6afccd9e Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 04:20:18 +0000 Subject: [PATCH 51/64] Update sbt-typelevel, sbt-typelevel-site to 0.5.1 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 cc72eebd4..fd979d0df 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.5.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.1") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.1") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") From 58c01b7ad48bdf04ae09468b9b71d7517527828f Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 04:20:59 +0000 Subject: [PATCH 52/64] Run prePR with sbt-typelevel Executed command: sbt tlPrePrBotHook --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7870aa28..afb89599c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: timeout-minutes: 60 steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -114,7 +114,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -261,7 +261,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -299,7 +299,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (fast) - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Java (temurin@11) id: setup-java-temurin-11 @@ -324,7 +324,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -368,7 +368,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 From e0a49178fa94d1d5b48b7dc30518c4ab9c1f1a13 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:44:16 +0000 Subject: [PATCH 53/64] Update scala-library to 2.13.12 in series/0.6.x --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index afb89599c..64c2bb82a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -363,7 +363,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.11] + scala: [2.13.12] java: [temurin@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 7292a7cb5..4f73814a4 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ ThisBuild / tlBaseVersion := "0.6" // Our Scala versions. lazy val `scala-2.12` = "2.12.18" -lazy val `scala-2.13` = "2.13.11" +lazy val `scala-2.13` = "2.13.12" lazy val `scala-3.0` = "3.3.1" ThisBuild / scalaVersion := `scala-2.13` From e61b971cb70bf9e8a091b638c7335084b8a14fd3 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 11 Sep 2023 14:48:08 +0000 Subject: [PATCH 54/64] Add explicit types --- modules/core/shared/src/main/scala/util/Typer.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/shared/src/main/scala/util/Typer.scala b/modules/core/shared/src/main/scala/util/Typer.scala index 91461b327..ab2212de8 100644 --- a/modules/core/shared/src/main/scala/util/Typer.scala +++ b/modules/core/shared/src/main/scala/util/Typer.scala @@ -62,7 +62,7 @@ object Typer { val Static: Typer = new Typer { import Type._ - val strategy = Strategy.BuiltinsOnly + val strategy: Strategy = Strategy.BuiltinsOnly val staticByOid: Map[Int, Type] = Map( @@ -232,7 +232,7 @@ object Typer { (p.typeInfoMap, p.relInfoMap).mapN { (tim, rim) => Static orElse new Typer { - val strategy = Strategy.SearchPath + val strategy: Strategy = Strategy.SearchPath val nameToOid: Map[String, Int] = tim.map { case (k, v) => v.name -> k } From 40f2c66c25693e39082049b31801399727082166 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 21:04:33 +0000 Subject: [PATCH 55/64] Update sbt-typelevel, sbt-typelevel-site to 0.5.2 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 fd979d0df..f336999e7 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.5.1") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.1") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.2") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") From 03bee84eb08bcf3136407bcd5b7d26297645f85f Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 11 Sep 2023 21:09:17 +0000 Subject: [PATCH 56/64] Restore package object --- modules/core/shared/src/main/scala/package.scala | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/core/shared/src/main/scala/package.scala b/modules/core/shared/src/main/scala/package.scala index c23e2129b..b108714dd 100644 --- a/modules/core/shared/src/main/scala/package.scala +++ b/modules/core/shared/src/main/scala/package.scala @@ -2,8 +2,6 @@ // This software is licensed under the MIT License (MIT). // For more information see LICENSE or https://opensource.org/licenses/MIT -package skunk - import cats.effect.Resource import org.typelevel.scalaccompat.annotation._ import org.typelevel.twiddles.TwiddleCompat @@ -126,8 +124,7 @@ import org.typelevel.twiddles.TwiddleCompat * @groupname Companions Companion Objects * @groupprio Companions 999 */ -@nowarn213("msg=package object inheritance is deprecated") -object `package` extends TwiddleCompat { // aka package object skunk, yes this actually works ... +package object skunk extends TwiddleCompat { // we can use this to defeat value discarding warnings for erasable proof terms private[skunk] def void(a: Any*): Unit = (a, ())._2 From eeb39e37bc6c26d91afe21bfc596c8f4df969fd5 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 11 Sep 2023 21:12:47 +0000 Subject: [PATCH 57/64] Unused import --- modules/core/shared/src/main/scala/package.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/core/shared/src/main/scala/package.scala b/modules/core/shared/src/main/scala/package.scala index b108714dd..649b2ff29 100644 --- a/modules/core/shared/src/main/scala/package.scala +++ b/modules/core/shared/src/main/scala/package.scala @@ -3,7 +3,6 @@ // For more information see LICENSE or https://opensource.org/licenses/MIT import cats.effect.Resource -import org.typelevel.scalaccompat.annotation._ import org.typelevel.twiddles.TwiddleCompat /** From 621384aed687a21b3346725090dab59dc76891d1 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 19:21:08 +0000 Subject: [PATCH 58/64] Update fs2-core, fs2-io to 3.9.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 4f73814a4..4cc2a32f0 100644 --- a/build.sbt +++ b/build.sbt @@ -59,7 +59,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( ) // This is used in a couple places -lazy val fs2Version = "3.9.1" +lazy val fs2Version = "3.9.2" lazy val natchezVersion = "0.3.3" // Global Settings From e303d94f26a7cf72ad3d3d1a2d0217f345ebfc7b Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 15 Sep 2023 16:27:07 +0000 Subject: [PATCH 59/64] Update sbt to 1.9.6 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 304098715..27430827b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.4 +sbt.version=1.9.6 From 28145883cadfc06e8c55bf9d10dc65d5a0457407 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 15 Sep 2023 20:55:35 +0000 Subject: [PATCH 60/64] Update junit-interface, munit to 1.0.0-M10 in series/0.6.x --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 4cc2a32f0..1bf3378dc 100644 --- a/build.sbt +++ b/build.sbt @@ -169,8 +169,8 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings( tlFatalWarnings := false, libraryDependencies ++= Seq( - "org.scalameta" %%% "munit" % "1.0.0-M8", - "org.scalameta" % "junit-interface" % "1.0.0-M8", + "org.scalameta" %%% "munit" % "1.0.0-M10", + "org.scalameta" % "junit-interface" % "1.0.0-M10", "org.typelevel" %%% "scalacheck-effect-munit" % "2.0.0-M2", "org.typelevel" %%% "munit-cats-effect" % "2.0.0-M3", "org.typelevel" %%% "cats-free" % "2.10.0", From fca5abadc22abcd13c462cfaed0a4185f743cc0d Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 15 Sep 2023 20:55:41 +0000 Subject: [PATCH 61/64] Update sbt-typelevel, sbt-typelevel-site to 0.5.3 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 f336999e7..3b2aa6ade 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.5.2") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.3") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.3") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") From 65c169befc7b01999d9fb075748f32e1a811c042 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 17:34:35 +0000 Subject: [PATCH 62/64] Update sbt-scalajs, scalajs-compiler, ... to 1.14.0 in series/0.6.x --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f336999e7..c03d0adb3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,6 +8,6 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.2") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.15") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") From 6b8f2a687d2872f69372fd53897fe6f2a9c92aca Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 00:20:17 +0000 Subject: [PATCH 63/64] Update cats-effect to 3.5.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 4cc2a32f0..5a633c6d5 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.10.0", - "org.typelevel" %%% "cats-effect" % "3.5.1", + "org.typelevel" %%% "cats-effect" % "3.5.2", "co.fs2" %%% "fs2-core" % fs2Version, "co.fs2" %%% "fs2-io" % fs2Version, "org.scodec" %%% "scodec-bits" % "1.1.37", From e6458639dd772583752c36d059174d82b5e3da71 Mon Sep 17 00:00:00 2001 From: mpilquist Date: Wed, 4 Oct 2023 16:20:35 -0400 Subject: [PATCH 64/64] Update to otel4s 0.3.0-RC1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index aedd40cad..4ec74abe1 100644 --- a/build.sbt +++ b/build.sbt @@ -59,7 +59,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( // This is used in a couple places lazy val fs2Version = "3.8.0" lazy val openTelemetryVersion = "1.29.0" -lazy val otel4sVersion = "0.2.1" +lazy val otel4sVersion = "0.3.0-RC1" // Global Settings lazy val commonSettings = Seq(