wip

Author: James Santucci

build.sbt

@@ -12,6 +12,12 @@ addCommandAlias(
 addCommandAlias("ci-docs", ";github; mdoc; headerCreateAll")
 addCommandAlias("ci-publish", ";github; ci-release")
 
+def scalaVersionSuffix(scalaVersion: String) = CrossVersion.partialVersion(scalaVersion) match {
+  case Some((2, 12)) => "2.12"
+  case Some((2, 13)) => "2.13"
+  case s             => throw new Exception("$s")
+}
+
 lazy val V = new {
   val cats: String                = "2.7.0"
   val collectioncompat: String    = "2.6.0"
@@ -32,13 +38,13 @@ lazy val definitions = (project in file("definitions"))
   .settings(
     crossScalaVersions := Seq(V.scala212, V.scala),
     libraryDependencies ++= Seq(
-      "org.scala-lang.modules"     %% "scala-xml"                 % "1.2.0",
       "org.typelevel"              %% "cats-core"                 % V.cats,
       "org.scalacheck"             %% "scalacheck"                % V.scalacheck,
       "com.github.alexarchambault" %% "scalacheck-shapeless_1.15" % V.scalacheckShapeless,
-      "org.scalatest" %% "scalatest-core" % V.scalatest exclude ("org.scala-lang.modules", "scala-xml_2.12") exclude ("org.scala-lang.modules", "scala-xml_2.13"),
-      "org.scalatest" %% "scalatest" % V.scalatest exclude ("org.scala-lang.modules", "scala-xml_2.12") exclude ("org.scala-lang.modules", "scala-xml_2.13")
-    )
+      "org.scalatest"              %% "scalatest-core"            % V.scalatest,
+      "org.scalatest"              %% "scalatest"                 % V.scalatest
+    ),
+    dependencyOverrides += "org.scala-lang.modules" %% "scala-xml" % "2.0.1"
   )
 
 lazy val compiler = (project in file("compiler"))
@@ -48,19 +54,19 @@ lazy val compiler = (project in file("compiler"))
     crossScalaVersions := Seq(V.scala212, V.scala),
     scalacOptions -= "-Xfatal-warnings",
     libraryDependencies ++= Seq(
-      "org.scala-lang.modules" %% "scala-xml" % "1.2.0",
       "org.scala-exercises" %% "runtime" % V.runtime exclude ("org.scala-lang.modules", "scala-collection-compat"),
-      "org.scala-lang" % "scala-compiler" % scalaVersion.value exclude ("org.scala-lang.modules", "scala-xml"),
+      "org.scala-lang" % "scala-compiler" % scalaVersion.value,
       "org.scala-lang.modules" %% "scala-collection-compat" % V.collectioncompat,
       "org.typelevel"          %% "cats-core"               % V.cats % Compile,
       "org.http4s"             %% "http4s-blaze-client"     % V.http4s,
       "org.http4s"             %% "http4s-circe"            % V.http4s,
       "com.47deg"              %% "github4s"                % V.github4s,
-      "org.scalariform" %% "scalariform" % V.scalariform exclude ("org.scala-lang.modules", "scala-xml"),
-      "org.typelevel" %% "cats-laws" % V.cats % Test,
-      "org.scalatest" %% "scalatest-core" % V.scalatest % Test exclude ("org.scala-lang.modules", "scala-xml_2.12"),
-      "org.scalatest" %% "scalatest" % V.scalatest % Test exclude ("org.scala-lang.modules", "scala-xml_2.12")
-    )
+      "org.scalariform" %% "scalariform" % V.scalariform,
+      "org.typelevel" %% "cats-laws"      % V.cats      % Test,
+      "org.scalatest" %% "scalatest-core" % V.scalatest % Test,
+      "org.scalatest" %% "scalatest"      % V.scalatest % Test
+    ),
+    dependencyOverrides += "org.scala-lang.modules" %% "scala-xml" % "2.0.1"
   )
   .dependsOn(definitions)
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.6.1
+sbt.version=1.3.3

project/plugins.sbt

