Skip to content

Commit

Permalink
chore(pub): Improve function names
Browse files Browse the repository at this point in the history
Use "analyze" instead of "scan" to avoid confusion with ORT's scanner.

Signed-off-by: Martin Nonnenmacher <[email protected]>
  • Loading branch information
mnonnenmacher committed Jul 12, 2024
1 parent 824cc38 commit e93de8a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions plugins/package-managers/pub/src/main/kotlin/Pub.kt
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ class Pub(
// dependencies for each pub dependency manually, as the analyzer will only scan the
// projectRoot, but not the packages in the ".pub-cache" directory.
if (containsFlutter && !pubDependenciesOnly) {
scanAndroidPackages(pkgInfoFromLockfile, labels, workingDir).forEach { resultAndroid ->
analyzeAndroidPackages(pkgInfoFromLockfile, labels, workingDir).forEach { resultAndroid ->
packageReferences += packageInfo.toReference(
dependencies = resultAndroid.project.scopes
.find { it.name == "releaseCompileClasspath" }
Expand Down Expand Up @@ -429,7 +429,7 @@ class Pub(

private val analyzerResultCacheAndroid = mutableMapOf<String, List<ProjectAnalyzerResult>>()

private fun scanAndroidPackages(
private fun analyzeAndroidPackages(
packageInfo: JsonNode,
labels: Map<String, String>,
workingDir: File
Expand Down Expand Up @@ -469,7 +469,7 @@ class Pub(
}
}

private fun scanIosPackages(packageInfo: JsonNode, workingDir: File): ProjectAnalyzerResult? {
private fun analyzeIosPackages(packageInfo: JsonNode, workingDir: File): ProjectAnalyzerResult? {
// TODO: Implement similar to `scanAndroidPackages` once CocoaPods is implemented.
val packageName = packageInfo["description"]["name"].textValueOrEmpty()

Expand Down Expand Up @@ -665,7 +665,7 @@ class Pub(
if (containsFlutter && !pubDependenciesOnly) {
lockfile["packages"]?.forEach { pkgInfoFromLockfile ->
// As this package contains Flutter, trigger Gradle manually for it.
scanAndroidPackages(pkgInfoFromLockfile, labels, workingDir).forEach { result ->
analyzeAndroidPackages(pkgInfoFromLockfile, labels, workingDir).forEach { result ->
result.collectPackagesByScope("releaseCompileClasspath").forEach { pkg ->
packages[pkg.id] = pkg
}
Expand All @@ -674,7 +674,7 @@ class Pub(
}

// As this package contains Flutter, trigger CocoaPods manually for it.
scanIosPackages(pkgInfoFromLockfile, workingDir)?.let { result ->
analyzeIosPackages(pkgInfoFromLockfile, workingDir)?.let { result ->
result.packages.forEach { pkg ->
packages[pkg.id] = pkg
}
Expand Down

0 comments on commit e93de8a

Please sign in to comment.