Skip to content

Commit 9024046

Browse files
committed
Added code suggestions
1 parent d48d400 commit 9024046

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

build.sbt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
lazy val root = (project in file("."))
2-
.settings(mainClass in Universal := Some("org.scalaexercises.evaluator.EvaluatorServer"))
3-
.settings(stage := (stage in Universal in `evaluator-server`).value)
4-
.settings(noPublishSettings: _*)
5-
.aggregate(`evaluator-server`, `evaluator-client`)
6-
71
lazy val `evaluator-shared` = (project in file("shared"))
82
.enablePlugins(AutomateHeaderPlugin)
93
.settings(name := "evaluator-shared")
104

115
lazy val `evaluator-client` = (project in file("client"))
6+
.dependsOn(`evaluator-shared`)
127
.enablePlugins(AutomateHeaderPlugin)
138
.settings(
149
name := "evaluator-client",
1510
clientDependencies
1611
)
1712

1813
lazy val `evaluator-server` = (project in file("server"))
14+
.dependsOn(`evaluator-shared`)
1915
.enablePlugins(JavaAppPackaging)
2016
.enablePlugins(AutomateHeaderPlugin)
2117
.enablePlugins(sbtdocker.DockerPlugin)
@@ -40,6 +36,12 @@ lazy val `smoketests` = (project in file("smoketests"))
4036
)
4137
.settings(buildInfoSettings: _*)
4238

39+
lazy val root = (project in file("."))
40+
.settings(mainClass in Universal := Some("org.scalaexercises.evaluator.EvaluatorServer"))
41+
.settings(stage := (stage in Universal in `evaluator-server`).value)
42+
.settings(noPublishSettings: _*)
43+
.aggregate(`evaluator-server`, `evaluator-client`, `evaluator-shared`, `smoketests`)
44+
4345
addCommandAlias(
4446
"publishSignedAll",
4547
";evaluator-sharedJS/publishSigned;evaluator-sharedJVM/publishSigned;evaluator-clientJS/publishSigned;evaluator-clientJVM/publishSigned"

project/ProjectPlugin.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ object ProjectPlugin extends AutoPlugin {
2626
lazy val roshttp = "2.2.4"
2727
lazy val slf4jSimple = "1.7.28"
2828
lazy val jwtCore = "4.0.0"
29+
lazy val coursier = "2.0.0-RC3-2"
2930
}
3031

3132
lazy val dockerSettings = Seq(
@@ -83,7 +84,7 @@ object ProjectPlugin extends AutoPlugin {
8384
%%("jwt-core", V.jwtCore),
8485
%%("scalatest", V.scalatest) % "test"
8586
),
86-
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "2.0.0-RC3-2")
87+
addSbtPlugin("io.get-coursier" % "sbt-coursier" % V.coursier)
8788
)
8889

8990
lazy val buildInfoSettings = Seq(

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.2.7
1+
sbt.version=1.2.8

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.4.1")
33
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
44
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
55
addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.5.0")
6-
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.12.0-M1")
6+
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.12.0-M2")
77
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.1")

0 commit comments

Comments
 (0)