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.

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

Remove zio1 support #3369

Merged
merged 2 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ jobs:
# https://github.com/scala-js/scala-js/issues/4317 has a solution
- name: Test
if: matrix.target-platform == 'JS' && matrix.scala-version == '2.12'
run: sbt $SBT_JAVA_OPTS catsJS2_12/test circeJsonJS2_12/test clientCoreJS2_12/test clientTestsJS2_12/test coreJS2_12/test enumeratumJS2_12/test jsoniterScalaJS2_12/test newtypeJS2_12/test openapiDocsJS2_12/test playJsonJS2_12/test redocJS2_12/test serverCoreJS2_12/test sttpClientJS2_12/test testingJS2_12/test testsJS2_12/test uPickleJsonJS2_12/test zio1JsonJS2_12/test zioJsonJS2_12/test
run: sbt $SBT_JAVA_OPTS catsJS2_12/test circeJsonJS2_12/test clientCoreJS2_12/test clientTestsJS2_12/test coreJS2_12/test enumeratumJS2_12/test jsoniterScalaJS2_12/test newtypeJS2_12/test openapiDocsJS2_12/test playJsonJS2_12/test redocJS2_12/test serverCoreJS2_12/test sttpClientJS2_12/test testingJS2_12/test testsJS2_12/test uPickleJsonJS2_12/test zioJsonJS2_12/test
- name: Test
if: matrix.target-platform == 'JS' && matrix.scala-version == '2.13'
run: sbt $SBT_JAVA_OPTS catsJS/test circeJsonJS/test clientCoreJS/test clientTestsJS/test coreJS/test enumeratumJS/test jsoniterScalaJS/test newtypeJS/test openapiDocsJS/test playJsonJS/test redocJS/test serverCoreJS/test sttpClientJS/test testingJS/test testsJS/test uPickleJsonJS/test zio1JsonJS/test zioJsonJS/test
run: sbt $SBT_JAVA_OPTS catsJS/test circeJsonJS/test clientCoreJS/test clientTestsJS/test coreJS/test enumeratumJS/test jsoniterScalaJS/test newtypeJS/test openapiDocsJS/test playJsonJS/test redocJS/test serverCoreJS/test sttpClientJS/test testingJS/test testsJS/test uPickleJsonJS/test zioJsonJS/test
- name: Test
if: matrix.target-platform == 'JS' && matrix.scala-version == '3'
run: sbt $SBT_JAVA_OPTS catsJS3/test circeJsonJS3/test clientCoreJS3/test clientTestsJS3/test coreJS3/test jsoniterScalaJS3/test openapiDocsJS3/test redocJS3/test serverCoreJS3/test sttpClientJS3/test testingJS3/test testsJS3/test uPickleJsonJS3/test zioJsonJS3/test
Expand Down
105 changes: 0 additions & 105 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ lazy val rawAllAggregates = core.projectRefs ++
enumeratum.projectRefs ++
refined.projectRefs ++
iron.projectRefs ++
zio1.projectRefs ++
zio.projectRefs ++
newtype.projectRefs ++
monixNewtype.projectRefs ++
Expand All @@ -185,7 +184,6 @@ lazy val rawAllAggregates = core.projectRefs ++
sprayJson.projectRefs ++
uPickleJson.projectRefs ++
tethysJson.projectRefs ++
zio1Json.projectRefs ++
zioJson.projectRefs ++
protobuf.projectRefs ++
pbDirectProtobuf.projectRefs ++
Expand All @@ -207,9 +205,7 @@ lazy val rawAllAggregates = core.projectRefs ++
armeriaServer.projectRefs ++
armeriaServerCats.projectRefs ++
armeriaServerZio.projectRefs ++
armeriaServerZio1.projectRefs ++
http4sServer.projectRefs ++
http4sServerZio1.projectRefs ++
http4sServerZio.projectRefs ++
sttpStubServer.projectRefs ++
sttpMockServer.projectRefs ++
Expand All @@ -220,14 +216,12 @@ lazy val rawAllAggregates = core.projectRefs ++
vertxServer.projectRefs ++
vertxServerCats.projectRefs ++
vertxServerZio.projectRefs ++
vertxServerZio1.projectRefs ++
jdkhttpServer.projectRefs ++
nettyServer.projectRefs ++
nettyServerLoom.projectRefs ++
nettyServerCats.projectRefs ++
nettyServerZio.projectRefs ++
nimaServer.projectRefs ++
zio1HttpServer.projectRefs ++
zioHttpServer.projectRefs ++
awsLambdaCore.projectRefs ++
awsLambdaCatsEffect.projectRefs ++
Expand All @@ -240,7 +234,6 @@ lazy val rawAllAggregates = core.projectRefs ++
clientCore.projectRefs ++
http4sClient.projectRefs ++
sttpClient.projectRefs ++
sttpClientWsZio1.projectRefs ++
playClient.projectRefs ++
play29Client.projectRefs ++
tests.projectRefs ++
Expand Down Expand Up @@ -679,26 +672,6 @@ lazy val iron: ProjectMatrix = (projectMatrix in file("integrations/iron"))
)
.dependsOn(core)

