Skip to content
This repository has been archived by the owner on Aug 19, 2020. It is now read-only.

Let the kotlin-dsl plugin configure precompiled script plugins support #1135

Merged

Conversation

eskatos
Copy link
Member

@eskatos eskatos commented Sep 24, 2018

One can still opt-out by only applying kotlin-dsl-base.

and java-gradle-plugin
to enable support for precompiled script plugins out of the box
existing functionality moved up to a kotlin-dsl.base plugin

Signed-off-by: Paul Merlin <paul@gradle.com>
Signed-off-by: Paul Merlin <paul@gradle.com>
Signed-off-by: Paul Merlin <paul@gradle.com>
Signed-off-by: Paul Merlin <paul@gradle.com>
Signed-off-by: Paul Merlin <paul@gradle.com>
Signed-off-by: Paul Merlin <paul@gradle.com>
Signed-off-by: Paul Merlin <paul@gradle.com>
@@ -376,15 +374,14 @@ class PrecompiledScriptPluginTest : AbstractPluginTest() {
.loadClass(className)

private
fun withPrecompiledScriptPluginsPlus(vararg additionalPlugins: String) =
withBuildScript(scriptWithPrecompiledScriptPluginsPlus(*additionalPlugins))
fun withKotlinDslPluginPlus(vararg additionalPlugins: String) =
Copy link
Member

Choose a reason for hiding this comment

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

⭕️ it seems the parameter is no longer used.

@@ -55,7 +58,7 @@ open class EmbeddedKotlinPlugin @Inject internal constructor(
embeddedKotlinConfiguration.name,
"stdlib-jdk8", "reflect")

listOf("compileOnly", "testImplementation").forEach {
listOf(COMPILE_ONLY_CONFIGURATION_NAME, TEST_IMPLEMENTATION_CONFIGURATION_NAME).forEach {
Copy link
Member

Choose a reason for hiding this comment

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

❌ How about we share this list as a constant with the KotlinDslBasePlugin?

Signed-off-by: Paul Merlin <paul@gradle.com>
from EmbeddedKotlinPlugin and KotlinDslBasePlugin

Signed-off-by: Paul Merlin <paul@gradle.com>
@eskatos
Copy link
Member Author

eskatos commented Sep 25, 2018

Thanks @bamboo, ready for another round

Copy link
Member

@bamboo bamboo left a comment

Choose a reason for hiding this comment

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

👍

@eskatos eskatos merged commit ed899b6 into develop Sep 25, 2018
@eskatos eskatos deleted the eskatos/plugins/kotlin-dsl-applies-precompiled-scripts-plugin branch September 25, 2018 16:01
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants