Skip to content

Commit 5ac9b97

Browse files
committed
Test the Gradle Plugin against Gradle 5.0-milestone-1
Closes gh-15005
1 parent b2d51db commit 5ac9b97

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<gradle.executable>./gradlew</gradle.executable>
1717
<gradle.task>build</gradle.task>
1818
<skip.gradle.build>false</skip.gradle.build>
19-
<kotlin.version>1.2.10</kotlin.version>
19+
<kotlin.version>1.2.20</kotlin.version>
2020
</properties>
2121
<dependencies>
2222
<dependency>

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
public final class GradleCompatibilitySuite extends Suite {
4040

4141
private static final List<String> GRADLE_VERSIONS = Arrays.asList("default", "4.5.1",
42-
"4.6", "4.7", "4.8.1", "4.9", "4.10.2");
42+
"4.6", "4.7", "4.8.1", "4.9", "4.10.2", "5.0-milestone-1");
4343

4444
public GradleCompatibilitySuite(Class<?> clazz) throws InitializationError {
4545
super(clazz, createRunners(clazz));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public void noKotlinVersionPropertyWithoutKotlinPlugin() {
4646
public void kotlinVersionMatchesKotlinPluginVersion() {
4747
String output = this.gradleBuild.build("kotlinVersion", "dependencies",
4848
"--configuration", "compileClasspath").getOutput();
49-
assertThat(output).contains("Kotlin version: 1.2.10");
49+
assertThat(output).contains("Kotlin version: 1.2.20");
5050
assertThat(output)
51-
.containsPattern("org.jetbrains.kotlin:kotlin-stdlib-jdk8:* -> 1.2.10");
51+
.containsPattern("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.20");
5252
}
5353

5454
@Test

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner;
4040
import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin;
4141
import org.jetbrains.kotlin.gradle.plugin.KotlinPlugin;
42-
import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper;
4342
import org.junit.rules.TemporaryFolder;
4443
import org.junit.rules.TestRule;
4544
import org.junit.runner.Description;
@@ -144,7 +143,6 @@ private List<File> pluginClasspath() {
144143
new File(pathOfJarContaining(LaunchScript.class)),
145144
new File(pathOfJarContaining(ClassVisitor.class)),
146145
new File(pathOfJarContaining(DependencyManagementPlugin.class)),
147-
new File(pathOfJarContaining(KotlinPluginWrapper.class)),
148146
new File(pathOfJarContaining(PropertiesKt.class)),
149147
new File(pathOfJarContaining(KotlinCompilerRunner.class)),
150148
new File(pathOfJarContaining(KotlinPlugin.class)),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repositories {
88
}
99

1010
dependencies {
11-
def configurationName = GradleVersion.current().compareTo(GradleVersion.version("4.6")) >= 0 ? 'annotationProcessor': 'implementation'
11+
def configurationName = configurations.findByName('annotationProcessor') != null ? 'annotationProcessor' : 'implementation'
1212
add(configurationName, [name: 'spring-boot-configuration-processor-1.2.3'])
1313
}
1414

0 commit comments

Comments
 (0)