Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
6f2b4aa6
Commit
6f2b4aa6
authored
Apr 13, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Kotlin 1.5.0-RC
Closes gh-26080 Closes gh-25498
parent
5289b50a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
5 deletions
+2
-5
gradle.properties
gradle.properties
+1
-1
build.gradle
.../spring-boot-tools/spring-boot-gradle-plugin/build.gradle
+1
-1
JarIntegrationTests.java
...a/org/springframework/boot/maven/JarIntegrationTests.java
+0
-3
No files found.
gradle.properties
View file @
6f2b4aa6
...
...
@@ -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
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View file @
6f2b4aa6
...
...
@@ -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"
)
...
...
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java
View file @
6f2b4aa6
...
...
@@ -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
)
->
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment