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