Skip to content

Commit 301883a

Browse files
kiroco12kiroco12
committed
Removed all warnings
1 parent b952acf commit 301883a

File tree

9 files changed

+92
-68
lines changed

9 files changed

+92
-68
lines changed

‎.scalafmt.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
version = 2.3.2
12
style = defaultWithAlign
23
maxColumn = 100
34

‎project/ProjectPlugin.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ object ProjectPlugin extends AutoPlugin {
5454
Seq(
5555
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value,
5656
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
57-
scalacOptions += "-Ymacro-annotations"
5857
)
5958
}
6059

@@ -114,6 +113,8 @@ object ProjectPlugin extends AutoPlugin {
114113
orgLicenseSetting := ApacheLicense,
115114
scalaVersion := "2.13.1",
116115
scalaOrganization := "org.scala-lang",
116+
scalacOptions ~= (_ filterNot (_ == "-Xfuture")),
117+
scalacOptions += "-Ymacro-annotations",
117118
javacOptions ++= Seq("-encoding", "UTF-8", "-Xlint:-options"),
118119
parallelExecution in Test := false,
119120
cancelable in Global := true,

‎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.5.2")
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-M3")
6+
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.12.3")
77
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")

‎server/src/main/scala/org/scalaexercises/evaluator/auth.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ object auth {
2929
config.getString(SecretKeyPath)
3030
} else {
3131
throw new IllegalStateException(
32-
"Missing -Deval.auth.secretKey=[YOUR_KEY_HERE] or env var [EVAL_SECRET_KEY] ")
32+
"Missing -Deval.auth.secretKey=[YOUR_KEY_HERE] or env var [EVAL_SECRET_KEY] "
33+
)
3334
}
3435

3536
def generateToken(value: String = "{}") =

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

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ import scala.util.control.NonFatal
3333

