Skip to content

Commit 99bd156

Browse files
committed
build(scripting)!: Rename the module to just "script" for shortness
Also, this will group upcoming modules more nicely. BREAKING CHANGE: This changes the group of published artifacts, requiring programmatic users to adapt. Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.io>
1 parent 446d287 commit 99bd156

12 files changed

Lines changed: 11 additions & 11 deletions

File tree

evaluator/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
api("org.jetbrains.kotlin:kotlin-scripting-common")
3636
api(libs.kotlinx.serialization.core)
3737
api(projects.model)
38-
api(projects.utils.scriptingUtils)
38+
api(projects.utils.scriptUtils)
3939
api(projects.utils.spdxExpressionUtils)
4040

4141
implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host")

evaluator/src/main/kotlin/Evaluator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import org.ossreviewtoolkit.model.utils.DefaultResolutionProvider
3535
import org.ossreviewtoolkit.model.utils.ResolutionProvider
3636
import org.ossreviewtoolkit.model.utils.createLicenseInfoResolver
3737
import org.ossreviewtoolkit.utils.ort.Environment
38-
import org.ossreviewtoolkit.utils.scripting.ScriptRunner
38+
import org.ossreviewtoolkit.utils.script.ScriptRunner
3939

4040
class Evaluator(
4141
ortResult: OrtResult = OrtResult.EMPTY,

evaluator/src/main/kotlin/RulesScriptTemplate.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import org.ossreviewtoolkit.model.RuleViolation
3030
import org.ossreviewtoolkit.model.licenses.LicenseClassifications
3131
import org.ossreviewtoolkit.model.licenses.LicenseInfoResolver
3232
import org.ossreviewtoolkit.model.utils.ResolutionProvider
33-
import org.ossreviewtoolkit.utils.scripting.OrtScriptCompilationConfiguration
33+
import org.ossreviewtoolkit.utils.script.OrtScriptCompilationConfiguration
3434

3535
@KotlinScript(
3636
displayName = "ORT Evaluator Rules Script",

notifier/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
api("org.jetbrains.kotlin:kotlin-scripting-common")
2727
api(libs.jiraRestClient.api)
2828
api(projects.model)
29-
api(projects.utils.scriptingUtils)
29+
api(projects.utils.scriptUtils)
3030

3131
implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host")
3232
implementation(libs.jakartaMail)

notifier/src/main/kotlin/NotificationsScriptTemplate.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import kotlin.script.experimental.api.ScriptCompilationConfiguration
2424
import kotlin.script.experimental.api.defaultImports
2525

2626
import org.ossreviewtoolkit.model.OrtResult
27-
import org.ossreviewtoolkit.utils.scripting.OrtScriptCompilationConfiguration
27+
import org.ossreviewtoolkit.utils.script.OrtScriptCompilationConfiguration
2828

2929
@KotlinScript(
3030
displayName = "ORT Notifications Script",

notifier/src/main/kotlin/Notifier.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import org.ossreviewtoolkit.model.utils.DefaultResolutionProvider
3636
import org.ossreviewtoolkit.model.utils.ResolutionProvider
3737
import org.ossreviewtoolkit.notifier.modules.JiraNotifier
3838
import org.ossreviewtoolkit.notifier.modules.MailNotifier
39-
import org.ossreviewtoolkit.utils.scripting.ScriptRunner
39+
import org.ossreviewtoolkit.utils.script.ScriptRunner
4040

4141
class Notifier(
4242
ortResult: OrtResult = OrtResult.EMPTY,

reporter/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
api(projects.plugins.licenseFactProviders.licenseFactProviderApi)
3333

3434
implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host")
35-
implementation(projects.utils.scriptingUtils)
35+
implementation(projects.utils.scriptUtils)
3636

3737
funTestImplementation(testFixtures(project))
3838

reporter/src/main/kotlin/HowToFixTextProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromT
2828

2929
import org.ossreviewtoolkit.model.Issue
3030
import org.ossreviewtoolkit.model.OrtResult
31-
import org.ossreviewtoolkit.utils.scripting.ScriptRunner
31+
import org.ossreviewtoolkit.utils.script.ScriptRunner
3232

3333
/**
3434
* Provides how-to-fix texts in Markdown format for any given [Issue].

reporter/src/main/kotlin/HowToFixTextProviderScriptTemplate.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import kotlin.script.experimental.api.ScriptCompilationConfiguration
2424
import kotlin.script.experimental.api.defaultImports
2525

2626
import org.ossreviewtoolkit.model.OrtResult
27-
import org.ossreviewtoolkit.utils.scripting.OrtScriptCompilationConfiguration
27+
import org.ossreviewtoolkit.utils.script.OrtScriptCompilationConfiguration
2828

2929
@KotlinScript(
3030
displayName = "ORT How-To-Fix-Text-Provider Script",

0 commit comments

Comments
 (0)