diff --git a/plugins/package-managers/conan/src/main/kotlin/Conan.kt b/plugins/package-managers/conan/src/main/kotlin/Conan.kt index dcd72d07abc3..09800f73b418 100644 --- a/plugins/package-managers/conan/src/main/kotlin/Conan.kt +++ b/plugins/package-managers/conan/src/main/kotlin/Conan.kt @@ -180,7 +180,7 @@ class Conan( dependencies = parseDependencyTree(pkgInfos, projectInfo.buildRequires, workingDir) ) - val projectPackage = parseProjectPackage(pkgInfos, definitionFile, workingDir) + val projectPackage = generateProjectPackage(projectInfo, definitionFile, workingDir) return listOf( ProjectAnalyzerResult( @@ -403,23 +403,14 @@ class Conan( } /** - * Return a [Package] containing project-level information depending on which [definitionFile] was found: + * Return a [Package] containing project-level information from [pkgInfo] and [definitionFile] using the + * `conan inspect` command if possible: * - conanfile.txt: `conan inspect conanfile.txt` is not supported. * - conanfile.py: `conan inspect conanfile.py` is supported and more useful project metadata is parsed. * * TODO: The format of `conan info` output for a conanfile.txt file may be such that we can get project metadata * from the `requires` field. Need to investigate whether this is a sure thing before implementing. */ - private fun parseProjectPackage(pkgInfos: List, definitionFile: File, workingDir: File): Package { - val projectPackage = findProjectPackageInfo(pkgInfos, definitionFile.name) - - return generateProjectPackage(projectPackage, definitionFile, workingDir) - } - - /** - * Return a [Package] containing project-level information from [pkgInfo] and [definitionFile] using the - * `conan inspect` command. - */ private fun generateProjectPackage(pkgInfo: PackageInfo, definitionFile: File, workingDir: File): Package { fun inspectOrNull(field: String) = definitionFile.name.takeIf { it == "conanfile.py" }?.let { inspectField(it, workingDir, field) }