3434
class Evaluator[F[_]: Sync](timeout: FiniteDuration = 20.seconds)(
3535
implicit F: ConcurrentEffect[F],
36-
T: Timer[F]) {
36+
T: Timer[F]
37+
) {
3738
type Remote = String
3839

3940
private[this] def convert(errors: (Position, String, String)): (String, List[CompilationInfo]) = {
@@ -47,9 +48,8 @@ class Evaluator[F[_]: Sync](timeout: FiniteDuration = 20.seconds)(
4748
val exclusions: Set[(Organization, ModuleName)] =
4849
dependency.exclusions
4950
.fold(List[(Organization, ModuleName)]())(
50-
_.map(
51-
ex => (Organization(ex.organization), ModuleName(ex.moduleName))
52-
))
51+
_.map(ex => (Organization(ex.organization), ModuleName(ex.moduleName)))
52+
)
5353
.toSet
5454

5555
coursier
@@ -64,7 +64,8 @@ class Evaluator[F[_]: Sync](timeout: FiniteDuration = 20.seconds)(
6464

6565
def resolveArtifacts(
6666
remotes: Seq[Remote],
67-
dependencies: Seq[EvaluatorDependency]): F[Resolution] = {
67+
dependencies: Seq[EvaluatorDependency]
68+
): F[Resolution] = {
6869
Resolve[F](cache)
6970
.addDependencies(dependencies.map(dependencyToModule): _*)
7071
.addRepositories(remotes.map(remoteToRepository): _*)
@@ -74,7 +75,8 @@ class Evaluator[F[_]: Sync](timeout: FiniteDuration = 20.seconds)(
7475

7576
def fetchArtifacts(
7677
remotes: Seq[Remote],
77-
dependencies: Seq[EvaluatorDependency]): F[Either[ArtifactError, List[File]]] =
78+
dependencies: Seq[EvaluatorDependency]
79+
): F[Either[ArtifactError, List[File]]] =
7880
for {
7981
resolution <- resolveArtifacts(remotes, dependencies)
8082
gatheredArtifacts <- resolution.artifacts().toList.traverse(cache.file(_).run)
@@ -200,19 +202,20 @@ private class StringCompiler(
200202
case _ => ""
201203
}
202204
// the line number is not always available
203-
val lineMessage = try {
204-
"line " + (pos.line - lineOffset)
205-
} catch {
206-
case _: Throwable => ""
207-
}
205+
val lineMessage =
206+
try {
207+
"line " + (pos.line - lineOffset)
208+
} catch {
209+
case _: Throwable => ""
210+
}
208211
messages += (severityName + lineMessage + ": " + message) ::
209212
(if (pos.isDefined) {
210-
pos.finalPosition.lineContent.stripLineEnd ::
211-
(" " * (pos.column - 1) + "^") ::
213+
pos.finalPosition.lineContent.stripLineEnd ::
214+
(" " * (pos.column - 1) + "^") ::
215+
Nil
216+
} else {
212217
Nil
213-
} else {
214-
Nil
215-
})
218+
})
216219
}
217220

218221
override def reset = {
@@ -257,7 +260,7 @@ private class StringCompiler(
257260
// ...and 1/2 this line:
258261
compiler.compileSources(sourceFiles)
259262

260-
if (reporter.hasErrors || reporter.hasWarnings ) {
263+
if (reporter.hasErrors || reporter.hasWarnings) {
261264
val msgs: List[List[String]] = reporter match {
262265
case collector: MessageCollector =>
263266
collector.messages.toList
@@ -275,7 +278,8 @@ private class StringCompiler(
275278
code: String,
276279
className: String,
277280
resetState: Boolean = true,
278-
classLoader: ClassLoader): Class[_] = {
281+
classLoader: ClassLoader
282+
): Class[_] = {
279283
synchronized {
280284
apply(code)
281285
val clazz = findClass(className, classLoader).get // fixme
@@ -313,23 +317,27 @@ private class StringCompiler(
313317
* - return the result of `apply()`
314318
*/
315319
class Eval(target: Option[File] = None, jars: List[File] = Nil) {
316-
private lazy val compilerPath = try {
317-
classPathOfClass("scala.tools.nsc.Interpreter")
318-
} catch {
319-
case e: Throwable =>
320-
throw new RuntimeException(
321-
"Unable to load Scala interpreter from classpath (scala-compiler jar is missing?)",
322-
e)
323-
}
320+
private lazy val compilerPath =
321+
try {
322+
classPathOfClass("scala.tools.nsc.Interpreter")
323+
} catch {
324+
case e: Throwable =>
325+
throw new RuntimeException(
326+
"Unable to load Scala interpreter from classpath (scala-compiler jar is missing?)",
327+
e
328+
)
329+
}
324330

325-
private lazy val libPath = try {
326-
classPathOfClass("scala.AnyVal")
327-
} catch {
328-
case e: Throwable =>
329-
throw new RuntimeException(
330-
"Unable to load scala base object from classpath (scala-library jar is missing?)",
331-
e)
332-
}
331+
private lazy val libPath =
332+
try {
333+
classPathOfClass("scala.AnyVal")
334+
} catch {
335+
case e: Throwable =>
336+
throw new RuntimeException(
337+
"Unable to load scala base object from classpath (scala-library jar is missing?)",
338+
e
339+
)
340+
}
333341

334342
// For derived classes to provide an alternate compiler message handler.
335343
protected lazy val compilerMessageHandler: Option[Reporter] = None

‎server/src/main/scala/org/scalaexercises/evaluator/services.scala‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ object services {
6161
Option(res.toString),
6262
Option(res.asInstanceOf[AnyRef].getClass.getName),
6363
Option(out),
64-
cis)
64+
cis
65+
)
6566
case Timeout(_) =>
6667
EvalResponse(`Timeout Exceded`, None, None, None, Map.empty)
6768
case UnresolvedDependency(msg) =>
@@ -70,14 +71,16 @@ object services {
7071
None,
7172
None,
7273
None,
73-
Map.empty)
74+
Map.empty
75+
)
7476
case EvalRuntimeError(cis, runtimeError) =>
7577
EvalResponse(
7678
`Runtime Error`,
7779
runtimeError map (_.error.getMessage),
7880
runtimeError map (_.error.getClass.getName),
7981
None,
80-
cis)
82+
cis
83+
)
8184
case CompilationError(cis) =>
8285
EvalResponse(`Compilation Error`, None, None, None, cis)
8386
case GeneralError(err) =>

‎server/src/main/scala/org/scalaexercises/evaluator/types.scala‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,22 @@ final case class Dependency(
4242
groupId: String,
4343
artifactId: String,
4444
version: String,
45-
exclusions: Option[List[Exclusion]] = None)
45+
exclusions: Option[List[Exclusion]] = None
46+
)
4647

4748
final case class EvalRequest(
4849
resolvers: List[String] = Nil,
4950
dependencies: List[Dependency] = Nil,
50-
code: String)
51+
code: String
52+
)
5153

5254
final case class EvalResponse(
5355
msg: String,
5456
value: Option[String] = None,
5557
valueType: Option[String] = None,
5658
consoleOutput: Option[String] = None,
57-
compilationInfos: CI = Map.empty)
59+
compilationInfos: CI = Map.empty
60+
)
5861

5962
object EvalResponse {
6063

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

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ class EvalEndpointSpec extends AnyFunSpec with Matchers with Implicits {
3939
.run(
4040
Request[IO](POST, Uri(path = "/eval"))
4141
.withEntity(evalRequest)
42-
.putHeaders(authHeader))
42+
.putHeaders(authHeader)
43+
)
4344
.unsafeRunSync()
4445

4546
def verifyEvalResponse(
@@ -62,8 +63,10 @@ class EvalEndpointSpec extends AnyFunSpec with Matchers with Implicits {
6263
EvalRequest(
6364
code = "{ 41 + 1 }",
6465
resolvers = commonResolvers,
65-
dependencies = scalaDependencies(Scala211)),
66-
`X-Scala-Eval-Api-Token`(validToken)),
66+
dependencies = scalaDependencies(Scala211)
67+
),
68+
`X-Scala-Eval-Api-Token`(validToken)
69+
),
6770
expectedStatus = HttpStatus.Ok,
6871
expectedValue = Some("42"),
6972
expectedMessage = `ok`
@@ -76,8 +79,10 @@ class EvalEndpointSpec extends AnyFunSpec with Matchers with Implicits {
7679
EvalRequest(
7780
code = "{ while(true) {}; 123 }",
7881
resolvers = commonResolvers,
79-
dependencies = scalaDependencies(Scala212)),
80-
`X-Scala-Eval-Api-Token`(validToken)),
82+
dependencies = scalaDependencies(Scala212)
83+
),
84+
`X-Scala-Eval-Api-Token`(validToken)
85+
),
8186
expectedStatus = HttpStatus.Ok,
8287
expectedValue = None,
8388
expectedMessage = `Timeout Exceded`
@@ -91,7 +96,8 @@ class EvalEndpointSpec extends AnyFunSpec with Matchers with Implicits {
9196
code = "{import cats._; Eval.now(42).value}",
9297
resolvers = commonResolvers,
9398
dependencies = List(Dependency("org.typelevel", "cats_2.11", "0.6.0")) ++ scalaDependencies(
94-
Scala211)
99+
Scala211
100+
)
95101
),
96102
`X-Scala-Eval-Api-Token`(validToken)
97103
),
@@ -112,7 +118,8 @@ class EvalEndpointSpec extends AnyFunSpec with Matchers with Implicits {
112118
code = code,
113119
resolvers = resolvers,
114120
dependencies = List(Dependency("org.typelevel", "cats_2.11", "0.6.0")) ++ scalaDependencies(
115-
Scala211)
121+
Scala211
122+
)
116123
),
117124
`X-Scala-Eval-Api-Token`(validToken)
118125
),
@@ -131,10 +138,9 @@ class EvalEndpointSpec extends AnyFunSpec with Matchers with Implicits {
131138
EvalRequest(
132139
code = exerciseContentCode(true),
133140
resolvers = commonResolvers,
134-
dependencies = List(Dependency(
135-
"org.scala-exercises",
136-
"exercises-stdlib_2.12",
137-
exercisesVersion)) ++ scalaDependencies(Scala211)
141+
dependencies = List(
142+
Dependency("org.scala-exercises", "exercises-stdlib_2.12", exercisesVersion)
143+
) ++ scalaDependencies(Scala211)
138144
),
139145
`X-Scala-Eval-Api-Token`(validToken)
140146
),
@@ -150,10 +156,9 @@ class EvalEndpointSpec extends AnyFunSpec with Matchers with Implicits {
150156
EvalRequest(
151157
code = exerciseContentCode(false),
152158
resolvers = commonResolvers,
153-
dependencies = List(Dependency(
154-
"org.scala-exercises",
155-
"exercises-stdlib_2.12",
156-
exercisesVersion)) ++ scalaDependencies(Scala211)
159+
dependencies = List(
160+
Dependency("org.scala-exercises", "exercises-stdlib_2.12", exercisesVersion)
161+
) ++ scalaDependencies(Scala211)
157162
),
158163
`X-Scala-Eval-Api-Token`(validToken)
159164
),
@@ -170,7 +175,8 @@ class EvalEndpointSpec extends AnyFunSpec with Matchers with Implicits {
170175
resolvers = Nil,
171176
dependencies = Nil
172177
),
173-
`X-Scala-Eval-Api-Token`(invalidToken)).status should be(HttpStatus.Unauthorized)
178+
`X-Scala-Eval-Api-Token`(invalidToken)
179+
).status should be(HttpStatus.Unauthorized)
174180
}
175181

