Skip to content
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

Jump to bottom

Add support for using project dependencies in the declarative DSL with DependencyCollector #28465

Merged
merged 3 commits into from Mar 26, 2024
Merged

Add support for using project dependencies in the declarative DSL with DependencyCollector #28465

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29abe83
Add support for using project dependencies in the declarative DSL wit…
tresat Mar 14, 2024
acacc8c
Extract common dependency variables for resuse and rename them for cl…
tresat Mar 26, 2024
e6f436d
Add description to exception
tresat Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 39 additions & 15 deletions ...c/main/kotlin/org/gradle/internal/declarativedsl/project/dependencyConfigurationSchema.kt
View file
Open in desktop
Expand Up @@ -104,13 +104,22 @@ class ImplicitDependencyCollectorFunctionExtractor(val configurations: Dependenc
.filter { function -> hasDependencyCollectorGetterSignature(function) }
.map { function -> function.name.removePrefix("get").replaceFirstChar { it.lowercase(Locale.getDefault()) } }
.filter { confName -> confName in configurations.configurationNames }
.map { confName ->
DataMemberFunction(
kClass.toDataTypeRef(),
confName,
listOf(DataParameter("dependency", String::class.toDataTypeRef(), false, ParameterSemantics.Unknown)),
false,
FunctionSemantics.AddAndConfigure(kClass.toDataTypeRef(), NOT_ALLOWED)
.flatMap { confName ->
listOf(
DataMemberFunction(
kClass.toDataTypeRef(),
confName,
listOf(DataParameter("dependency", String::class.toDataTypeRef(), false, ParameterSemantics.Unknown)),
false,
FunctionSemantics.AddAndConfigure(kClass.toDataTypeRef(), NOT_ALLOWED)
),
DataMemberFunction(
kClass.toDataTypeRef(),
confName,
listOf(DataParameter("dependency", ProjectDependency::class.toDataTypeRef(), false, ParameterSemantics.Unknown)),
false,
FunctionSemantics.AddAndConfigure(kClass.toDataTypeRef(), NOT_ALLOWED)
)
)
}

Expand Down Expand Up @@ -148,14 +157,29 @@ class ImplicitDependencyCollectorFunctionResolver(configurations: DependencyConf
if (name in configurationNames) {
val getterFunction = getDependencyCollectorGetter(receiverClass, name)
if (getterFunction != null) {
return RuntimeFunctionResolver.Resolution.Resolved(object : DeclarativeRuntimeFunction {
override fun callBy(receiver: Any, binding: Map<DataParameter, Any?>, hasLambda: Boolean): DeclarativeRuntimeFunction.InvocationResult {
val dependencyNotation = binding.values.single().toString()
val collector: DependencyCollector = getterFunction.call(receiver) as DependencyCollector
collector.add(dependencyNotation)
return DeclarativeRuntimeFunction.InvocationResult(Unit, null)
}
})
val gavParam = DataParameter("dependency", String::class.toDataTypeRef(), false, ParameterSemantics.Unknown)
tresat marked this conversation as resolved.
Show resolved Hide resolved
val projectParam = DataParameter("dependency", ProjectDependency::class.toDataTypeRef(), false, ParameterSemantics.Unknown)
if (parameterValueBinding.bindingMap.containsKey(gavParam)) {
return RuntimeFunctionResolver.Resolution.Resolved(object : DeclarativeRuntimeFunction {
tresat marked this conversation as resolved.
Show resolved Hide resolved
override fun callBy(receiver: Any, binding: Map<DataParameter, Any?>, hasLambda: Boolean): DeclarativeRuntimeFunction.InvocationResult {
val dependencyNotation = binding.values.single().toString()
val collector: DependencyCollector = getterFunction.call(receiver) as DependencyCollector
collector.add(dependencyNotation)
return DeclarativeRuntimeFunction.InvocationResult(Unit, null)
}
})
} else if (parameterValueBinding.bindingMap.containsKey(projectParam)) {
return RuntimeFunctionResolver.Resolution.Resolved(object : DeclarativeRuntimeFunction {
override fun callBy(receiver: Any, binding: Map<DataParameter, Any?>, hasLambda: Boolean): DeclarativeRuntimeFunction.InvocationResult {
val dependencyNotation = binding.values.single() as ProjectDependency
val collector: DependencyCollector = getterFunction.call(receiver) as DependencyCollector
collector.add(dependencyNotation)
return DeclarativeRuntimeFunction.InvocationResult(Unit, null)
}
})
} else {
throw IllegalStateException()
tresat marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
return RuntimeFunctionResolver.Resolution.Unresolved
Expand Down