Bumps sbt up (#17)

* Bumps sbt up

* Adds classpath and bootclasspath to the compiler instance settings

compiler/src/main/scala/org/scalaexercises/exercises/compiler/CompilerSettings.scala

@@ -0,0 +1,39 @@
+package org.scalaexercises.exercises.compiler
+
+object CompilerSettings {
+
+  private def classPathOfClass(className: String): List[String] = {
+    val resource = className.split('.').mkString("/", "/", ".class")
+    val path     = getClass.getResource(resource).getPath
+    if (path.indexOf("file:") >= 0) {
+      val indexOfFile      = path.indexOf("file:") + 5
+      val indexOfSeparator = path.lastIndexOf('!')
+      List(path.substring(indexOfFile, indexOfSeparator))
+    } else {
+      require(path.endsWith(resource))
+      List(path.substring(0, path.length - resource.length + 1))
+    }
+  }
+
+  private lazy val compilerPath =
+    try classPathOfClass("scala.tools.nsc.Interpreter")
+    catch {
+      case e: Throwable =>
+        throw new RuntimeException(
+          "Unable to load Scala interpreter from classpath (scala-compiler jar is missing?)",
+          e
+        )
+    }
+
+  private lazy val libPath =
+    try classPathOfClass("scala.AnyVal")
+    catch {
+      case e: Throwable =>
+        throw new RuntimeException(
+          "Unable to load scala base object from classpath (scala-library jar is missing?)",
+          e
+        )
+    }
+
+  lazy val paths: List[String] = compilerPath ::: libPath
+}

compiler/src/main/scala/org/scalaexercises/exercises/compiler/SourceTextExtraction.scala

@@ -16,13 +16,15 @@
 
 package org.scalaexercises.compiler
 
-import scala.annotation.tailrec
+import java.io.File
+
+import org.scalaexercises.exercises.compiler.CompilerSettings
 
+import scala.annotation.tailrec
 import scala.collection.compat._
 import scala.reflect.internal.util.BatchSourceFile
 import scala.tools.nsc._
 import scala.tools.nsc.doc.{Settings => _, _}
-
 import scala.tools.nsc.doc.base.comment.Comment
 
 class SourceTextExtraction {
@@ -287,10 +289,15 @@ class DocExtractionGlobal(settings: Settings = DocExtractionGlobal.defaultSettin
 }
 
 object DocExtractionGlobal {
+
   def defaultSettings =
     new Settings {
       embeddedDefaults[DocExtractionGlobal.type]
       // this flag is crucial for method body extraction
       Yrangepos.value = true
+      usejavacp.value = true
+
+      bootclasspath.value = CompilerSettings.paths.mkString(File.pathSeparator)
+      classpath.value = CompilerSettings.paths.mkString(File.pathSeparator)
     }
 }

compiler/src/test/scala/org/scalaexercises/exercises/compiler/CompilerSpec.scala

@@ -16,7 +16,11 @@
 
 package org.scalaexercises.compiler
 
+import java.io.File
+import java.net.URLClassLoader
+
 import org.scalaexercises.definitions.{BuildInfo, Library}
+import org.scalaexercises.exercises.compiler.CompilerSettings
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.should.Matchers
 
@@ -148,8 +152,28 @@ class CompilerSpec extends AnyFunSpec with Matchers {
   }
 
   object globalUtil {
+
+    def getClassPath(cl: ClassLoader, acc: List[List[String]] = List.empty): List[List[String]] = {
+      val cp = cl match {
+        case urlClassLoader: URLClassLoader =>
+          urlClassLoader.getURLs
+            .filter(_.getProtocol == "file")
+            .map(u => new File(u.toURI).getPath)
+            .toList
+        case _ => Nil
+      }
+      cl.getParent match {
+        case null   => (cp :: acc).reverse
+        case parent => getClassPath(parent, cp :: acc)
+      }
+    }
+
+    val currentClassPath: List[String] = getClassPath(this.getClass.getClassLoader).head
     val global = new Global(new Settings {
       embeddedDefaults[CompilerSpec]
+
+      bootclasspath.value = CompilerSettings.paths.mkString(File.pathSeparator)
+      classpath.value = (CompilerSettings.paths ::: currentClassPath).mkString(File.pathSeparator)
     })
     val outputTarget = new VirtualDirectory("(memory)", None)
     global.settings.outputDirs.setSingleOutput(outputTarget)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.13