From 4a3e0a231c36f8b36831a8a488b4643ae13751f5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 2 Mar 2018 13:19:49 +0000 Subject: [PATCH] Test the Gradle plugin against Gradle 4.6 Closes gh-12314 --- .../boot/gradle/plugin/KotlinPluginActionIntegrationTests.java | 3 ++- ...nalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java index 2df6955347..3f877315f0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java @@ -48,7 +48,8 @@ public class KotlinPluginActionIntegrationTests { .build("kotlinVersion", "dependencies", "--configuration", "compile") .getOutput(); assertThat(output).contains("Kotlin version: 1.2.10"); - assertThat(output).contains("org.jetbrains.kotlin:kotlin-stdlib-jdk8: -> 1.2.10"); + assertThat(output) + .containsPattern("org.jetbrains.kotlin:kotlin-stdlib-jdk8:* -> 1.2.10"); } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle index 2c6e099280..5fc8fda755 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle @@ -12,7 +12,8 @@ repositories { } dependencies { - compile name: 'spring-boot-configuration-processor-1.2.3' + def configurationName = GradleVersion.current().compareTo(GradleVersion.version("4.6")) >= 0 ? 'annotationProcessor': 'compile' + add(configurationName, [name: 'spring-boot-configuration-processor-1.2.3']) } compileJava {