Update sbt to 1.5.0

Author: 47erbot

build.sbt

@@ -69,7 +69,7 @@ lazy val `sbt-exercise` = (project in file("sbt-exercise"))
     libraryDependencies += "org.typelevel" %% "cats-core" % V.cats % Compile,
     addCompilerPlugin("org.scalamacros" % "paradise" % V.scalamacros cross CrossVersion.full),
     // Leverage build info to populate compiler classpath--
-    compilerClasspath := { fullClasspath in (compiler, Compile) }.value,
+    compilerClasspath := { (compiler / Compile / fullClasspath) }.value,
     buildInfoObject   := "Meta",
     buildInfoPackage  := "org.scalaexercises.plugin.sbtexercise",
     buildInfoKeys := Seq(
@@ -87,9 +87,9 @@ lazy val `sbt-exercise` = (project in file("sbt-exercise"))
     scriptedBufferLog := false,
     // Publish definitions before running scripted
     scriptedDependencies := {
-      val x = (compile in Test).value
-      val y = (publishLocal in definitions).value
-      val z = (publishLocal in compiler).value
+      val x = (Test / compile).value
+      val y = (definitions / publishLocal).value
+      val z = (compiler / publishLocal).value
       ()
     }
   )

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

@@ -290,7 +290,7 @@ object DocExtractionGlobal {
       embeddedDefaults[DocExtractionGlobal.type]
       // this flag is crucial for method body extraction
       Yrangepos.value = true
-      usejavacp.value = true
+      usejavacp.value = false
 
       bootclasspath.value = CompilerSettings.paths.mkString(File.pathSeparator)
       classpath.value = CompilerSettings.paths.mkString(File.pathSeparator)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.9
+sbt.version=1.5.0

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

@@ -67,22 +67,22 @@ object ExerciseCompilerPlugin extends AutoPlugin {
 
       products := {
         products.value ++
-        (products in Compile).value
+        (Compile / products).value
       },
 
       sourceGenerators   += generateExerciseSourcesTask,
       generateExercises  := generateExercisesTask.value
     )) ++
     Seq(
-      compile        := (compile in CompileGeneratedExercises).value,
-      copyResources  := (copyResources in CompileGeneratedExercises).value,
-      `package`      := (`package` in CompileGeneratedExercises).value,
-      artifacts    ++= Classpaths.artifactDefs(Seq(packageBin in CompileGeneratedExercises)).value,
-      artifact in (CompileGeneratedExercises, packageBin) ~= { _.withClassifier(None)},
+      compile        := (CompileGeneratedExercises / compile).value,
+      copyResources  := (CompileGeneratedExercises / copyResources).value,
+      `package`      := (CompileGeneratedExercises / `package`).value,
+      artifacts    ++= Classpaths.artifactDefs(Seq((CompileGeneratedExercises / packageBin))).value,
+      (CompileGeneratedExercises / packageBin / artifact) ~= { _.withClassifier(None)},
       ivyConfigurations   :=
         overrideConfigs(CompileGeneratedExercises, CustomCompile)(ivyConfigurations.value),
-      classDirectory in CompileGeneratedExercises := (classDirectory in Compile).value,
-      classpathConfiguration in CompileGeneratedExercises := (classpathConfiguration in Compile).value,
+      (CompileGeneratedExercises / classDirectory) := (Compile / classDirectory).value,
+      (CompileGeneratedExercises / classpathConfiguration) := (Compile / classpathConfiguration).value,
       fetchContributors := true,
       buildInfoObject   := "LibMetaInfo",
       buildInfoPackage  := "org.scalaexercises.content",
@@ -159,13 +159,13 @@ object ExerciseCompilerPlugin extends AutoPlugin {
   def generateExercisesTask =
     Def.task {
       val log             = streams.value.log
-      val baseDir         = (baseDirectory in Compile).value
+      val baseDir         = (Compile / baseDirectory).value
       lazy val analysisIn = (Compile / compile).value
 
       lazy val libraryNames = discoverLibraries(analysisIn)
       lazy val sectionNames = discoverSections(analysisIn)
 
-      val libraryClasspath = Attributed.data((fullClasspath in Compile).value)
+      val libraryClasspath = Attributed.data((Compile / fullClasspath).value)
       val classpath        = (Meta.compilerClasspath ++ libraryClasspath).distinct
       val loader = ClasspathUtil.toLoader(
         classpath.map(file => Paths.get(file.getAbsolutePath())),
@@ -276,7 +276,7 @@ object ExerciseCompilerPlugin extends AutoPlugin {
 
       val generated = generateExercises.value
 
-      val dir = (sourceManaged in Compile).value
+      val dir = (Compile / sourceManaged).value
       generated.map { case (n, code) =>
         val file = dir / (n.replace(".", "/") + ".scala")
         IO.write(file, code)