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

apply kotlin-dsl plugin #2702

Merged
merged 7 commits into from
Feb 21, 2023
Merged

apply kotlin-dsl plugin #2702

merged 7 commits into from
Feb 21, 2023
+91 −88

Conversation

aSemy
Copy link
Contributor

@aSemy aSemy commented Oct 11, 2022 •
edited
Loading

Part of #2700

apply kotlin-dsl plugin, and update code to use idiomatic Gradle API

This helps because the code in the plugin will more closely match the code used in *.gradle.kts files

This was referenced Oct 11, 2022
Merged
Closed
Merged
@IgnatBeresnev IgnatBeresnev added the runner: Gradle plugin An issue/PR related to Dokka's Gradle plugin label Oct 12, 2022
@IgnatBeresnev IgnatBeresnev self-requested a review October 12, 2022 20:36
IgnatBeresnev
IgnatBeresnev approved these changes Oct 12, 2022
View reviewed changes
Copy link
Member

@IgnatBeresnev IgnatBeresnev left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Seems innocent and useful enough, thanks!

I'll start some lengthy gradle integration tests just in case, the PR can be merged once they all pass

@aSemy
Copy link
Contributor Author

aSemy commented Oct 12, 2022

My pleasure!

For reference the results of applying kotlin-dsl are specified here: https://docs.gradle.org/7.5.1/userguide/kotlin_dsl.html#sec:kotlin-dsl_plugin

One of the changes that isn't explicitly stated is that the Kotlin language level will be changed to 1.4, to match the compatibility defined here: https://docs.gradle.org/current/userguide/compatibility.html#kotlin

@aSemy aSemy mentioned this pull request Oct 13, 2022
Closed
@aSemy aSemy mentioned this pull request Oct 18, 2022
Merged
aSemy added a commit to aSemy/dokka that referenced this pull request Oct 18, 2022
@aSemy
[gradle plugin] revert applying kotlin-dsl plugin, do that in Kotlin#…
572494c 
…2702
@aSemy aSemy requested a review from IgnatBeresnev October 20, 2022 17:13
@IgnatBeresnev IgnatBeresnev mentioned this pull request Nov 4, 2022
Closed
@IgnatBeresnev
Copy link
Member

IgnatBeresnev commented Nov 4, 2022 •
edited
Loading

Looks like integration tests fail for Gradle 5.6, but I don't think we have to support it as KGP supports 6.7.1 onwards.

Caused by: java.lang.TypeNotPresentException: Type org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension not present
  at org.gradle.api.reflect.TypeOf.captureTypeArgument(TypeOf.java:280)
  at org.gradle.api.reflect.TypeOf.<init>(TypeOf.java:97)
  at org.jetbrains.dokka.gradle.UtilsKt$kotlinOrNull$$inlined$findByType$1.<init>(TypeOfExtensions.kt:28)
  at org.jetbrains.dokka.gradle.UtilsKt.getKotlinOrNull(utils.kt:59)

I've made an attempt to fix it in #2739, need to wait until it gets merged and rebased onto

@aSemy aSemy mentioned this pull request Nov 4, 2022
Closed
@aSemy aSemy mentioned this pull request Nov 28, 2022
Open
@aSemy aSemy mentioned this pull request Jan 29, 2023
Merged
@IgnatBeresnev
Copy link
Member

An update on this: I like the change and the DSL, but we cannot merge it until after the 1.8.10 release, but it should hopefully be soon.

The reason is that kotlin-dsl doesn't seem to work with Gradle 5.6, but we use 5.6 for the stdlib integration test, and we cannot upgrade it there. We agreed to remove/update the test after 1.8.10 though, so it should unblock this PR.

aSemy added 2 commits February 1, 2023 10:56
@aSemy
Merge remote-tracking branch 'origin/master' into feat/apply_kotlin_d…
910a070 
…sl_plugin

# Conflicts:
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTaskTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaTaskTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt
@aSemy
fix imports
0994afb
This was referenced Feb 1, 2023
Merged
Closed
@IgnatBeresnev
Copy link
Member

The stdlib integration tests has been removed, so this PR has been unblocked (finally) 🎉

I've tested this branch locally with the latest master, all the tests pass, so I'm merging it

@aSemy
rm java-gradle-plugin (provided by kotlin-dsl)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
73b3ece
@IgnatBeresnev IgnatBeresnev merged commit 0a09318 into Kotlin:master Feb 21, 2023
@Goooler Goooler mentioned this pull request Mar 6, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hfhbd hfhbd

@IgnatBeresnev IgnatBeresnev

Assignees
No one assigned
Labels
runner: Gradle plugin An issue/PR related to Dokka's Gradle plugin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@aSemy @IgnatBeresnev @hfhbd