Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test out polling systems #7161

Draft
wants to merge 2 commits into
base: series/0.23
Choose a base branch
from
Draft

Test out polling systems #7161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f837296
Bump to FS2 polling snapshot
armanbilge Jun 15, 2023
a1e87cc
Bump FS2
armanbilge Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,11 +285,6 @@ lazy val tests = libraryCrossProject("tests")
),
githubWorkflowArtifactUpload := false,
)
.nativeSettings(
libraryDependencies ++= Seq(
epollcat.value
)
)
.dependsOn(core, laws)

lazy val server = libraryCrossProject("server")
Expand Down
4 changes: 1 addition & 3 deletions project/Http4sPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ object Http4sPlugin extends AutoPlugin {
val crypto = "0.2.4"
val cryptobits = "1.3"
val disciplineCore = "1.5.1"
val epollcat = "0.1.5"
val fs2 = "3.7.0"
val fs2 = "3.8-1af22dd"
val ip4s = "3.3.0"
val hpack = "1.0.4"
val javaWebSocket = "1.5.3"
Expand Down Expand Up @@ -160,7 +159,6 @@ object Http4sPlugin extends AutoPlugin {
lazy val crypto = Def.setting("org.http4s" %%% "http4s-crypto" % V.crypto)
lazy val cryptobits = "org.reactormonk" %% "cryptobits" % V.cryptobits
lazy val disciplineCore = Def.setting("org.typelevel" %%% "discipline-core" % V.disciplineCore)
lazy val epollcat = Def.setting("com.armanbilge" %%% "epollcat" % V.epollcat)
lazy val fs2Core = Def.setting("co.fs2" %%% "fs2-core" % V.fs2)
lazy val fs2Io = Def.setting("co.fs2" %%% "fs2-io" % V.fs2)
lazy val ip4sCore = Def.setting("com.comcast" %%% "ip4s-core" % V.ip4s)
Expand Down
26 changes: 0 additions & 26 deletions tests/js/src/main/scala/org/http4s/Http4sSuitePlatform.scala
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions tests/jvm/src/main/scala/org/http4s/Http4sSuitePlatform.scala
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions tests/native/src/main/scala/org/http4s/Http4sSuitePlatform.scala
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions tests/shared/src/main/scala/org/http4s/Http4sSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ package org.http4s

import cats.effect.IO
import cats.effect.Resource
import cats.effect.SyncIO
import cats.effect.std.Env
import cats.syntax.all._
import fs2._
import fs2.text.utf8
Expand All @@ -26,11 +28,10 @@ import munit.catseffect._

/** Common stack for http4s' munit based tests
*/
trait Http4sSuite
extends CatsEffectSuite
with DisciplineSuite
with munit.ScalaCheckEffectSuite
with Http4sSuitePlatform {
trait Http4sSuite extends CatsEffectSuite with DisciplineSuite with munit.ScalaCheckEffectSuite {

// allow flaky tests on ci
override def munitFlakyOK: Boolean = Env.make[SyncIO].get("CI").unsafeRunSync().isDefined

private[this] val suiteFixtures = List.newBuilder[IOFixture[_]]

Expand Down