diff --git a/build.sbt b/build.sbt index 6d6aa08df..219e1cbfe 100644 --- a/build.sbt +++ b/build.sbt @@ -77,7 +77,6 @@ lazy val root = project slf4jBridge, slf4j2Bridge, jpl, - apiHttp, benchmarks, examplesCore, examplesJpl, @@ -111,18 +110,6 @@ lazy val coreJS = core.js.settings( libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion % Test ) -lazy val apiHttp = project - .in(file("api-http")) - .dependsOn(coreJVM) - .settings(stdSettings("zio-logging-api-http", turnCompilerWarningIntoErrors = false)) - .settings(enableZIO()) - .settings(mimaSettings(failOnProblem = true)) - .settings( - libraryDependencies ++= Seq( - "dev.zio" %% "zio-http" % zioHttp - ) - ) - lazy val slf4j = project .in(file("slf4j")) .dependsOn(coreJVM) @@ -206,13 +193,14 @@ lazy val benchmarks = project lazy val examplesCore = project .in(file("examples/core")) - .dependsOn(coreJVM, apiHttp) + .dependsOn(coreJVM) .settings(stdSettings("zio-logging-examples-core", turnCompilerWarningIntoErrors = false)) .settings(enableZIO()) .settings( publish / skip := true, libraryDependencies ++= Seq( "dev.zio" %% "zio-metrics-connectors" % zioMetricsConnectorsVersion, + "dev.zio" %% "zio-http" % zioHttp, "dev.zio" %% "zio-config-typesafe" % zioConfig ) ) diff --git a/api-http/src/main/scala/zio/logging/api/http/ApiDomain.scala b/examples/core/src/main/scala/zio/logging/api/http/ApiDomain.scala similarity index 100% rename from api-http/src/main/scala/zio/logging/api/http/ApiDomain.scala rename to examples/core/src/main/scala/zio/logging/api/http/ApiDomain.scala diff --git a/api-http/src/main/scala/zio/logging/api/http/ApiEndpoints.scala b/examples/core/src/main/scala/zio/logging/api/http/ApiEndpoints.scala similarity index 100% rename from api-http/src/main/scala/zio/logging/api/http/ApiEndpoints.scala rename to examples/core/src/main/scala/zio/logging/api/http/ApiEndpoints.scala diff --git a/api-http/src/main/scala/zio/logging/api/http/ApiHandlers.scala b/examples/core/src/main/scala/zio/logging/api/http/ApiHandlers.scala similarity index 100% rename from api-http/src/main/scala/zio/logging/api/http/ApiHandlers.scala rename to examples/core/src/main/scala/zio/logging/api/http/ApiHandlers.scala diff --git a/api-http/src/test/scala/zio/logging/api/http/ApiEndpointsSpec.scala b/examples/core/src/test/scala/zio/logging/api/http/ApiEndpointsSpec.scala similarity index 100% rename from api-http/src/test/scala/zio/logging/api/http/ApiEndpointsSpec.scala rename to examples/core/src/test/scala/zio/logging/api/http/ApiEndpointsSpec.scala diff --git a/api-http/src/test/scala/zio/logging/api/http/ApiHandlersSpec.scala b/examples/core/src/test/scala/zio/logging/api/http/ApiHandlersSpec.scala similarity index 100% rename from api-http/src/test/scala/zio/logging/api/http/ApiHandlersSpec.scala rename to examples/core/src/test/scala/zio/logging/api/http/ApiHandlersSpec.scala