Skip to content
Open
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
19 changes: 9 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ inThisBuild(Def.settings(
concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
onLoad in Global := {
sLog.value.info(
s"Building Pekko HTTP ${version.value} against Pekko ${PekkoCoreDependency.version} on Scala ${(httpCore /
scalaVersion).value}")
s"Building Pekko HTTP ${version.value} against Pekko ${PekkoCoreDependency.version} on Scala ${
(httpCore /
scalaVersion).value
}")
(onLoad in Global).value
},
projectInfoVersion := (if (isSnapshot.value) "snapshot" else version.value),
Expand All @@ -71,7 +73,7 @@ lazy val userProjects: Seq[ProjectReference] = List[ProjectReference](
lazy val aggregatedProjects: Seq[ProjectReference] = userProjects ++ List[ProjectReference](
httpTests,
docs,
// compatibilityTests,
compatibilityTests,
httpJmhBench,
billOfMaterials)
lazy val root = Project(
Expand All @@ -82,9 +84,8 @@ lazy val root = Project(
.settings(
name := "pekko-http-root",
// Unidoc doesn't like macro definitions
// compatibilityTests temporarily disabled
unidocProjectExcludes := Seq(parsing, docs, httpTests, httpJmhBench, httpScalafix, httpScalafixRules,
httpScalafixTestInput, httpScalafixTestOutput, httpScalafixTests),
unidocProjectExcludes := Seq(parsing, compatibilityTests, docs, httpTests, httpJmhBench, httpScalafix,
httpScalafixRules, httpScalafixTestInput, httpScalafixTestOutput, httpScalafixTests),
// Support applying macros in unidoc:
scalaMacroSupport,
Compile / headerCreate / unmanagedSources := (baseDirectory.value / "project").**("*.scala").get)
Expand Down Expand Up @@ -434,14 +435,13 @@ lazy val docs = project("docs")
ValidatePR / additionalTasks += Compile / paradox)
.settings(ParadoxSupport.paradoxWithCustomDirectives)

/*
lazy val compatibilityTests = Project("http-compatibility-tests", file("http-compatibility-tests"))
.enablePlugins(NoPublish, NoScala3)
.enablePlugins(NoPublish)
.disablePlugins(MimaPlugin)
.addPekkoModuleDependency("pekko-stream", "provided", PekkoCoreDependency.default)
.settings(
libraryDependencies ++= Seq(
"org.apache.pekko" %% "pekko-http" % MiMa.latest101Version % "provided",
"org.apache.pekko" %% "pekko-http" % "1.0.0" % "provided"
),
(Test / dependencyClasspath) := {
// HACK: We'd like to use `dependsOn(http % "test->compile")` to upgrade the explicit dependency above to the
Expand All @@ -450,7 +450,6 @@ lazy val compatibilityTests = Project("http-compatibility-tests", file("http-com
(httpTests / Test / fullClasspath).value
}
)
*/

lazy val billOfMaterials = Project("bill-of-materials", file("bill-of-materials"))
.enablePlugins(BillOfMaterialsPlugin)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,9 @@ import Directives._
object CompatFormField {
def oneParameter: Directive1[Int] =
formField("num".as[Int])

def oneParameterRoute: Route =
oneParameter { num =>
complete(num.toString)
}

def twoParameters: Directive[(String, Int)] =
formFields(("name", "age".as[Int]))
def twoParametersRoute: Route =
twoParameters { (name, age) =>
complete(s"$name $age")
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,8 @@ class CompatFormFieldSpec extends RoutingSpec {
responseAs[String] shouldEqual "12"
}
}
"for two parameters" in {
val req = Post("/", FormData("name" -> "Aloisia", "age" -> "12"))
req ~> CompatFormField.twoParameters(echoComplete2) ~> check {
responseAs[String] shouldEqual "Aloisia 12"
}

req ~> CompatFormField.twoParametersRoute ~> check {
responseAs[String] shouldEqual "Aloisia 12"
}
}
} else
"ignore incompatiblity in 2.13" in succeed
"ignore incompatibility in 2.13" in succeed

"FormFieldDirectives" should {
"be compatible" should {
Expand Down
Loading