Skip to content

Commit a59e556

Browse files
committed
Address as many warnings/errors as possible.
1 parent 57b7a52 commit a59e556

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package ch.epfl.scala
2+
3+
trait GithubDependencyGraphPluginCompat {
4+
val Inc: sbt.Inc.type = sbt.Inc
5+
val Value: sbt.Value.type = sbt.Value
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package ch.epfl.scala
2+
3+
trait GithubDependencyGraphPluginCompat {
4+
val Inc: sbt.Result.Inc.type = sbt.Result.Inc
5+
val Value: sbt.Result.Value.type = sbt.Result.Value
6+
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import sbt.internal.util.complete.Parsers
1313
import sbt.plugins.JvmPlugin
1414
import sjsonnew.shaded.scalajson.ast.unsafe.JString
1515

16-
object GithubDependencyGraphPlugin extends AutoPlugin {
16+
object GithubDependencyGraphPlugin extends AutoPlugin with GithubDependencyGraphPluginCompat {
1717
private val runtimeConfigs =
1818
Set(
1919
Compile,
@@ -46,12 +46,12 @@ object GithubDependencyGraphPlugin extends AutoPlugin {
4646
override def trigger = allRequirements
4747
override def requires: Plugins = JvmPlugin
4848

49-
override def globalSettings: Seq[Setting[_]] = Def.settings(
49+
override def globalSettings: Seq[Setting[?]] = Def.settings(
5050
githubStoreDependencyManifests := storeManifestsTask.evaluated,
5151
Keys.commands ++= SubmitDependencyGraph.commands ++ AnalyzeDependencyGraph.commands
5252
)
5353

54-
override def projectSettings: Seq[Setting[_]] = Def.settings(
54+
override def projectSettings: Seq[Setting[?]] = Def.settings(
5555
githubDependencyManifest := manifestTask.value,
5656
githubDependencyManifest / Keys.aggregate := false
5757
)
@@ -184,6 +184,7 @@ object GithubDependencyGraphPlugin extends AutoPlugin {
184184
.mapValues {
185185
_.map { case (_, dep) => dep }.toVector
186186
}
187+
.toMap
187188
val allDirectDependenciesRefs: Set[String] = allDirectDependencies.map(getReference).toSet
188189

189190
val resolved =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ object SubmitDependencyGraph {
168168
}
169169

170170
private def githubJob(correlator: String): Job = {
171-
val id = githubRunId
171+
val id = githubRunId()
172172
val html_url =
173173
for {
174174
serverUrl <- Properties.envOrNone("GITHUB_SERVER_URL")

0 commit comments

Comments
 (0)