Skip to content

Commit 625ed91

Browse files
Adds missing command aliases
1 parent e67530c commit 625ed91

File tree

7 files changed

+24
-52
lines changed

7 files changed

+24
-52
lines changed

.travis.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

build.sbt

Lines changed: 13 additions & 7 deletions
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; headerCreateAll")
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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
55
addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.5.0")
66
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.13.3")
77
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
8+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
9+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5")

secret_key.asc.enc

-1.81 KB
Binary file not shown.

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

Lines changed: 1 addition & 3 deletions
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

Lines changed: 8 additions & 6 deletions
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
),

version.sbt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)