Update kotlin -> 1.4.20 & java -> 15

This commit is contained in:
Hubert Van De Walle 2020-11-29 21:52:42 +01:00
parent 8997433974
commit 69e50b158f
5 changed files with 10 additions and 10 deletions

View File

@ -1,5 +1,5 @@
# Enable auto-env through the sdkman_auto_env config # Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below # Add key=value pairs of SDKs to use below
java=14.0.2-open java=15-open
gradle=6.7 gradle=6.8-rc-1
kotlin=1.4.10 kotlin=1.4.20

View File

@ -1,4 +1,4 @@
FROM openjdk:14-alpine as jdkbuilder FROM openjdk:15-alpine as jdkbuilder
RUN apk add --no-cache binutils RUN apk add --no-cache binutils

View File

@ -12,8 +12,8 @@ repositories {
} }
dependencies { dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20")
implementation("org.jetbrains.kotlin:kotlin-serialization:1.4.10") implementation("org.jetbrains.kotlin:kotlin-serialization:1.4.20")
implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0") implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
implementation("org.jlleitschuh.gradle:ktlint-gradle:9.4.1") implementation("org.jlleitschuh.gradle:ktlint-gradle:9.4.1")
implementation("com.github.ben-manes:gradle-versions-plugin:0.28.0") implementation("com.github.ben-manes:gradle-versions-plugin:0.28.0")

View File

@ -16,8 +16,8 @@ group = "be.simplenotes"
version = "1.0-SNAPSHOT" version = "1.0-SNAPSHOT"
java { java {
sourceCompatibility = JavaVersion.VERSION_14 sourceCompatibility = JavaVersion.VERSION_15
targetCompatibility = JavaVersion.VERSION_14 targetCompatibility = JavaVersion.VERSION_15
} }
tasks.withType<JavaCompile> { tasks.withType<JavaCompile> {

View File

@ -8,12 +8,12 @@ plugins {
dependencies { dependencies {
implementation(kotlin("stdlib-jdk8")) implementation(kotlin("stdlib-jdk8"))
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.4.10")) implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.4.20"))
} }
tasks.withType<KotlinCompile> { tasks.withType<KotlinCompile> {
kotlinOptions { kotlinOptions {
jvmTarget = "14" jvmTarget = "15"
javaParameters = true javaParameters = true
freeCompilerArgs = listOf( freeCompilerArgs = listOf(
"-Xinline-classes", "-Xinline-classes",