From 7b37362348e549da850bcc2e83be19274407ed91 Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Mon, 29 Jun 2020 09:47:45 +0200 Subject: [PATCH 1/2] Cross-build Scala --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 92068d1..c040c1b 100755 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,11 @@ ThisBuild / organization := "org.scala-exercises" ThisBuild / githubOrganization := "47degrees" -ThisBuild / scalaVersion := V.scala +ThisBuild / scalaVersion := "2.13.3" +ThisBuild / crossScalaVersions := Seq("2.13.3", "2.12.11") publish / skip := true -addCommandAlias("ci-test", "scalafmtCheckAll; scalafmtSbtCheck; test") +addCommandAlias("ci-test", "scalafmtCheckAll; scalafmtSbtCheck; +test") addCommandAlias("ci-docs", "github; mdoc; headerCreateAll") addCommandAlias("ci-publish", "github; ci-release") @@ -13,7 +14,6 @@ lazy val V = new { val circe: String = "0.13.0" val classutil: String = "1.5.1" val http4s: String = "0.21.6" - val scala: String = "2.13.2" val scalatest: String = "3.2.0" } From 5c5abdbd2ec41677decfdc4602c9fd23c00a1643 Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Mon, 29 Jun 2020 09:49:32 +0200 Subject: [PATCH 2/2] Adds parenthesis - fixes compilation issue --- .../main/scala/org/scalaexercises/exercises/Exercises.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/src/main/scala/org/scalaexercises/exercises/Exercises.scala b/runtime/src/main/scala/org/scalaexercises/exercises/Exercises.scala index 94eae36..c420c53 100644 --- a/runtime/src/main/scala/org/scalaexercises/exercises/Exercises.scala +++ b/runtime/src/main/scala/org/scalaexercises/exercises/Exercises.scala @@ -38,7 +38,8 @@ object Exercises { .getURLs .map(url => new File(url.getFile)) filter (_.exists)).toSeq val classFinder = ClassFinder(files, Some(Opcodes.ASM7)) - val classes = classFinder.getClasses + val classes = classFinder + .getClasses() .filter(Try(_).isSuccess) .toList ClassFinder.classInfoMap(classes.iterator)