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

Configure Kotlin compilation to use 1.3 apiVersion and languageVersion

Browse Source 
Closes gh-25793
This commit is contained in:
Andy Wilkinson 2021-04-07 11:43:39 +01:00
parent b35d1ec6e8
commit 7c8caf9ef5
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/build.gradle
View File

@ -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}")

1
buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
View File

@ -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);
}
}

48
buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java Normal file
View File

@ -0,0 +1,48 @@
/*
* 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");
});
});
}
}