Merge branch 'main' into update/fs2-core-3.11.0

# Conflicts: # project/ProjectPlugin.scala
higherkindness · Oct 21, 2024 · ee9258b · ee9258b
2 parents c3fa41d + d3f4c58
commit ee9258b
Show file tree

Hide file tree

Showing 32 changed files with 16 additions and 1,357 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version=3.8.1
+version=3.8.3
 style = defaultWithAlign
 maxColumn = 100
 runner {

diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,5 @@
-val scala213 = "2.13.14"
-val scala3   = "3.4.2"
+val scala213 = "2.13.15"
+val scala3   = "3.4.3"
 
 ThisBuild / organization       := "io.higherkindness"
 ThisBuild / githubOrganization := "47degrees"
@@ -16,7 +16,7 @@ addCommandAlias(
 
 addCommandAlias(
   "ci-test",
-  "scalafmtCheckAll; scalafmtSbtCheck; missinglinkCheck; mdoc; all-tests; haskell-integration-tests/test"
+  "scalafmtCheckAll; scalafmtSbtCheck; missinglinkCheck; mdoc; all-tests"
 )
 addCommandAlias(
   "ci-docs",
@@ -194,17 +194,6 @@ lazy val `avro-rpc-tests` = projectMatrix
   .settings(avroRPCTestSettings)
   .jvmPlatform(scalaVersions = Seq(scala3, scala213))
 
-//////////////////////////////////////
-//// MU-HASKELL INTEGRATION TESTS ////
-//////////////////////////////////////
-
-lazy val `haskell-integration-tests` = projectMatrix
-  .in(file("modules/haskell-integration-tests"))
-  .dependsOn(server, `client-netty`, fs2)
-  .settings(publish / skip := true)
-  .settings(haskellIntegrationTestSettings)
-  .jvmPlatform(scalaVersions = Seq(scala213))
-
 //////////////////////////
 //// MODULES REGISTRY ////
 //////////////////////////

diff --git a/modules/haskell-integration-tests/README.md b/modules/haskell-integration-tests/README.md
diff --git a/modules/haskell-integration-tests/mu-haskell-client-server/.gitignore b/modules/haskell-integration-tests/mu-haskell-client-server/.gitignore
diff --git a/modules/haskell-integration-tests/mu-haskell-client-server/Dockerfile b/modules/haskell-integration-tests/mu-haskell-client-server/Dockerfile
diff --git a/modules/haskell-integration-tests/mu-haskell-client-server/Dockerfile.warm_dot_stack b/modules/haskell-integration-tests/mu-haskell-client-server/Dockerfile.warm_dot_stack
diff --git a/modules/haskell-integration-tests/mu-haskell-client-server/Setup.hs b/modules/haskell-integration-tests/mu-haskell-client-server/Setup.hs
diff --git a/modules/haskell-integration-tests/mu-haskell-client-server/avro-client/Main.hs b/modules/haskell-integration-tests/mu-haskell-client-server/avro-client/Main.hs
diff --git a/modules/haskell-integration-tests/mu-haskell-client-server/avro-server/Main.hs b/modules/haskell-integration-tests/mu-haskell-client-server/avro-server/Main.hs
diff --git a/modules/haskell-integration-tests/mu-haskell-client-server/build.sh b/modules/haskell-integration-tests/mu-haskell-client-server/build.sh
diff --git a/modules/haskell-integration-tests/mu-haskell-client-server/mu-haskell-client-server.cabal b/modules/haskell-integration-tests/mu-haskell-client-server/mu-haskell-client-server.cabal