Skip to content

Commit ddd9af7

Browse files
authored
Update sbt to 1.4.9
1 parent 1c72ea7 commit ddd9af7

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.7
1+
sbt.version=1.4.9

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,12 @@ import java.nio.file.Paths
3030
import cats.{`package` => _}
3131
import cats.data.Ior
3232
import cats.implicits._
33-
import sbt.internal.inc.{Analysis, MappedVirtualFile}
34-
import sbt.internal.inc.classpath.ClasspathUtilities
33+
import sbt.internal.inc.Analysis
34+
import sbt.internal.inc.classpath.ClasspathUtil
3535
import sbtbuildinfo.BuildInfoPlugin
3636
import sbtbuildinfo.BuildInfoPlugin.autoImport._
3737
import xsbti.compile.CompileAnalysis
38-
39-
import scala.jdk.CollectionConverters._
38+
import _root_.java.nio.file.Paths
4039

4140
/** The exercise compiler SBT auto plugin */
4241
object ExerciseCompilerPlugin extends AutoPlugin {
@@ -168,12 +167,12 @@ object ExerciseCompilerPlugin extends AutoPlugin {
168167

169168
val libraryClasspath = Attributed.data((fullClasspath in Compile).value)
170169
val classpath = (Meta.compilerClasspath ++ libraryClasspath).distinct
171-
val loader = ClasspathUtilities.toLoader(
172-
classpath,
170+
val loader = ClasspathUtil.toLoader(
171+
classpath.map(file => Paths.get(file.getAbsolutePath())),
173172
null,
174-
ClasspathUtilities.createClasspathResources(
175-
appPaths = Meta.compilerClasspath,
176-
bootPaths = scalaInstance.value.allJars
173+
ClasspathUtil.createClasspathResources(
174+
appPaths = Meta.compilerClasspath.map(file => Paths.get(file.getAbsolutePath())),
175+
bootPaths = scalaInstance.value.allJars.map(file => Paths.get(file.getAbsolutePath()))
177176
)
178177
)
179178

0 commit comments

Comments
 (0)