Skip to content

Commit bbf9b8e

Browse files
Merge pull request #13 from scala-exercises/jp-adds-sbt-dependency-to-evaluator-types
Adds SBT evaluator-types dependency
2 parents 270ac50 + c790256 commit bbf9b8e

File tree

5 files changed

+5
-79
lines changed

5 files changed

+5
-79
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: scala
22
sudo: required
33
scala:
4-
- 2.11.7
4+
- 2.11.8
55
jdk:
66
- oraclejdk8
77
cache:

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ val http4sVersion = "0.14.1"
33
val circeVersion = "0.4.1"
44

55
lazy val evaluator = (project in file("."))
6+
.enablePlugins(JavaAppPackaging)
67
.settings(
78
name := "evaluator",
89
scalaVersion := "2.11.8",
910
resolvers += Resolver.sonatypeRepo("snapshots"),
1011
libraryDependencies ++= Seq(
12+
"org.scala-exercises" %% "evaluator-types" % version.value,
1113
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
1214
"io.monix" %% "monix" % "2.0-RC8",
1315
"org.http4s" %% "http4s-dsl" % http4sVersion,
@@ -27,8 +29,6 @@ lazy val evaluator = (project in file("."))
2729
)
2830
)
2931

30-
enablePlugins(JavaAppPackaging)
31-
3232
addCompilerPlugin(
3333
"org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full
3434
)

src/main/resources/application.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
eval.auth {
22
secretKey = "secretKey"
33
secretKey = ${?EVAL_SECRET_KEY}
4-
}
5-
4+
}

src/main/scala/types.scala

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

version.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
version in ThisBuild := "0.1-SNAPSHOT"

0 commit comments

Comments
 (0)