root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Test the Gradle plugin against Gradle 4.6 

Closes gh-12314
This commit is contained in:
Andy Wilkinson 2018-03-02 13:19:49 +00:00
parent e4a1fed3b8
commit 4a3e0a231c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java
View File

@ -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");
}
}

3
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle
View File

@ -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 {