Skip to content

Commit 76c99ac

Browse files
committed
Update to sbt 2.0.0-M4 and Scala 3.6.4, resolve new warnings.
1 parent 680a1ad commit 76c99ac

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

sbt-plugin/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ inThisBuild(
2222
)
2323

2424
val scala2 = "2.12.20"
25-
val scala3 = "3.6.3"
25+
val scala3 = "3.6.4"
2626

2727
val `sbt-github-dependency-submission` = project
2828
.in(file("."))
@@ -32,7 +32,7 @@ val `sbt-github-dependency-submission` = project
3232
pluginCrossBuild / sbtVersion := {
3333
scalaBinaryVersion.value match {
3434
case "2.12" => "1.5.8"
35-
case _ => "2.0.0-M3"
35+
case _ => "2.0.0-M4"
3636
}
3737
},
3838
scalaVersion := scala2,

sbt-plugin/src/main/scala/ch/epfl/scala/AnalyzeDependencyGraph.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ object AnalyzeDependencyGraph {
205205
firstPatchedVersion,
206206
securityVulnerability.collectFirst { case JField("severity", JString(sev)) => sev }.get
207207
)
208-
}
208+
}.toSeq
209209
case _ =>
210210
val message =
211211
s"Unexpected status ${httpResp.status} ${httpResp.statusText} with body:\n${httpResp.bodyAsString}"

sbt-plugin/src/main/scala/ch/epfl/scala/GithubDependencyGraphPlugin.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,10 @@ object GithubDependencyGraphPlugin extends AutoPlugin {
183183
allDependencies += (getReference(caller.caller) -> moduleRef)
184184
}
185185

186-
val allDependenciesMap: Map[String, Vector[String]] = allDependencies.view
187-
.groupBy(_._1)
188-
.mapValues {
189-
_.map { case (_, dep) => dep }.toVector
186+
val allDependenciesMap: Map[String, Vector[String]] =
187+
allDependencies.foldLeft(Map.empty[String, Vector[String]]) { case (acc, (ref, dep)) =>
188+
acc + (ref -> (acc.getOrElse(ref, Vector.empty) :+ dep))
190189
}
191-
.toMap
192190
val allDirectDependenciesRefs: Set[String] = allDirectDependencies.map(getReference).toSet
193191

194192
val resolved =

0 commit comments

Comments
 (0)