Test the Gradle Plugin against Gradle 5.0-milestone-1

Closes spring-projectsgh-15005
anshuman-mor · Oct 29, 2018 · 5ac9b97 · 5ac9b97
1 parent b2d51db
commit 5ac9b97
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
@@ -16,7 +16,7 @@
 		<gradle.executable>./gradlew</gradle.executable>
 		<gradle.task>build</gradle.task>
 		<skip.gradle.build>false</skip.gradle.build>
-		<kotlin.version>1.2.10</kotlin.version>
+		<kotlin.version>1.2.20</kotlin.version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/...-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java b/...-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java
@@ -39,7 +39,7 @@
 public final class GradleCompatibilitySuite extends Suite {
 
 	private static final List<String> GRADLE_VERSIONS = Arrays.asList("default", "4.5.1",
-			"4.6", "4.7", "4.8.1", "4.9", "4.10.2");
+			"4.6", "4.7", "4.8.1", "4.9", "4.10.2", "5.0-milestone-1");
 
 	public GradleCompatibilitySuite(Class<?> clazz) throws InitializationError {
 		super(clazz, createRunners(clazz));

diff --git a/.../test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java b/.../test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java
@@ -46,9 +46,9 @@ public void noKotlinVersionPropertyWithoutKotlinPlugin() {
 	public void kotlinVersionMatchesKotlinPluginVersion() {
 		String output = this.gradleBuild.build("kotlinVersion", "dependencies",
 				"--configuration", "compileClasspath").getOutput();
-		assertThat(output).contains("Kotlin version: 1.2.10");
+		assertThat(output).contains("Kotlin version: 1.2.20");
 		assertThat(output)
-				.containsPattern("org.jetbrains.kotlin:kotlin-stdlib-jdk8:* -> 1.2.10");
+				.containsPattern("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.20");
 	}
 
 	@Test

diff --git a/...boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java b/...boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java
@@ -39,7 +39,6 @@
 import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner;
 import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin;
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlugin;
-import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper;
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
@@ -144,7 +143,6 @@ private List<File> pluginClasspath() {
 				new File(pathOfJarContaining(LaunchScript.class)),
 				new File(pathOfJarContaining(ClassVisitor.class)),
 				new File(pathOfJarContaining(DependencyManagementPlugin.class)),
-				new File(pathOfJarContaining(KotlinPluginWrapper.class)),
 				new File(pathOfJarContaining(PropertiesKt.class)),
 				new File(pathOfJarContaining(KotlinCompilerRunner.class)),
 				new File(pathOfJarContaining(KotlinPlugin.class)),

diff --git a/...ActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle b/...ActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle
@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-	def configurationName = GradleVersion.current().compareTo(GradleVersion.version("4.6")) >= 0 ? 'annotationProcessor': 'implementation'
+	def configurationName = configurations.findByName('annotationProcessor') != null ? 'annotationProcessor' : 'implementation'
 	add(configurationName, [name: 'spring-boot-configuration-processor-1.2.3'])
 }