Merge pull request #853 from jnizet

* pr/853:
  Polish "Avoid applying Kotlin JPA plugin"
  Avoid applying Kotlin JPA plugin
This commit is contained in:
Stephane Nicoll 2019-03-04 11:38:43 +01:00
commit c13285f633
2 changed files with 3 additions and 4 deletions

View File

@ -45,7 +45,6 @@ public class KotlinJpaGradleBuildCustomizer implements BuildCustomizer<GradleBui
if (this.buildMetadataResolver.hasFacet(build, "jpa")) {
build.addPlugin("org.jetbrains.kotlin.plugin.jpa",
this.settings.getVersion());
build.applyPlugin("kotlin-jpa");
}
}

View File

@ -39,7 +39,7 @@ class KotlinJpaGradleBuildCustomizerTests {
Dependency dependency = Dependency.withId("foo");
dependency.setFacets(Collections.singletonList("jpa"));
GradleBuild build = getCustomizedBuild(dependency);
assertThat(build.getAppliedPlugins()).contains("kotlin-jpa");
assertThat(build.getAppliedPlugins()).isEmpty();
assertThat(build.getPlugins()).hasSize(1);
assertThat(build.getPlugins().get(0).getId())
.isEqualTo("org.jetbrains.kotlin.plugin.jpa");
@ -50,8 +50,8 @@ class KotlinJpaGradleBuildCustomizerTests {
void customizeWhenJpaFacetAbsentShouldNotAddKotlinJpaPlugin() {
Dependency dependency = Dependency.withId("foo");
GradleBuild build = getCustomizedBuild(dependency);
assertThat(build.getAppliedPlugins()).hasSize(0);
assertThat(build.getPlugins()).hasSize(0);
assertThat(build.getAppliedPlugins()).isEmpty();
assertThat(build.getPlugins()).isEmpty();
}
private GradleBuild getCustomizedBuild(Dependency dependency) {