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

Cleaning up TestKit. #1010

Merged
merged 3 commits into from
Oct 29, 2023
Merged

Cleaning up TestKit. #1010

merged 3 commits into from
Oct 29, 2023

Conversation

autonomousapps
Copy link
Owner

No description provided.

@@ -12,7 +12,7 @@ public abstract class AbstractGradleProject @JvmOverloads constructor(
buildPath: String = "build/functionalTest",
) {

protected fun newGradleProjectBuilder(): GradleProject.Builder {
protected open fun newGradleProjectBuilder(): GradleProject.Builder {
Copy link
Owner Author

Choose a reason for hiding this comment

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

Not super happy with this, but it solved a problem quickly.

sources = emptyList()
}
}

private fun defaultRootProjectBuildScript(): BuildScript {
return BuildScript(
plugins = Plugins(listOf(Plugin.dependencyAnalysis, Plugin.kotlinPlugin(apply = false)))
Copy link
Owner Author

Choose a reason for hiding this comment

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

The included build projects should do this more centrally than how I've solved it currently.

builder.withSubprojectInIncludedBuild('second-build', 'second-sub1') { secondSub ->
builder.withSubprojectInIncludedBuild(
'second-build',
[Plugins.dependencyAnalysis, Plugins.kotlinNoApply],
Copy link
Owner Author

Choose a reason for hiding this comment

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

Make this nicer somehow?

@@ -30,8 +31,8 @@ final class IncludedBuildWithDivergingPluginClasspathsProject extends AbstractPr
}
builder.withIncludedBuild('second-build') { second ->
second.withBuildScript { bs ->
bs.plugins.add(Plugin.javaLibrary)
if (divergingPluginClasspaths) bs.plugins.add(Plugin.springBoot)
bs.plugins = [Plugins.dependencyAnalysis, Plugins.kotlinNoApply, Plugin.javaLibrary]
Copy link
Owner Author

Choose a reason for hiding this comment

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

Make this nicer somehow?

builder.withSubprojectInIncludedBuild('processor-build', 'sub-processor1') { secondSub ->
builder.withSubprojectInIncludedBuild(
'processor-build',
[Plugins.dependencyAnalysis, Plugins.kotlinNoApply],
Copy link
Owner Author

Choose a reason for hiding this comment

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

nicer

@@ -42,7 +46,7 @@ final class IncludedBuildProject extends AbstractProject {
}
builder.withIncludedBuild('second-build') { second ->
second.withBuildScript { bs ->
bs.plugins.add(Plugin.javaLibrary)
bs.plugins = [Plugins.dependencyAnalysis, Plugins.kotlinNoApply, Plugin.javaLibrary]
Copy link
Owner Author

Choose a reason for hiding this comment

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

nicer

@autonomousapps
Copy link
Owner Author

Build failed

@autonomousapps autonomousapps changed the title Prepare for moving Dependency helpers. Cleaning up TestKit. Oct 29, 2023
@autonomousapps autonomousapps marked this pull request as ready for review October 29, 2023 21:48
@autonomousapps autonomousapps merged commit f6b8815 into main Oct 29, 2023
1 check passed
@autonomousapps autonomousapps deleted the trobalik.testkit branch October 29, 2023 21:48
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.

1 participant