mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge pull request #15791 from Christoph Dreis
* gh-15791: Polish "Test the Gradle plugin against Gradle 4.10.3 and 5.1.1" Test the Gradle plugin against Gradle 4.10.3 and 5.1.1
This commit is contained in:
commit
c00dc42ee8
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2018 the original author or authors.
|
* Copyright 2012-2019 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -39,7 +39,7 @@ import org.springframework.boot.gradle.testkit.GradleBuild;
|
|||||||
public final class GradleCompatibilitySuite extends Suite {
|
public final class GradleCompatibilitySuite extends Suite {
|
||||||
|
|
||||||
private static final List<String> GRADLE_VERSIONS = Arrays.asList("default", "4.5.1",
|
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", "5.0");
|
"4.6", "4.7", "4.8.1", "4.9", "4.10.3", "5.0", "5.1.1");
|
||||||
|
|
||||||
public GradleCompatibilitySuite(Class<?> clazz) throws InitializationError {
|
public GradleCompatibilitySuite(Class<?> clazz) throws InitializationError {
|
||||||
super(clazz, createRunners(clazz));
|
super(clazz, createRunners(clazz));
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2018 the original author or authors.
|
* Copyright 2012-2019 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -43,12 +43,10 @@ public class KotlinPluginActionIntegrationTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void kotlinVersionMatchesKotlinPluginVersion() {
|
public void kotlinVersionPropertyIsSet() {
|
||||||
String output = this.gradleBuild.build("kotlinVersion", "dependencies",
|
String output = this.gradleBuild.build("kotlinVersion", "dependencies",
|
||||||
"--configuration", "compileClasspath").getOutput();
|
"--configuration", "compileClasspath").getOutput();
|
||||||
assertThat(output).contains("Kotlin version: 1.2.20");
|
assertThat(output).containsPattern("Kotlin version: [0-9]\\.[0-9]\\.[0-9]+");
|
||||||
assertThat(output)
|
|
||||||
.containsPattern("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.20");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2018 the original author or authors.
|
* Copyright 2012-2019 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -195,7 +195,7 @@ public class GradleBuild implements TestRule {
|
|||||||
gradleRunner.withGradleVersion(this.gradleVersion);
|
gradleRunner.withGradleVersion(this.gradleVersion);
|
||||||
}
|
}
|
||||||
else if (this.dsl == Dsl.KOTLIN) {
|
else if (this.dsl == Dsl.KOTLIN) {
|
||||||
gradleRunner.withGradleVersion("4.10.2");
|
gradleRunner.withGradleVersion("4.10.3");
|
||||||
}
|
}
|
||||||
List<String> allArguments = new ArrayList<>();
|
List<String> allArguments = new ArrayList<>();
|
||||||
allArguments.add("-PbootVersion=" + getBootVersion());
|
allArguments.add("-PbootVersion=" + getBootVersion());
|
||||||
|
Loading…
Reference in New Issue
Block a user