@@ -8,3 +8,6 @@ addSbtPlugin("com.alejandrohdezma"       % "sbt-github-header"        % "0.11.2"
 addSbtPlugin("com.alejandrohdezma"       % "sbt-github-mdoc"          % "0.11.2")
 addSbtPlugin("com.alejandrohdezma"       % "sbt-remove-test-from-pom" % "0.1.0")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"             % "0.1.20")
+addSbtPlugin("ch.epfl.scala" % "sbt-missinglink" % "0.3.3")
+
+libraryDependencies += "com.spotify" % "missinglink-core" % "0.2.5"

sbt-exercise/src/main/scala/org/scalaexercises/exercises/sbtexercise/ExerciseCompilerPlugin.scala

@@ -26,16 +26,14 @@ import java.io.PrintStream
 import sbt.{`package` => _, _}
 import sbt.Keys._
 import xsbt.api.Discovery
-import java.nio.file.Paths
 import cats.{`package` => _}
 import cats.data.Ior
 import cats.implicits._
 import sbt.internal.inc.Analysis
-import sbt.internal.inc.classpath.ClasspathUtil
+import sbt.internal.inc.classpath.ClasspathUtilities
 import sbtbuildinfo.BuildInfoPlugin
 import sbtbuildinfo.BuildInfoPlugin.autoImport._
 import xsbti.compile.CompileAnalysis
-import _root_.java.nio.file.Paths
 
 /** The exercise compiler SBT auto plugin */
 object ExerciseCompilerPlugin extends AutoPlugin {
@@ -167,12 +165,12 @@ object ExerciseCompilerPlugin extends AutoPlugin {
 
       val libraryClasspath = Attributed.data((Compile / fullClasspath).value)
       val classpath        = (Meta.compilerClasspath ++ libraryClasspath).distinct
-      val loader = ClasspathUtil.toLoader(
-        classpath.map(file => Paths.get(file.getAbsolutePath())),
+      val loader = ClasspathUtilities.toLoader(
+        classpath,
         null,
-        ClasspathUtil.createClasspathResources(
-          appPaths = Meta.compilerClasspath.map(file => Paths.get(file.getAbsolutePath())),
-          bootPaths = scalaInstance.value.allJars.map(file => Paths.get(file.getAbsolutePath()))
+        ClasspathUtilities.createClasspathResources(
+          appPaths = Meta.compilerClasspath,
+          bootPaths = scalaInstance.value.allJars
         )
       )
 
@@ -212,15 +210,7 @@ object ExerciseCompilerPlugin extends AutoPlugin {
             .flatMap(analysisIn match {
               case analysis: Analysis => analysis.relations.definesClass
             })
-            .map { file =>
-              (
-                file.name(),
-                IO.read(
-                  new File(
-                    (baseDir.getParentFile() +: file.names().tail).mkString("/")
-                  )
-                )
-              )
+            .map { file => (file.getPath, IO.read(file))
             }
 
           captureStdStreams(

sbt-exercise/src/sbt-test/sbt-exercise/basic/build.sbt

@@ -11,7 +11,7 @@ lazy val content = (project in file("content"))
       Resolver.defaultLocal
     ),
     libraryDependencies ++= Seq(
-      "org.scala-exercises" %% "runtime"           % "0.6.0",
+      "org.scala-exercises" %% "runtime"           % "0.7.0",
       "org.scala-exercises" %% "exercise-compiler" % pluginVersion changing (),
       "org.scala-exercises" %% "definitions"       % pluginVersion changing ()
     )
@@ -26,7 +26,7 @@ lazy val contentInPackages = (project in file("contentinpackages"))
       Resolver.defaultLocal
     ),
     libraryDependencies ++= Seq(
-      "org.scala-exercises" %% "runtime"           % "0.6.0",
+      "org.scala-exercises" %% "runtime"           % "0.7.0",
       "org.scala-exercises" %% "exercise-compiler" % pluginVersion changing (),
       "org.scala-exercises" %% "definitions"       % pluginVersion changing ()
     )