Skip to content

Commit b952acf

Browse files
committed
Added code suggestions
1 parent 41792f5 commit b952acf

File tree

4 files changed

+2
-17
lines changed

4 files changed

+2
-17
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ before_install:
2222
fi
2323

2424
after_success:
25-
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_SCALA_VERSION" = "2.12.10" ]; then
25+
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_SCALA_VERSION" = "2.13.1" ]; then
2626
sbt ++$TRAVIS_SCALA_VERSION publishSignedAll;
2727
echo "Deploying to Heroku";
2828
docker login --username=noel.m@47deg.com --password=$heroku_token registry.heroku.com;

project/ProjectPlugin.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ object ProjectPlugin extends AutoPlugin {
115115
scalaVersion := "2.13.1",
116116
scalaOrganization := "org.scala-lang",
117117
javacOptions ++= Seq("-encoding", "UTF-8", "-Xlint:-options"),
118-
//javaOptions += "-Dscala.classpath.closeZip=true",
119-
//fork in Test := false,
120118
parallelExecution in Test := false,
121119
cancelable in Global := true,
122120
headerLicense := Some(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ private class StringCompiler(
257257
// ...and 1/2 this line:
258258
compiler.compileSources(sourceFiles)
259259

260-
if (reporter.hasErrors /* || reporter.hasWarnings*/ ) {
260+
if (reporter.hasErrors || reporter.hasWarnings ) {
261261
val msgs: List[List[String]] = reporter match {
262262
case collector: MessageCollector =>
263263
collector.messages.toList

server/src/main/scala/org/scalaexercises/evaluator/untitled.sc

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

0 commit comments

Comments
 (0)