Raise the minimum supported version of Kotlin to 1.6

Closes gh-29660
pull/30107/head
Stephane Nicoll 3 years ago
parent d5f4cfe6cb
commit 099e811a38

@ -30,7 +30,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
* <ul> * <ul>
* <li>{@link KotlinCompile} tasks are configured to: * <li>{@link KotlinCompile} tasks are configured to:
* <ul> * <ul>
* <li>Use {@code apiVersion} and {@code languageVersion} 1.3. * <li>Use {@code apiVersion} and {@code languageVersion} 1.6.
* <li>Use {@code jvmTarget} 1.8. * <li>Use {@code jvmTarget} 1.8.
* <li>Treat all warnings as errors * <li>Treat all warnings as errors
* <li>Suppress version warnings * <li>Suppress version warnings
@ -50,8 +50,8 @@ class KotlinConventions {
private void configure(KotlinCompile compile) { private void configure(KotlinCompile compile) {
KotlinJvmOptions kotlinOptions = compile.getKotlinOptions(); KotlinJvmOptions kotlinOptions = compile.getKotlinOptions();
kotlinOptions.setApiVersion("1.3"); kotlinOptions.setApiVersion("1.6");
kotlinOptions.setLanguageVersion("1.3"); kotlinOptions.setLanguageVersion("1.6");
kotlinOptions.setJvmTarget("1.8"); kotlinOptions.setJvmTarget("1.8");
kotlinOptions.setAllWarningsAsErrors(true); kotlinOptions.setAllWarningsAsErrors(true);
List<String> freeCompilerArgs = new ArrayList<>(compile.getKotlinOptions().getFreeCompilerArgs()); List<String> freeCompilerArgs = new ArrayList<>(compile.getKotlinOptions().getFreeCompilerArgs());

Loading…
Cancel
Save