lazy val zio1: ProjectMatrix = (projectMatrix in file("integrations/zio1"))
.settings(commonSettings)
.settings(
name := "tapir-zio1",
testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
libraryDependencies ++= Seq(
"dev.zio" %%% "zio" % Versions.zio1,
"dev.zio" %%% "zio-streams" % Versions.zio1,
"dev.zio" %%% "zio-test" % Versions.zio1 % Test,
"dev.zio" %%% "zio-test-sbt" % Versions.zio1 % Test,
"com.softwaremill.sttp.shared" %%% "zio1" % Versions.sttpShared
)
)
.jvmPlatform(scalaVersions = scala2And3Versions)
.jsPlatform(
scalaVersions = scala2And3Versions,
settings = commonJsSettings
)
.dependsOn(core, serverCore % Test)

lazy val zio: ProjectMatrix = (projectMatrix in file("integrations/zio"))
.settings(commonSettings)
.settings(
Expand Down Expand Up @@ -957,22 +930,6 @@ lazy val jsoniterScala: ProjectMatrix = (projectMatrix in file("json/jsoniter"))
)
.dependsOn(core)

lazy val zio1Json: ProjectMatrix = (projectMatrix in file("json/zio1"))
.settings(commonSettings)
.settings(
name := "tapir-json-zio1",
libraryDependencies ++= Seq(
"dev.zio" %% "zio-json" % Versions.zio1Json,
scalaTest.value % Test
)
)
.jvmPlatform(scalaVersions = scala2And3Versions)
.jsPlatform(
scalaVersions = scala2Versions,
settings = commonJsSettings
)
.dependsOn(core)

