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.

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

Use Gradle filesystem types for task properties #2707

Merged
merged 3 commits into from Feb 27, 2023

Conversation

aSemy
Copy link
Contributor

@aSemy aSemy commented Oct 11, 2022

part of #2700

Using Gradle filesystem types allows for more idiomatic usage of Gradle, and makes it easier to wire task inputs and outputs together.

I changed these properties to be managed types, as they are easier to create.

I also started moving some of the conventional values for these properties into DokkaPlugin. I intend to move more of this property convention into DokkaPlugin, as this makes it easier to re-use properties and values, and wire tasks together. When the conventions are set inside a Task, they are limited by what they can access from the project instance, which can make for repetitive or tough to follow code.

This PR includes changes from

Additionally add workaround functions for the SamWithReceiver bug.
@aSemy aSemy force-pushed the feat/use_gradle_filesystem_types branch from cf4e9f3 to 20cc9dd Compare February 22, 2023 10:45
Copy link
Member

@IgnatBeresnev IgnatBeresnev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the documentation links and the explanations! Studing your PRs, I'm definitely starting to get the hang of how a good Gradle plugin should look like

I've started lengthy integration tests, will merge the PR once they pass

@IgnatBeresnev
Copy link
Member

Integration tests are all good 🎉

@aSemy could you please resolve conflicts? I'll merge it right after

aSemy and others added 2 commits February 23, 2023 17:40
# Conflicts:
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayout.kt
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTask.kt
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTask.kt
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTask.kt
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskPartial.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayoutTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTaskTest.kt
@IgnatBeresnev
Copy link
Member

IgnatBeresnev commented Feb 27, 2023

(sorry, I had merged a small conflict and I couldn't resist trying out the web interface for resolving them 😅 quite neat!)

@IgnatBeresnev IgnatBeresnev merged commit 6af794d into Kotlin:master Feb 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
runner: Gradle plugin An issue/PR related to Dokka's Gradle plugin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants