Skip to content

Small Gradle-related improvements #11945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sschuberth merged 2 commits into from
Jun 4, 2026
Merged

Small Gradle-related improvements #11945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b47dff4
docs(gradle): Add links to configuration roles for reference
sschuberth Jun 3, 2026
b8c0424
build(cli-test-launcher): Do not tap into the file-system to get funT…
sschuberth Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cli-helper/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ plugins {
id("ort-application-conventions")
}

// See https://docs.gradle.org/current/userguide/declaring_configurations.html#sec:configuration-flags-roles.
configurations.dependencyScope("pluginClasspath")
configurations["runtimeOnly"].extendsFrom(configurations["pluginClasspath"])

Expand Down
23 changes: 13 additions & 10 deletions cli-test-launcher/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,20 @@ application {
}

val Project.hasFunTests
// Do not dig into sourceSets to avoid coupling between projects.
get() = projectDir.resolve("src/funTest").isDirectory
// Registering a feature automatically creates several configurations, see
// https://docs.gradle.org/current/userguide/how_to_create_feature_variants_of_a_library.html#sec::declare_feature_variants
get() = configurations.findByName("funTestRuntimeElements") != null

dependencies {
rootProject.subprojects.filter { it.hasFunTests }.forEach {
implementation(project(it.path)) {
capabilities {
// Note that this uses kebab-case although "registerFeature()" uses camelCase, see
// https://github.com/gradle/gradle/issues/31362.
@Suppress("UnstableApiUsage")
requireFeature("fun-test")
gradle.projectsEvaluated {
dependencies {
rootProject.subprojects.filter { it.hasFunTests }.forEach {
runtimeOnly(project(it.path)) {
capabilities {
// Note that this uses kebab-case although "registerFeature()" uses camelCase, see
// https://github.com/gradle/gradle/issues/31362.
@Suppress("UnstableApiUsage")
requireFeature("fun-test")
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions cli/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ plugins {
id("ort-application-conventions")
}

// See https://docs.gradle.org/current/userguide/declaring_configurations.html#sec:configuration-flags-roles.
configurations.dependencyScope("pluginClasspath")
configurations["runtimeOnly"].extendsFrom(configurations["pluginClasspath"])

Expand Down
Loading