Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: scala
sudo: required
scala:
- 2.11.7
- 2.11.8
jdk:
- oraclejdk8
cache:
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ val http4sVersion = "0.14.1"
val circeVersion = "0.4.1"

lazy val evaluator = (project in file("."))
.enablePlugins(JavaAppPackaging)
.settings(
name := "evaluator",
scalaVersion := "2.11.8",
resolvers += Resolver.sonatypeRepo("snapshots"),
libraryDependencies ++= Seq(
"org.scala-exercises" %% "evaluator-types" % version.value,
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
"io.monix" %% "monix" % "2.0-RC8",
"org.http4s" %% "http4s-dsl" % http4sVersion,
Expand All @@ -27,8 +29,6 @@ lazy val evaluator = (project in file("."))
)
)

enablePlugins(JavaAppPackaging)

addCompilerPlugin(
"org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full
)
Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/application.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
eval.auth {
secretKey = "secretKey"
secretKey = ${?EVAL_SECRET_KEY}
}

}
74 changes: 0 additions & 74 deletions src/main/scala/types.scala

This file was deleted.

1 change: 1 addition & 0 deletions version.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version in ThisBuild := "0.1-SNAPSHOT"