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

Migrate buildSrc to composite build #2912

Merged
merged 7 commits into from
Mar 13, 2023

Conversation

Goooler
Copy link
Contributor

@Goooler Goooler commented Mar 9, 2023

Addressed from #2652.

@Goooler
Copy link
Contributor Author

Goooler commented Mar 9, 2023

  • dokka-gradle-plugin project applies convention plugins, need to convert it to a composite build too.
  • dokka-gradle-plugin refs some sub-projects in root project, need to declare them in dokka-gradle-plugin's settings.gradle.kts, it also refs some versions outside.

@IgnatBeresnev IgnatBeresnev self-requested a review March 9, 2023 10:57
@IgnatBeresnev
Copy link
Member

@aSemy could I ask you to take a quick look, please? Maybe you know a way to fix the gradle plugin without copying configuration

@aSemy
Copy link
Contributor

aSemy commented Mar 9, 2023

I think converting the Dokka-GP to an included build would be a good step in the future (as well as the integration tests), but it might require a lot of work (e.g. the Worker API), and isn't necessary right now (unless I've missed something @Goooler?).

I think this PR should just set up the bare minimum needed for using included build, and focus on improving the Dokka-GP in another PR. So I think just keep these changes:

  • Rename buildSrc to build-logic
  • Rename the convention plugins to use the id("org.jetbrains.base") format
  • add includeBuild() into the root settings.gradle.kts

And don't update to Gradle 8, and keep Dokka-GP as regular ol' subproject.

WDYT?

@Goooler
Copy link
Contributor Author

Goooler commented Mar 10, 2023

@aSemy Cause dokka-gradle-plugin depends on build-logic, but root project depends on dokka-gradle-plugin.

We'd better to use online version of Dokka in root?

plugins {
org.jetbrains.conventions.base
id("org.jetbrains.dokka")

@aSemy
Copy link
Contributor

aSemy commented Mar 10, 2023

@aSemy Cause dokka-gradle-plugin depends on build-logic, but root project depends on dokka-gradle-plugin.

We'd better to use online version of Dokka in root?

plugins {
org.jetbrains.conventions.base
id("org.jetbrains.dokka")

Ahh right, I see what you mean now.

Yes, I think it's better to use the online version of Dokka. If there's problem in DokkaGP then it could prevent the whole project from compiling during development, which would be annoying.

@aSemy aSemy mentioned this pull request Mar 13, 2023
4 tasks
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.

Well done, thanks! I've triggered integration tests, let's wait for them to pass

build.gradle.kts Outdated Show resolved Hide resolved
@IgnatBeresnev
Copy link
Member

Everything looks good 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants