Skip to content

Commit

Permalink
Merge pull request kamon-io#49 from hygt/modulename
Browse files Browse the repository at this point in the history
Fix module name of published artifacts
  • Loading branch information
dpsoft committed Aug 20, 2021
2 parents c35b38b + 816c439 commit 961f73c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ def http4sDeps(version: String) = Seq(
"org.http4s" %% "http4s-server" % version % Provided,
"org.http4s" %% "http4s-blaze-client" % version % Test,
"org.http4s" %% "http4s-blaze-server" % version % Test,
"org.http4s" %% "http4s-dsl" % version % Test2
"org.http4s" %% "http4s-dsl" % version % Test
)

lazy val shared = Seq(
scalaVersion := "2.13.6",
crossScalaVersions := Seq("2.12.14", "2.13.6"),
moduleName := name.value,
publishTo := sonatypePublishToBundle.value,
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 12)) => Seq("-Ypartial-unification", "-language:higherKinds")
Expand All @@ -43,23 +44,23 @@ lazy val `kamon-http4s-0_22` = project
.settings(
shared,
name := "kamon-http4s-0.22",
libraryDependencies ++= http4sDeps("0.22.1")
libraryDependencies ++= http4sDeps("0.22.2")
)

lazy val `kamon-http4s-0_23` = project
.in(file("modules/0.23"))
.settings(
shared,
name := "kamon-http4s-0.23",
libraryDependencies ++= http4sDeps("0.23.0")
libraryDependencies ++= http4sDeps("0.23.1")
)

lazy val `kamon-http4s-1_0` = project
.in(file("modules/1.0"))
.settings(
shared,
name := "kamon-http4s-1.0",
libraryDependencies ++= http4sDeps("1.0.0-M23")
libraryDependencies ++= http4sDeps("1.0.0-M24")
)

lazy val root = project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class HttpMetricsSpec extends WordSpec
(srv, client, metrics).tupled.use(f.tupled).unsafeRunSync()

private def get[F[_]: Concurrent](path: String)(server: Server, client: Client[F]): F[String] = {
client.expect[String](s"http://127.0.0.1:${server.address.getPort}$path")
client.expect[String](s"http://127.0.0.1:${server.address.port}$path")
}

"The HttpMetrics" should {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class ServerInstrumentationSpec extends WordSpec
(srv, client).tupled.use(f.tupled).unsafeRunSync()

private def getResponse[F[_]: Concurrent](path: String)(server: Server, client: Client[F]): F[(String, Headers)] = {
client.get(s"http://127.0.0.1:${server.address.getPort}$path") { r =>
client.get(s"http://127.0.0.1:${server.address.port}$path") { r =>
r.bodyText.compile.toList.map(_.mkString).map(_ -> r.headers)
}
}
Expand Down

0 comments on commit 961f73c

Please sign in to comment.