Index: evaluator/src/main/kotlin/RulesScriptTemplate.kt IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/evaluator/src/main/kotlin/RulesScriptTemplate.kt b/evaluator/src/main/kotlin/RulesScriptTemplate.kt --- a/evaluator/src/main/kotlin/RulesScriptTemplate.kt (revision 4a5715e29de9764c64a48dba35fc123370d87be0) +++ b/evaluator/src/main/kotlin/RulesScriptTemplate.kt (date 1716379747520) @@ -31,19 +31,14 @@ import org.ossreviewtoolkit.model.licenses.LicenseInfoResolver import org.ossreviewtoolkit.model.utils.ResolutionProvider import org.ossreviewtoolkit.utils.scripting.OrtScriptCompilationConfiguration +import kotlin.script.experimental.api.providedProperties @KotlinScript( displayName = "ORT Evaluator Rules Script", fileExtension = "rules.kts", compilationConfiguration = RulesScriptCompilationConfiguration::class ) -open class RulesScriptTemplate( - val ortResult: OrtResult, - val licenseInfoResolver: LicenseInfoResolver, - val resolutionProvider: ResolutionProvider, - val licenseClassifications: LicenseClassifications, - val time: Instant -) { +open class RulesScriptTemplate { val ruleViolations = mutableListOf() } @@ -58,5 +53,12 @@ "org.ossreviewtoolkit.model.utils.*", "org.ossreviewtoolkit.utils.spdx.*" ) + providedProperties( + "ortResult" to OrtResult::class, + "licenseInfoResolver" to LicenseInfoResolver::class, + "resolutionProvider" to ResolutionProvider::class, + "licenseClassifications" to LicenseClassifications::class, + "time" to Instant::class + ) } ) Index: evaluator/src/main/kotlin/Evaluator.kt IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/evaluator/src/main/kotlin/Evaluator.kt b/evaluator/src/main/kotlin/Evaluator.kt --- a/evaluator/src/main/kotlin/Evaluator.kt (revision 4a5715e29de9764c64a48dba35fc123370d87be0) +++ b/evaluator/src/main/kotlin/Evaluator.kt (date 1716379747518) @@ -19,13 +19,6 @@ package org.ossreviewtoolkit.evaluator -import java.time.Instant - -import kotlin.script.experimental.api.ScriptEvaluationConfiguration -import kotlin.script.experimental.api.constructorArgs -import kotlin.script.experimental.api.scriptsInstancesSharing -import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromTemplate - import org.ossreviewtoolkit.model.EvaluatorRun import org.ossreviewtoolkit.model.OrtResult import org.ossreviewtoolkit.model.licenses.LicenseClassifications @@ -34,6 +27,11 @@ import org.ossreviewtoolkit.model.utils.ResolutionProvider import org.ossreviewtoolkit.model.utils.createLicenseInfoResolver import org.ossreviewtoolkit.utils.scripting.ScriptRunner +import java.time.Instant +import kotlin.script.experimental.api.ScriptEvaluationConfiguration +import kotlin.script.experimental.api.providedProperties +import kotlin.script.experimental.api.scriptsInstancesSharing +import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromTemplate class Evaluator( ortResult: OrtResult = OrtResult.EMPTY, @@ -45,7 +43,13 @@ override val compConfig = createJvmCompilationConfigurationFromTemplate() override val evalConfig = ScriptEvaluationConfiguration { - constructorArgs(ortResult, licenseInfoResolver, resolutionProvider, licenseClassifications, time) + providedProperties( + "ortResult" to ortResult, + "licenseInfoResolver" to licenseInfoResolver, + "resolutionProvider" to resolutionProvider, + "licenseClassifications" to licenseClassifications, + "time" to time + ) scriptsInstancesSharing(true) }