Skip to content

Update sbt to 1.4.9 #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 1, 2022
Merged

Update sbt to 1.4.9 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce84635
Update sbt to 1.4.9
47erbot Mar 10, 2021
5d10915
fix (known) deprecations
Feb 1, 2022
1145e67
Merge branch 'main' into update/sbt-1.4.9
Feb 1, 2022
ba81c2a
remove unused import
Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.7
sbt.version=1.4.9
17 changes: 8 additions & 9 deletions ...cise/src/main/scala/org/scalaexercises/exercises/sbtexercise/ExerciseCompilerPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@ import java.nio.file.Paths
import cats.{`package` => _}
import cats.data.Ior
import cats.implicits._
import sbt.internal.inc.{Analysis, MappedVirtualFile}
import sbt.internal.inc.classpath.ClasspathUtilities
import sbt.internal.inc.Analysis
import sbt.internal.inc.classpath.ClasspathUtil
import sbtbuildinfo.BuildInfoPlugin
import sbtbuildinfo.BuildInfoPlugin.autoImport._
import xsbti.compile.CompileAnalysis

import scala.jdk.CollectionConverters._
import _root_.java.nio.file.Paths

/** The exercise compiler SBT auto plugin */
object ExerciseCompilerPlugin extends AutoPlugin {
Expand Down Expand Up @@ -168,12 +167,12 @@ object ExerciseCompilerPlugin extends AutoPlugin {

val libraryClasspath = Attributed.data((fullClasspath in Compile).value)
val classpath = (Meta.compilerClasspath ++ libraryClasspath).distinct
val loader = ClasspathUtilities.toLoader(
classpath,
val loader = ClasspathUtil.toLoader(
classpath.map(file => Paths.get(file.getAbsolutePath())),
null,
ClasspathUtilities.createClasspathResources(
appPaths = Meta.compilerClasspath,
bootPaths = scalaInstance.value.allJars
ClasspathUtil.createClasspathResources(
appPaths = Meta.compilerClasspath.map(file => Paths.get(file.getAbsolutePath())),
bootPaths = scalaInstance.value.allJars.map(file => Paths.get(file.getAbsolutePath()))
)
)

Expand Down