@@ -56,6 +56,7 @@ import org.ossreviewtoolkit.plugins.api.OrtPlugin
56
56
import org.ossreviewtoolkit.plugins.api.OrtPluginOption
57
57
import org.ossreviewtoolkit.plugins.api.PluginDescriptor
58
58
import org.ossreviewtoolkit.utils.common.CommandLineTool
59
+ import org.ossreviewtoolkit.utils.common.ProcessCapture
59
60
import org.ossreviewtoolkit.utils.common.masked
60
61
import org.ossreviewtoolkit.utils.common.safeDeleteRecursively
61
62
import org.ossreviewtoolkit.utils.common.stashDirectories
@@ -68,7 +69,7 @@ import org.semver4j.RangesList
68
69
import org.semver4j.RangesListFactory
69
70
70
71
internal class ConanCommand (private val useConan2 : Boolean = false ) : CommandLineTool {
71
- override fun command (workingDir : File ? ) = if (useConan2) " conan2 " else " conan"
72
+ override fun command (workingDir : File ? ) = " conan"
72
73
73
74
override fun transformVersion (output : String ) =
74
75
// Conan could report version strings like:
@@ -77,8 +78,15 @@ internal class ConanCommand(private val useConan2: Boolean = false) : CommandLin
77
78
78
79
override fun getVersionRequirement (): RangesList = RangesListFactory .create(" >=1.44.0 <3.0" )
79
80
80
- override fun run (vararg args : CharSequence , workingDir : File ? , environment : Map <String , String >) =
81
- super .run (args = args, workingDir, environment + mapOf (" CONAN_NON_INTERACTIVE" to " 1" , " CONAN_SERIES" to " 1" ))
81
+ override fun run (vararg args : CharSequence , workingDir : File ? , environment : Map <String , String >): ProcessCapture =
82
+ super .run (
83
+ args = args,
84
+ workingDir,
85
+ environment + mapOf (
86
+ " CONAN_NON_INTERACTIVE" to " 1" ,
87
+ " CONAN_SERIES" to if (useConan2) " 2" else " 1"
88
+ )
89
+ )
82
90
}
83
91
84
92
data class ConanConfig (
0 commit comments