Skip to content

Update sbt to 1.4.7 #88

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 19 commits into from
Feb 1, 2022
Merged

Update sbt to 1.4.7 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e5a9308
Update sbt to 1.4.7
47erbot Feb 1, 2021
e7269e3
Merge branch 'main' into update/sbt-1.4.7
jisantuc Jan 31, 2022
214df7f
remove totally unnecessary beer emoji var
Jan 31, 2022
1d5f8ed
update for virtualized fs in sbt 1.4.x
Jan 31, 2022
e935878
use compile base path as root
Jan 31, 2022
6f4df76
upgrade scala in test dirs
Jan 31, 2022
133f2c0
add debug print
Jan 31, 2022
847c17a
include prefix in mappedvirtualfile name
Jan 31, 2022
d241ff3
add comment for a mythical wiser future human
Jan 31, 2022
79fe67a
print tree below baseDir to hunt for file
Feb 1, 2022
5ac29a6
Paths.get instead of Path.of
Feb 1, 2022
80a2b20
shuffle list transformation order
Feb 1, 2022
f45d00e
hack -- manually include main/scala
Feb 1, 2022
dab647d
woops bad first hack
Feb 1, 2022
8dcf80a
more debug printing
Feb 1, 2022
72e4174
un-array names print, add name
Feb 1, 2022
f1708f8
new _better_ hack
Feb 1, 2022
ee0476a
remove file walk debug
Feb 1, 2022
4a8dbae
use base dir's parent instead of base dir
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 compiler/src/main/scala/org/scalaexercises/exercises/compiler/Compiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class CompilerJava {
targetPackage,
fetchContributors
)
.fold(`🍺` => throw new Exception(`🍺`), out => Array(out._1, out._2))
.fold(err => throw new Exception(err), out => Array(out._1, out._2))
}
}

Expand Down
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.3.13
sbt.version=1.4.7
16 changes: 14 additions & 2 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 @@ -26,15 +26,18 @@ import java.io.PrintStream
import sbt.{`package` => _, _}
import sbt.Keys._
import xsbt.api.Discovery
import java.nio.file.Paths
import cats.{`package` => _}
import cats.data.Ior
import cats.implicits._
import sbt.internal.inc.Analysis
import sbt.internal.inc.{Analysis, MappedVirtualFile}
import sbt.internal.inc.classpath.ClasspathUtilities
import sbtbuildinfo.BuildInfoPlugin
import sbtbuildinfo.BuildInfoPlugin.autoImport._
import xsbti.compile.CompileAnalysis

import scala.jdk.CollectionConverters._

/** The exercise compiler SBT auto plugin */
object ExerciseCompilerPlugin extends AutoPlugin {

Expand Down Expand Up @@ -210,7 +213,16 @@ object ExerciseCompilerPlugin extends AutoPlugin {
.flatMap(analysisIn match {
case analysis: Analysis => analysis.relations.definesClass
})
.map(file => (file.getPath, IO.read(file)))
.map { file =>
(
file.name(),
IO.read(
new File(
(baseDir.getParentFile() +: file.names().tail).mkString("/")
)
)
)
}

captureStdStreams(
fOut = log.info(_: String),
Expand Down
6 changes: 3 additions & 3 deletions sbt-exercise/src/sbt-test/sbt-exercise/basic/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ val pluginVersion = System.getProperty("plugin.version")
lazy val content = (project in file("content"))
.enablePlugins(ExerciseCompilerPlugin)
.settings(
scalaVersion := "2.12.11",
scalaVersion := "2.12.15",
resolvers ++= Seq(
Resolver.sonatypeRepo("snapshots"),
Resolver.defaultLocal
Expand All @@ -20,7 +20,7 @@ lazy val content = (project in file("content"))
lazy val contentInPackages = (project in file("contentinpackages"))
.enablePlugins(ExerciseCompilerPlugin)
.settings(
scalaVersion := "2.12.11",
scalaVersion := "2.12.15",
resolvers ++= Seq(
Resolver.sonatypeRepo("snapshots"),
Resolver.defaultLocal
Expand All @@ -35,7 +35,7 @@ lazy val contentInPackages = (project in file("contentinpackages"))
lazy val check = (project in file("check"))
.dependsOn(content, contentInPackages)
.settings(
scalaVersion := "2.12.11",
scalaVersion := "2.12.15",
resolvers ++= Seq(
Resolver.sonatypeRepo("snapshots"),
Resolver.defaultLocal
Expand Down
2 changes: 1 addition & 1 deletion sbt-exercise/src/sbt-test/sbt-exercise/scalariform/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ val pluginVersion = System.getProperty("plugin.version")

lazy val root = (project in file("."))
.settings(
scalaVersion := "2.12.11",
scalaVersion := "2.12.15",
resolvers ++= Seq(
Resolver.sonatypeRepo("snapshots"),
Resolver.defaultLocal
Expand Down