176182
it("rejects requests with missing tokens") {
@@ -180,7 +186,8 @@ class EvalEndpointSpec extends AnyFunSpec with Matchers with Implicits {
180186
resolvers = Nil,
181187
dependencies = Nil
182188
),
183-
`Accept-Ranges`(Nil)).status should be(HttpStatus.Unauthorized)
189+
`Accept-Ranges`(Nil)
190+
).status should be(HttpStatus.Unauthorized)
184191
}
185192

186193
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ class EvaluatorSpec extends AnyFunSpec with Matchers with Implicits {
5555
.eval(
5656
"{ while(true) {}; 123 }",
5757
remotes = commonResolvers,
58-
dependencies = scalaDependencies(Scala212))
58+
dependencies = scalaDependencies(Scala212)
59+
)
5960
.unsafeRunSync()
6061

6162
result should matchPattern {
@@ -84,13 +85,12 @@ Xor.Right(42).toOption.get
8485
)
8586
.unsafeRunSync()
8687

87-
result should matchPattern {
88-
case EvalSuccess(_, 42, _) =>
89-
}
88+
result should matchPattern { case EvalSuccess(_, 42, _) => }
9089
}
9190

9291
it(
93-
s"can load binary incompatible dependencies for an evaluation, for scala ${BuildInfo.scalaVersion}") {
92+
s"can load binary incompatible dependencies for an evaluation, for scala ${BuildInfo.scalaVersion}"
93+
) {
9494

9595
val result: EvalResult[Int] = evaluator
9696
.eval(
@@ -179,12 +179,12 @@ Eval.now(42).value
179179
result shouldBe a[EvalRuntimeError[_]]
180180
}
181181

182-
describe("can run code from the exercises content") {
182+
it("can run code with 2.13 dependencies") {
183183
val code = "{import cats._; Eval.now(42).value}"
184184

185-
val dependencies = Dependency("org.typelevel", "cats_2.11", "0.6.0") :: Nil
185+
val dependencies = Dependency("org.typelevel", "cats-core_2.13", "2.0.0") :: Nil
186186

187-
val result: EvalResult[Unit] = evaluator
187+
val result: EvalResult[Int] = evaluator
188188
.eval(code, remotes = remotes, dependencies = dependencies)
189189
.unsafeRunSync()
190190

0 commit comments

Comments
 (0)