Skip to content

Commit e05d50f

Browse files
Moving exampleFrameworkSuites above the exampleCases
1 parent 72ba0c5 commit e05d50f

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

build.sbt

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,22 @@ assemblyMergeStrategy in assembly := {
3939
oldStrategy(x)
4040
}
4141

42+
val exampleFrameworkSuites = Map(
43+
"scala" -> List(
44+
("akka-http", "akkaHttp", List("client", "server")),
45+
("endpoints", "endpoints", List("client")),
46+
("http4s", "http4s", List("client", "server"))
47+
),
48+
"java" -> List(
49+
("dropwizard", "dropwizard", List("client", "server")),
50+
("spring-mvc", "springMvc", List("server"))
51+
)
52+
)
53+
54+
55+
val scalaFrameworks = exampleFrameworkSuites("scala").map(_._2)
56+
val javaFrameworks = exampleFrameworkSuites("java").map(_._2)
57+
4258
import com.twilio.guardrail.sbt.ExampleCase
4359
def sampleResource(name: String): java.io.File = file(s"modules/sample/src/main/resources/${name}")
4460
val exampleCases: List[ExampleCase] = List(
@@ -89,18 +105,6 @@ val exampleCases: List[ExampleCase] = List(
89105
ExampleCase(sampleResource("base64.yaml"), "base64").frameworks(Set("akka-http", "http4s", "endpoints")),
90106
)
91107

92-
val exampleFrameworkSuites = Map(
93-
"scala" -> List(
94-
("akka-http", "akkaHttp", List("client", "server")),
95-
("endpoints", "endpoints", List("client")),
96-
("http4s", "http4s", List("client", "server"))
97-
),
98-
"java" -> List(
99-
("dropwizard", "dropwizard", List("client", "server")),
100-
("spring-mvc", "springMvc", List("server"))
101-
)
102-
)
103-
104108
def exampleArgs(language: String): List[List[String]] = exampleCases
105109
.foldLeft(List[List[String]](List(language)))({
106110
case (acc, ExampleCase(path, prefix, extra, onlyFrameworks)) =>
@@ -143,9 +147,6 @@ artifact in (Compile, assembly) := {
143147

144148
addArtifact(artifact in (Compile, assembly), assembly)
145149

146-
val scalaFrameworks = exampleFrameworkSuites("scala").map(_._2)
147-
val javaFrameworks = exampleFrameworkSuites("java").map(_._2)
148-
149150
addCommandAlias("resetSample", "; " ++ (scalaFrameworks ++ javaFrameworks).map(x => s"${x}Sample/clean").mkString(" ; "))
150151

151152
// Deprecated command

0 commit comments

Comments
 (0)