From c04430c01a8926efc35496b9443cf2e0c826ffae Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 14 Jun 2023 22:27:04 +0000 Subject: [PATCH 1/5] Bump to FS2 polling snapshot --- build.sbt | 3 +-- .../src/main/scala/ffstest/FFrameworkPlatform.scala | 9 --------- .../src/main/scala/ffstest/FFrameworkPlatform.scala | 9 --------- .../src/main/scala/ffstest/FFrameworkPlatform.scala | 12 ------------ .../shared/src/main/scala/ffstest/FFramework.scala | 2 +- project/plugins.sbt | 2 +- 6 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 modules/tests/js/src/main/scala/ffstest/FFrameworkPlatform.scala delete mode 100644 modules/tests/jvm/src/main/scala/ffstest/FFrameworkPlatform.scala delete mode 100644 modules/tests/native/src/main/scala/ffstest/FFrameworkPlatform.scala diff --git a/build.sbt b/build.sbt index c563d46b5..4c787681e 100644 --- a/build.sbt +++ b/build.sbt @@ -61,7 +61,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( ) // This is used in a couple places -lazy val fs2Version = "3.7.0" +lazy val fs2Version = "3.8-1580d81" lazy val natchezVersion = "0.3.1" // Global Settings @@ -194,7 +194,6 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) ) .nativeEnablePlugins(ScalaNativeBrewedConfigPlugin) .nativeSettings( - libraryDependencies += "com.armanbilge" %%% "epollcat" % "0.1.4", Test / nativeBrewFormulas ++= Set("s2n", "utf8proc"), Test / envVars ++= Map("S2N_DONT_MLOCK" -> "1") ) diff --git a/modules/tests/js/src/main/scala/ffstest/FFrameworkPlatform.scala b/modules/tests/js/src/main/scala/ffstest/FFrameworkPlatform.scala deleted file mode 100644 index fc0470dc3..000000000 --- a/modules/tests/js/src/main/scala/ffstest/FFrameworkPlatform.scala +++ /dev/null @@ -1,9 +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 ffstest - -import munit.CatsEffectSuite - -trait FTestPlatform extends CatsEffectSuite \ No newline at end of file diff --git a/modules/tests/jvm/src/main/scala/ffstest/FFrameworkPlatform.scala b/modules/tests/jvm/src/main/scala/ffstest/FFrameworkPlatform.scala deleted file mode 100644 index 16acda019..000000000 --- a/modules/tests/jvm/src/main/scala/ffstest/FFrameworkPlatform.scala +++ /dev/null @@ -1,9 +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 ffstest - -import munit.CatsEffectSuite - -trait FTestPlatform extends CatsEffectSuite diff --git a/modules/tests/native/src/main/scala/ffstest/FFrameworkPlatform.scala b/modules/tests/native/src/main/scala/ffstest/FFrameworkPlatform.scala deleted file mode 100644 index d1db03526..000000000 --- a/modules/tests/native/src/main/scala/ffstest/FFrameworkPlatform.scala +++ /dev/null @@ -1,12 +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 ffstest - -import epollcat.unsafe.EpollRuntime -import munit.CatsEffectSuite - -trait FTestPlatform extends CatsEffectSuite { - override def munitIORuntime = EpollRuntime.global -} \ No newline at end of file diff --git a/modules/tests/shared/src/main/scala/ffstest/FFramework.scala b/modules/tests/shared/src/main/scala/ffstest/FFramework.scala index 9b7770bea..69008e823 100644 --- a/modules/tests/shared/src/main/scala/ffstest/FFramework.scala +++ b/modules/tests/shared/src/main/scala/ffstest/FFramework.scala @@ -12,7 +12,7 @@ import natchez.Fields import munit.CatsEffectSuite import org.typelevel.twiddles._ -trait FTest extends CatsEffectSuite with FTestPlatform { +trait FTest extends CatsEffectSuite { def pureTest(name: String)(f: => Boolean): Unit = test(name)(assert(name, f)) def fail[A](msg: String): IO[A] = IO.raiseError(new AssertionError(msg)) diff --git a/project/plugins.sbt b/project/plugins.sbt index 97ba328b8..8ddb6a6df 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -12,6 +12,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.13") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.1.3") From 1a46bc246904d8b7b665ecc69e0bf8cc16b8b629 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 14 Jun 2023 22:35:22 +0000 Subject: [PATCH 2/5] Bumps --- .github/workflows/ci.yml | 20 ++++++++++---------- build.sbt | 2 +- project/plugins.sbt | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4e70fb74..3ebb04641 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.17, 2.13.10, 3.2.2] + scala: [2.12.17, 2.13.10, 3.3.0] java: [temurin@11] project: [rootJS, rootJVM, rootNative] runs-on: ${{ matrix.os }} @@ -227,32 +227,32 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.2, rootJS) + - name: Download target directories (3.3.0, rootJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJS - - name: Inflate target directories (3.2.2, rootJS) + - name: Inflate target directories (3.3.0, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.2, rootJVM) + - name: Download target directories (3.3.0, rootJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJVM - - name: Inflate target directories (3.2.2, rootJVM) + - name: Inflate target directories (3.3.0, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.2, rootNative) + - name: Download target directories (3.3.0, rootNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootNative - - name: Inflate target directories (3.2.2, rootNative) + - name: Inflate target directories (3.3.0, rootNative) run: | tar xf targets.tar rm targets.tar diff --git a/build.sbt b/build.sbt index 4c787681e..7c0f6c111 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 := diff --git a/project/plugins.sbt b/project/plugins.sbt index 8ddb6a6df..9fcfd26ed 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -12,6 +12,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.13") +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.1.3") From a708cdf8d40fa3ba34683304738dd8b023b88741 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 14 Jun 2023 19:29:07 -0700 Subject: [PATCH 3/5] Bump FS2 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 7c0f6c111..1af3619a8 100644 --- a/build.sbt +++ b/build.sbt @@ -61,7 +61,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( ) // This is used in a couple places -lazy val fs2Version = "3.8-1580d81" +lazy val fs2Version = "3.8-75a2246" lazy val natchezVersion = "0.3.1" // Global Settings From 9405587a08001d368fab582ec889df88f3e5c9ba Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 14 Jun 2023 20:55:26 -0700 Subject: [PATCH 4/5] Bump FS2 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1af3619a8..69c821f8b 100644 --- a/build.sbt +++ b/build.sbt @@ -61,7 +61,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List( ) // This is used in a couple places -lazy val fs2Version = "3.8-75a2246" +lazy val fs2Version = "3.8-e358dce" lazy val natchezVersion = "0.3.1" // Global Settings From db67edaa6e062fea78d5f9ecded1235fcae12593 Mon Sep 17 00:00:00 2001 From: Michael Pilquist Date: Wed, 19 Mar 2025 08:55:23 -0400 Subject: [PATCH 5/5] Bump to fs2 3.12.0-RC2 and cats-effect 3.6.0-RC2 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 0bd19a126..fcb90d4ea 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.12.0-RC1" +lazy val fs2Version = "3.12.0-RC2" lazy val natchezVersion = "0.3.7" // Global Settings @@ -109,7 +109,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) description := "Tagless, non-blocking data access library for Postgres.", libraryDependencies ++= Seq( "org.typelevel" %%% "cats-core" % "2.11.0", - "org.typelevel" %%% "cats-effect" % "3.5.7", + "org.typelevel" %%% "cats-effect" % "3.6.0-RC2", "co.fs2" %%% "fs2-core" % fs2Version, "co.fs2" %%% "fs2-io" % fs2Version, "org.scodec" %%% "scodec-bits" % "1.1.38",