Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Kotlin 1.5.0-RC

Browse Source 
Closes gh-26080
Closes gh-25498
This commit is contained in:
Andy Wilkinson 2021-04-13 19:51:03 +01:00
parent 5289b50a1a
commit 6f2b4aa685
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -4,7 +4,7 @@ org.gradle.caching=true
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
kotlinVersion=1.4.31
kotlinVersion=1.5.0-RC
tomcatVersion=9.0.45
kotlin.stdlib.default.dependency=false

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View File

@ -30,7 +30,7 @@ dependencies {
implementation("org.apache.commons:commons-compress")
implementation("org.springframework:spring-core")
optional("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
optional("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation("org.assertj:assertj-core")

3
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java
View File

@ -25,8 +25,6 @@ import java.util.jar.JarFile;
import java.util.stream.Collectors;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.condition.DisabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.loader.tools.FileUtils;
@ -249,7 +247,6 @@ class JarIntegrationTests extends AbstractArchiveIntegrationTests {
});
}
@DisabledForJreRange(min = JRE.JAVA_16) // Remove this once Kotlin supports Java 16
@TestTemplate
void whenAProjectUsesKotlinItsModuleMetadataIsRepackagedIntoBootInfClasses(MavenBuild mavenBuild) {
mavenBuild.project("jar-with-kotlin-module").execute((project) -> {