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
7c8caf9e
Commit
7c8caf9e
authored
Apr 07, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Configure Kotlin compilation to use 1.3 apiVersion and languageVersion
Closes gh-25793
parent
b35d1ec6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
51 additions
and
0 deletions
+51
-0
build.gradle
buildSrc/build.gradle
+2
-0
ConventionsPlugin.java
...ava/org/springframework/boot/build/ConventionsPlugin.java
+1
-0
KotlinConventions.java
...ava/org/springframework/boot/build/KotlinConventions.java
+48
-0
No files found.
buildSrc/build.gradle
View file @
7c8caf9e
...
...
@@ -21,6 +21,8 @@ dependencies {
implementation
(
"org.asciidoctor:asciidoctor-gradle-jvm:3.0.0"
)
implementation
(
"org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.0.0"
)
implementation
(
"org.gradle:test-retry-gradle-plugin:1.1.9"
)
implementation
(
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
)
implementation
(
"org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.72"
)
implementation
(
"org.springframework:spring-core:5.2.2.RELEASE"
)
implementation
(
"org.springframework:spring-web:5.2.2.RELEASE"
)
implementation
(
"io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}"
)
...
...
buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
View file @
7c8caf9e
...
...
@@ -46,6 +46,7 @@ public class ConventionsPlugin implements Plugin<Project> {
new
JavaConventions
().
apply
(
project
);
new
MavenPublishingConventions
().
apply
(
project
);
new
AsciidoctorConventions
().
apply
(
project
);
new
KotlinConventions
().
apply
(
project
);
}
}
buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java
0 → 100644
View file @
7c8caf9e
/*
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
build
;
import
org.gradle.api.Project
;
import
org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
;
import
org.jetbrains.kotlin.gradle.tasks.KotlinCompile
;
/**
* Conventions that are applied in the presence of the {@code org.jetbrains.kotlin.jvm}
* plugin. When the plugin is applied:
*
* <ul>
* <li>{@link KotlinCompile} tasks are configured to use {@code apiVersion} and
* {@code languageVersion} 1.3.
* </ul>
*
* <p/>
*
* @author Andy Wilkinson
*/
class
KotlinConventions
{
void
apply
(
Project
project
)
{
project
.
getPlugins
().
withId
(
"org.jetbrains.kotlin.jvm"
,
(
plugin
)
->
{
project
.
getTasks
().
withType
(
KotlinCompile
.
class
,
(
compile
)
->
{
KotlinJvmOptions
kotlinOptions
=
compile
.
getKotlinOptions
();
kotlinOptions
.
setApiVersion
(
"1.3"
);
kotlinOptions
.
setLanguageVersion
(
"1.3"
);
});
});
}
}
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