mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Upgrade to Kotlin 1.5.0-RC
Closes gh-26080 Closes gh-25498
This commit is contained in:
parent
5289b50a1a
commit
6f2b4aa685
@ -4,7 +4,7 @@ org.gradle.caching=true
|
|||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
|
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
|
||||||
|
|
||||||
kotlinVersion=1.4.31
|
kotlinVersion=1.5.0-RC
|
||||||
tomcatVersion=9.0.45
|
tomcatVersion=9.0.45
|
||||||
|
|
||||||
kotlin.stdlib.default.dependency=false
|
kotlin.stdlib.default.dependency=false
|
||||||
|
@ -30,7 +30,7 @@ dependencies {
|
|||||||
implementation("org.apache.commons:commons-compress")
|
implementation("org.apache.commons:commons-compress")
|
||||||
implementation("org.springframework:spring-core")
|
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(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
|
||||||
testImplementation("org.assertj:assertj-core")
|
testImplementation("org.assertj:assertj-core")
|
||||||
|
@ -25,8 +25,6 @@ import java.util.jar.JarFile;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import org.junit.jupiter.api.TestTemplate;
|
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.junit.jupiter.api.extension.ExtendWith;
|
||||||
|
|
||||||
import org.springframework.boot.loader.tools.FileUtils;
|
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
|
@TestTemplate
|
||||||
void whenAProjectUsesKotlinItsModuleMetadataIsRepackagedIntoBootInfClasses(MavenBuild mavenBuild) {
|
void whenAProjectUsesKotlinItsModuleMetadataIsRepackagedIntoBootInfClasses(MavenBuild mavenBuild) {
|
||||||
mavenBuild.project("jar-with-kotlin-module").execute((project) -> {
|
mavenBuild.project("jar-with-kotlin-module").execute((project) -> {
|
||||||
|
Loading…
Reference in New Issue
Block a user