Skip to content

Commit 463c037

Browse files
Upgrades different dependency versions. Removes some compilation warnings
1 parent 5f8e7f0 commit 463c037

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

client/shared/src/main/scala/org/scalaexercises/evaluator/EvaluatorClient.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package org.scalaexercises.evaluator
77

88
import cats.data.XorT
99
import cats.~>
10-
import cats._, cats.std.all._
10+
import cats.implicits._
1111
import org.scalaexercises.evaluator.EvaluatorResponses.{EvalIO, EvaluationException, EvaluationResponse, EvaluationResult}
1212
import org.scalaexercises.evaluator.free.algebra.EvaluatorOp
1313

project/EvaluatorBuild.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ object EvaluatorBuild extends AutoPlugin {
1515
object autoImport {
1616

1717
val v = Map(
18-
'cats -> "0.6.1",
19-
'circe -> "0.5.0-M2",
18+
'cats -> "0.7.2",
19+
'circe -> "0.5.2",
2020
'config -> "1.3.0",
2121
'coursier -> "1.0.0-M12",
22-
'http4s -> "0.14.1",
22+
'http4s -> "0.14.8",
2323
'jwtcore -> "0.8.0",
2424
'log4s -> "1.3.0",
25-
'monix -> "2.0-RC8",
25+
'monix -> "2.0.3",
2626
'roshttp -> "1.1.0",
2727
'scalacheck -> "1.12.5",
2828
'scalaTest -> "2.2.6",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ private class StringCompiler(
183183
}
184184
messages += (severityName + lineMessage + ": " + message) ::
185185
(if (pos.isDefined) {
186-
pos.inUltimateSource(pos.source).lineContent.stripLineEnd ::
186+
pos.finalPosition.lineContent.stripLineEnd ::
187187
(" " * (pos.column - 1) + "^") ::
188188
Nil
189189
} else {

server/src/test/scala/org/scalaexercises/evaluator/EvalEndpointSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class EvalEndpointSpec extends FunSpec with Matchers {
4848
)
4949
)
5050
).putHeaders(authHeader))
51-
.run
51+
.unsafePerformSync
5252

5353
def verifyEvalResponse(
5454
response: Response,
@@ -58,7 +58,7 @@ class EvalEndpointSpec extends FunSpec with Matchers {
5858
) = {
5959

6060
response.status should be(expectedStatus)
61-
val evalResponse = response.as[EvalResponse].run
61+
val evalResponse = response.as[EvalResponse].unsafePerformSync
6262
evalResponse.value should be(expectedValue)
6363
evalResponse.msg should be(expectedMessage)
6464
}

server/src/test/scala/org/scalaexercises/evaluator/EvaluatorSpec.scala

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ class EvaluatorSpec extends FunSpec with Matchers {
1717

1818
describe("evaluation") {
1919
it("can evaluate simple expressions") {
20-
val result: EvalResult[Int] = evaluator.eval("{ 41 + 1 }").run
20+
val result: EvalResult[Int] =
21+
evaluator.eval("{ 41 + 1 }").unsafePerformSync
2122

2223
result should matchPattern {
2324
case EvalSuccess(_, 42, _)
@@ -26,7 +27,7 @@ class EvaluatorSpec extends FunSpec with Matchers {
2627

2728
it("fails with a timeout when takes longer than the configured timeout") {
2829
val result: EvalResult[Int] =
29-
evaluator.eval("{ while(true) {}; 123 }").run
30+
evaluator.eval("{ while(true) {}; 123 }").unsafePerformSync
3031

3132
result should matchPattern {
3233
case Timeout(_)
@@ -51,7 +52,7 @@ Eval.now(42).value
5152
remotes = remotes,
5253
dependencies = dependencies
5354
)
54-
.run
55+
.unsafePerformSync
5556

5657
result should matchPattern {
5758
case EvalSuccess(_, 42, _) =>
@@ -78,14 +79,14 @@ Eval.now(42).value
7879
remotes = remotes,
7980
dependencies = dependencies1
8081
)
81-
.run
82+
.unsafePerformSync
8283
val result2: EvalResult[Int] = evaluator
8384
.eval(
8485
code,
8586
remotes = remotes,
8687
dependencies = dependencies2
8788
)
88-
.run
89+
.unsafePerformSync
8990

9091
result1 should matchPattern {
9192
case EvalSuccess(_, 42, _) =>
@@ -112,7 +113,7 @@ Asserts.scalaTestAsserts(true)
112113
remotes = remotes,
113114
dependencies = dependencies
114115
)
115-
.run
116+
.unsafePerformSync
116117

117118
result should matchPattern {
118119
case EvalSuccess(_, (), _) =>
@@ -136,7 +137,7 @@ Asserts.scalaTestAsserts(false)
136137
remotes = remotes,
137138
dependencies = dependencies
138139
)
139-
.run
140+
.unsafePerformSync
140141

141142
result should matchPattern {
142143
case EvalRuntimeError(

0 commit comments

Comments
 (0)