Merge pull request #3107 from allanrenucci/sbt

allanrenucci · web-flow · commit 251657584b27 · 2017-09-12T18:00:36.000+02:00
Remove sbt deprecation warning
diff --git a/project/Build.scala b/project/Build.scala
@@ -228,9 +228,8 @@ object Build {
         .filterNot(_.get(artifact.key).exists(_.name == "dotty-library"))
         .map(_.data)
 
-      // This ScalaInstance#apply overload is deprecated in sbt 0.13, but the non-deprecated
-      // constructor in sbt 1.0 does not exist in sbt 0.13
-      ScalaInstance(scalaVersion.value, libraryJar, compilerJar, otherDependencies: _*)(state.value.classLoaderCache.apply)
+      val loader = state.value.classLoaderCache(libraryJar :: compilerJar :: otherDependencies.toList)
+      new ScalaInstance(scalaVersion.value, loader, libraryJar, compilerJar, otherDependencies, None)
     }
   )
 

Original file line number	Diff line number	Diff line change
`@@ -228,9 +228,8 @@ object Build {`
`228`	`228`	`.filterNot(_.get(artifact.key).exists(_.name == "dotty-library"))`
`229`	`229`	`.map(_.data)`
`230`	`230`
`231`		`- // This ScalaInstance#apply overload is deprecated in sbt 0.13, but the non-deprecated`
`232`		`- // constructor in sbt 1.0 does not exist in sbt 0.13`
`233`		`- ScalaInstance(scalaVersion.value, libraryJar, compilerJar, otherDependencies: _*)(state.value.classLoaderCache.apply)`
	`231`	`+ val loader = state.value.classLoaderCache(libraryJar :: compilerJar :: otherDependencies.toList)`
	`232`	`+ new ScalaInstance(scalaVersion.value, loader, libraryJar, compilerJar, otherDependencies, None)`
`234`	`233`	`}`
`235`	`234`	`)`
`236`	`235`