Skip to content

Commit 825c4d5

Browse files
committed
scalafix
1 parent cd3b748 commit 825c4d5

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

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

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,23 @@ import java.nio.file.Paths
44

55
import scala.concurrent.Await
66
import scala.concurrent.duration.Duration
7-
import scala.util.{Properties, Try}
7+
import scala.sys.process._
8+
import scala.util.Properties
9+
import scala.util.Try
10+
811
import ch.epfl.scala.GithubDependencyGraphPlugin.autoImport._
912
import ch.epfl.scala.githubapi._
13+
import gigahorse.FullResponse
14+
import gigahorse.HttpClient
1015
import gigahorse.support.asynchttpclient.Gigahorse
1116
import sbt._
1217
import sbt.internal.util.complete._
13-
import sjsonnew.shaded.scalajson.ast.unsafe.{JArray, JObject, JField, JString}
14-
import gigahorse.{FullResponse, HttpClient}
18+
import sjsonnew.shaded.scalajson.ast.unsafe.JArray
19+
import sjsonnew.shaded.scalajson.ast.unsafe.JField
20+
import sjsonnew.shaded.scalajson.ast.unsafe.JObject
21+
import sjsonnew.shaded.scalajson.ast.unsafe.JString
1522
import sjsonnew.support.scalajson.unsafe.{Parser => JsonParser}
1623

17-
import scala.sys.process._
18-
1924
object AnalyzeDependencyGraph {
2025

2126
object Model {
@@ -139,18 +144,15 @@ object AnalyzeDependencyGraph {
139144
}
140145

141146
private def getAllArtifacts(state: State): Seq[String] =
142-
getGithubManifest(state)
143-
.flatMap { manifests =>
144-
manifests.flatMap {
145-
case (_, manifest) =>
146-
manifest.resolved.values.toSeq.map(_.package_url)
147-
}
147+
getGithubManifest(state).flatMap { manifests =>
148+
manifests.flatMap {
149+
case (_, manifest) =>
150+
manifest.resolved.values.toSeq.map(_.package_url)
148151
}
149-
.distinct
150-
151-
private def translateToSemVer(string: String): String =
152-
string.replaceAll("([a-zA-Z]+)", "0").replaceAll("([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+)", "$1.$2.$3-$4")
152+
}.distinct
153153

154+
private def translateToSemVer(string: String): String =
155+
string.replaceAll("([a-zA-Z]+)", "0").replaceAll("([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+)", "$1.$2.$3-$4")
154156

155157
private def versionMatchesRange(versionStr: String, rangeStr: String): Boolean = {
156158
val range = rangeStr.replaceAll(" ", "").replace(",", " ")
@@ -175,7 +177,8 @@ object AnalyzeDependencyGraph {
175177
}
176178

177179
private def analyzeCves(state: State): State = {
178-
val vulnerabilities = getStateOrWarn(state, githubAlertsKey, "artifcats", s"${AnalyzeDependencies} alerts").getOrElse(Seq.empty)
180+
val vulnerabilities =
181+
getStateOrWarn(state, githubAlertsKey, "artifcats", s"${AnalyzeDependencies} alerts").getOrElse(Seq.empty)
179182
val artifacts = getAllArtifacts(state)
180183
vulnerabilities.foreach { v =>
181184
val matches = vulnerabilityMatchesArtifacts(v, artifacts)
@@ -239,5 +242,5 @@ object AnalyzeDependencyGraph {
239242
}
240243
}
241244

242-
private def githubToken( ): String = Properties.envOrElse("GITHUB_TOKEN", "")
245+
private def githubToken(): String = Properties.envOrElse("GITHUB_TOKEN", "")
243246
}

0 commit comments

Comments
 (0)