Skip to content

Commit e8a1b54

Browse files
Adds missing settings. Scalafmt changes
1 parent e67530c commit e8a1b54

File tree

8 files changed

+44
-70
lines changed

8 files changed

+44
-70
lines changed

.travis.yml

-35
This file was deleted.

build.sbt

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
addCommandAlias("ci-test", "scalafmtCheck; scalafmtSbtCheck; test")
2+
addCommandAlias("ci-docs", "project-docs/mdoc")
3+
14
Universal / javaOptions += "-Dscala.classpath.closeZip=true"
25

36
lazy val `evaluator-server` = (project in file("server"))
@@ -15,7 +18,7 @@ lazy val `evaluator-server` = (project in file("server"))
1518
.settings(buildInfoSettings: _*)
1619
.settings(serverScalaMacroDependencies: _*)
1720

18-
lazy val `smoketests` = (project in file("smoketests"))
21+
lazy val smoketests = (project in file("smoketests"))
1922
.dependsOn(`evaluator-server`)
2023
.enablePlugins(BuildInfoPlugin)
2124
.settings(noPublishSettings: _*)
@@ -30,10 +33,13 @@ lazy val root = (project in file("."))
3033
.settings(stage := (stage in Universal in `evaluator-server`).value)
3134
.settings(noPublishSettings: _*)
3235
.aggregate(`evaluator-server`)
36+
.dependsOn(`evaluator-server`)
3337

34-
addCommandAlias(
35-
"publishSignedAll",
36-
";evaluator-sharedJS/publishSigned;evaluator-sharedJVM/publishSigned;evaluator-clientJS/publishSigned;evaluator-clientJVM/publishSigned"
37-
)
38-
39-
pgpPassphrase := Some(getEnvVar("PGP_PASSPHRASE").getOrElse("").toCharArray)
38+
lazy val `project-docs` = (project in file(".docs"))
39+
.aggregate(`evaluator-server`, smoketests)
40+
.dependsOn(`evaluator-server`, smoketests)
41+
.settings(moduleName := "evaluator-project-docs")
42+
.settings(mdocIn := file(".docs"))
43+
.settings(mdocOut := file("."))
44+
.settings(skip in publish := true)
45+
.enablePlugins(MdocPlugin)

project/plugins.sbt

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
resolvers += Resolver.sonatypeRepo("snapshots")
2-
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.0")
3-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
4-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
5-
addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.5.0")
6-
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.13.3")
7-
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
2+
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.0")
3+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
4+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
5+
addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.5.0")
6+
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.13.3")
7+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
8+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5")
9+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.3")
10+
addSbtPlugin("com.alejandrohdezma" % "sbt-mdoc-toc" % "0.2")

secret_key.asc.enc

-1.81 KB
Binary file not shown.

server/src/main/scala/org/scalaexercises/evaluator/evaluation.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,7 @@ class ${className} extends (() => Any) with java.io.Serializable {
455455
case ncp =>
456456
ncp
457457
.split(" ")
458-
.map { f =>
459-
new File(relativeRoot, f).getAbsolutePath
460-
}
458+
.map(f => new File(relativeRoot, f).getAbsolutePath)
461459
.toList
462460

463461
}.unsafeRunSync

server/src/test/scala/org/scalaexercises/evaluator/EvalEndpointSpec.scala

+8-6
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,10 @@ class EvalEndpointSpec extends AnyFunSpec with Matchers with Implicits {
9595
EvalRequest(
9696
code = "{import cats._; Eval.now(42).value}",
9797
resolvers = commonResolvers,
98-
dependencies = List(Dependency("org.typelevel", "cats-core_2.13", "2.0.0")) ++ scalaDependencies(
99-
Scala213
100-
)
98+
dependencies =
99+
List(Dependency("org.typelevel", "cats-core_2.13", "2.0.0")) ++ scalaDependencies(
100+
Scala213
101+
)
101102
),
102103
`X-Scala-Eval-Api-Token`(validToken)
103104
),
@@ -117,9 +118,10 @@ class EvalEndpointSpec extends AnyFunSpec with Matchers with Implicits {
117118
EvalRequest(
118119
code = code,
119120
resolvers = resolvers,
120-
dependencies = List(Dependency("org.typelevel", "cats-core_2.13", version)) ++ scalaDependencies(
121-
Scala213
122-
)
121+
dependencies =
122+
List(Dependency("org.typelevel", "cats-core_2.13", version)) ++ scalaDependencies(
123+
Scala213
124+
)
123125
),
124126
`X-Scala-Eval-Api-Token`(validToken)
125127
),

smoketests/src/test/scala/org/scalaexercises/evaluator/Smoketests.scala

+13-12
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,30 @@ class Smoketests extends AnyFunSpec with Matchers with CirceInstances with Impli
2929
case _ => Uri.fromString("https://scala-evaluator-212.herokuapp.com/eval")
3030
})
3131
.handleErrorWith(_ =>
32-
IO.raiseError(new RuntimeException(
33-
s"Unable to parse the scala evaluator url for scala version ${BuildInfo.scalaVersion}")))
32+
IO.raiseError(
33+
new RuntimeException(
34+
s"Unable to parse the scala evaluator url for scala version ${BuildInfo.scalaVersion}"
35+
)
36+
)
37+
)
3438
.unsafeRunSync()
3539

3640
case class EvaluatorResponse(
3741
msg: String,
3842
value: String,
3943
valueType: String,
40-
compilationInfos: Map[String, String])
44+
compilationInfos: Map[String, String]
45+
)
4146

4247
implicit def decoder[F[_]: Sync]: EntityDecoder[F, EvaluatorResponse] =
4348
jsonOf[F, EvaluatorResponse]
4449

4550
val validToken =
4651
Jwt.encode("""{"user": "scala-exercises"}""", auth.secretKey, JwtAlgorithm.HS256)
4752

48-
def makeRequest(code: String)(
49-
expectation: EvaluatorResponse => Unit,
50-
failExpectation: Throwable => Unit = fail(_)): Unit = {
53+
def makeRequest(
54+
code: String
55+
)(expectation: EvaluatorResponse => Unit, failExpectation: Throwable => Unit = fail(_)): Unit = {
5156

5257
val request = Request[IO](method = Method.POST, uri = evaluatorUrl)
5358
.withEntity(s"""{"resolvers" : [], "dependencies" : [], "code" : "$code"}""")
@@ -72,9 +77,7 @@ class Smoketests extends AnyFunSpec with Matchers with CirceInstances with Impli
7277

7378
describe("Querying the /eval endpoint") {
7479
it("should succeed for a simple request") {
75-
makeRequest("1 + 1") { evaluatorResponse =>
76-
evaluatorResponse.value shouldBe "2"
77-
}
80+
makeRequest("1 + 1")(evaluatorResponse => evaluatorResponse.value shouldBe "2")
7881
}
7982

8083
it("should continue to work after calling System.exit") {
@@ -83,9 +86,7 @@ class Smoketests extends AnyFunSpec with Matchers with CirceInstances with Impli
8386
failExpectation = _ => ()
8487
)
8588

86-
makeRequest("1 + 1") { evaluatorResponse =>
87-
evaluatorResponse.value shouldBe "2"
88-
}
89+
makeRequest("1 + 1")(evaluatorResponse => evaluatorResponse.value shouldBe "2")
8990
}
9091

9192
it("should not expose sensitive details by calling sys.env") {

version.sbt

-1
This file was deleted.

0 commit comments

Comments
 (0)