Merge pull request #5340 from eed3si9n/wip/bumpsbt

sbt 1.3.6

main/src/test/scala/sbt/internal/parser/ErrorSpec.scala

@@ -19,7 +19,7 @@ class ErrorSpec extends AbstractSpec {
   "Parser " should {
 
     "contains file name and line number" in {
-      val rootPath = getClass.getClassLoader.getResource("").getPath + "/error-format/"
+      val rootPath = getClass.getResource("/error-format/").getPath
       println(s"Reading files from: $rootPath")
       foreach(new File(rootPath).listFiles) { file =>
         print(s"Processing ${file.getName}: ")

main/src/test/scala/sbt/internal/parser/NewFormatSpec.scala

@@ -22,7 +22,7 @@ class NewFormatSpec extends AbstractSpec {
 
   "New Format " should {
     "Handle lines " in {
-      val rootPath = getClass.getClassLoader.getResource("").getPath + "/new-format/"
+      val rootPath = getClass.getResource("/new-format").getPath
       println(s"Reading files from: $rootPath")
       val allFiles = new File(rootPath).listFiles.toList
       foreach(allFiles) { path =>

main/src/test/scala/sbt/internal/parser/SessionSettingsSpec.scala

@@ -18,7 +18,7 @@ import scala.io.Source
 import SessionSettings.SessionSetting
 
 abstract class AbstractSessionSettingsSpec(folder: String) extends AbstractSpec {
-  protected val rootPath = getClass.getClassLoader.getResource("").getPath + folder
+  protected val rootPath = getClass.getResource("/" + folder).getPath
   println(s"Reading files from: $rootPath")
   protected val rootDir = new File(rootPath)
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.4
+sbt.version=1.3.6