This repository has been archived by the owner on Aug 19, 2020. It is now read-only.
Fix usabililty of Configuration accessors in the configurations {} block
#1129
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Paul Merlin <[email protected]>
and introduce deprecated extensions to keep source-compatibility Signed-off-by: Paul Merlin <[email protected]>
bamboo
suggested changes
Sep 21, 2018
| @@ -125,6 +140,10 @@ private | |||
| val typeOfProject = typeOf<Project>() | |||
|
|
|||
|
|
|||
| private | |||
| val typeOfConfigurationContainer = typeOf<NamedDomainObjectContainer<Configuration>>() | |||
There was a problem hiding this comment.
❌ Since we're getting those elements specifically from project.configurations, wouldn't it be better to limit the extensions to ConfigurationContainer only?
There was a problem hiding this comment.
We can't because configurations {} receiver is NamedDomainObjectContainerScope<Configuration>.
|
|
||
|
|
||
| @Deprecated(deprecationMessage, replaceWith = ReplaceWith("get().buildDependencies")) | ||
| val <T : Configuration> NamedDomainObjectProvider<T>.buildDependencies: TaskDependency |
There was a problem hiding this comment.
❌ should have kdoc pointing to the delegate method
| @@ -46,8 +47,8 @@ class ScriptHandlerScope(scriptHandler: ScriptHandler) : ScriptHandler by script | |||
| /** | |||
| * The script classpath configuration. | |||
| */ | |||
| val ConfigurationContainer.classpath: Configuration | |||
| get() = getByName(CLASSPATH_CONFIGURATION) | |||
| val NamedDomainObjectContainer<Configuration>.classpath: NamedDomainObjectProvider<Configuration> | |||
There was a problem hiding this comment.
Because configurations {} receiver is NamedDomainObjectContainerScope<Configuration>.
| configurations = emptyList() | ||
| ) | ||
| } | ||
|
|
||
|
|
||
| private | ||
| enum class EntryKind { Extension, Convention } | ||
| fun <T> ProjectSchema<T>.flatMapGroupedByEntryKind() = |
...test/kotlin/org/gradle/kotlin/dsl/accessors/KotlinDslAccessorsSnapshotTaskIntegrationTest.kt
Show resolved
Hide resolved
Signed-off-by: Paul Merlin <[email protected]>
by renaming function for clarity Signed-off-by: Paul Merlin <[email protected]>
|
@bamboo this is ready for another round |
bamboo
approved these changes
Sep 24, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
by generating accessors to the existing container elements, leveraging
NamedDomainObjectCollection.collectionSchema.Those extensions expose the internal
DefaultConfigurationtype because of gradle/gradle-native#856Old accessors removed as they conflict with the new and work in less situations. Extensions were added to provide source-compatibility to scripts that were using the old accessors, marked as deprecated and with IDE guidance for replacement.
With the example from the original report in #1118 this is now possible:
configurations { implementation { exclude(group = "org.foo") } }