lazy val zioJson: ProjectMatrix = (projectMatrix in file("json/zio"))
.settings(commonSettings)
.settings(
Expand Down Expand Up @@ -1330,18 +1287,6 @@ lazy val armeriaServerZio: ProjectMatrix =
.jvmPlatform(scalaVersions = scala2And3Versions)
.dependsOn(armeriaServer % CompileAndTest, zio, serverTests % Test)

lazy val armeriaServerZio1: ProjectMatrix =
(projectMatrix in file("server/armeria-server/zio1"))
.settings(commonJvmSettings)
.settings(
name := "tapir-armeria-server-zio1",
libraryDependencies ++= Seq(
"dev.zio" %% "zio-interop-reactivestreams" % Versions.zio1InteropReactiveStreams
)
)
.jvmPlatform(scalaVersions = scala2And3Versions)
.dependsOn(armeriaServer % CompileAndTest, zio1, serverTests % Test)

lazy val http4sServer: ProjectMatrix = (projectMatrix in file("server/http4s-server"))
.settings(commonJvmSettings)
.settings(
Expand Down Expand Up @@ -1369,18 +1314,6 @@ lazy val http4sServer2_12 = http4sServer.jvm(scala2_12).dependsOn(serverTests.jv
lazy val http4sServer2_13 = http4sServer.jvm(scala2_13).dependsOn(serverTests.jvm(scala2_13) % Test)
lazy val http4sServer3 = http4sServer.jvm(scala3).dependsOn(serverTests.jvm(scala3) % Test)

lazy val http4sServerZio1: ProjectMatrix = (projectMatrix in file("server/http4s-server/zio1"))
.settings(commonJvmSettings)
.settings(
name := "tapir-http4s-server-zio1",
libraryDependencies ++= Seq(
"dev.zio" %% "zio-interop-cats" % Versions.zio1InteropCats,
"org.http4s" %% "http4s-blaze-server" % Versions.http4sBlazeServer % Test
)
)
.jvmPlatform(scalaVersions = scala2And3Versions)
.dependsOn(zio1, http4sServer, serverTests % Test)

lazy val http4sServerZio: ProjectMatrix = (projectMatrix in file("server/http4s-server/zio"))
.settings(commonJvmSettings)
.settings(
Expand Down Expand Up @@ -1588,27 +1521,6 @@ lazy val vertxServerZio: ProjectMatrix = (projectMatrix in file("server/vertx-se
.jvmPlatform(scalaVersions = scala2And3Versions)
.dependsOn(serverCore, vertxServer % CompileAndTest, zio, serverTests % Test)

lazy val vertxServerZio1: ProjectMatrix = (projectMatrix in file("server/vertx-server/zio1"))
.settings(commonJvmSettings)
.settings(
name := "tapir-vertx-server-zio1",
libraryDependencies ++= Seq(
"dev.zio" %% "zio-interop-cats" % Versions.zio1InteropCats % Test
)
)
.settings(disableScaladocSettingsWhenScala3)
.jvmPlatform(scalaVersions = scala2And3Versions)
.dependsOn(serverCore, vertxServer % CompileAndTest, zio1, serverTests % Test)

lazy val zio1HttpServer: ProjectMatrix = (projectMatrix in file("server/zio1-http-server"))
.settings(commonJvmSettings)
.settings(
name := "tapir-zio1-http-server",
libraryDependencies ++= Seq("dev.zio" %% "zio-interop-cats" % Versions.zio1InteropCats % Test, "io.d11" %% "zhttp" % "1.0.0.0-RC29")
)
.jvmPlatform(scalaVersions = scala2And3Versions)
.dependsOn(serverCore, zio1, serverTests % Test)

lazy val zioHttpServer: ProjectMatrix = (projectMatrix in file("server/zio-http-server"))
.settings(commonJvmSettings)
.settings(
Expand Down Expand Up @@ -2013,22 +1925,6 @@ lazy val sttpClient: ProjectMatrix = (projectMatrix in file("client/sttp-client"
)
.dependsOn(clientCore, clientTests % Test)

lazy val sttpClientWsZio1: ProjectMatrix = (projectMatrix in file("client/sttp-client-ws-zio1"))
.settings(clientTestServerSettings)
.settings(
name := "tapir-sttp-client-ws-zio1"
)
.jvmPlatform(
scalaVersions = scala2And3Versions,
settings = commonJvmSettings ++ Seq(
libraryDependencies ++= Seq(
"com.softwaremill.sttp.client3" %% "zio1" % Versions.sttp % Test,
"com.softwaremill.sttp.shared" %% "zio1" % Versions.sttpShared
)
)
)
.dependsOn(sttpClient, clientTests % Test)

lazy val playClient: ProjectMatrix = (projectMatrix in file("client/play-client"))
.settings(clientTestServerSettings)
.settings(commonSettings)
Expand Down Expand Up @@ -2243,7 +2139,6 @@ lazy val documentation: ProjectMatrix = (projectMatrix in file("generated-doc"))
armeriaServer,
armeriaServerCats,
armeriaServerZio,
armeriaServerZio1,
jdkhttpServer,
circeJson,
enumeratum,
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading