From cd446eef8d7f6bbfeda3869668f47db8dde32f99 Mon Sep 17 00:00:00 2001 From: Ronald Holshausen Date: Fri, 12 Feb 2021 11:24:54 +1100 Subject: [PATCH] chore: upgrade Kotlin to 1.4.30 --- build.gradle | 9 +-------- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index c87da6fb3a..7e495a084a 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,7 @@ buildscript { } plugins { - id 'org.jetbrains.kotlin.jvm' version '1.4.21' -// id 'org.jmailen.kotlinter' version '3.2.0' + id 'org.jetbrains.kotlin.jvm' version '1.4.30' id 'io.gitlab.arturbosch.detekt' version '1.14.1' id 'org.jetbrains.dokka' version '1.4.10' apply false id 'org.javamodularity.moduleplugin' version '1.7.0' apply false @@ -60,7 +59,6 @@ subprojects { apply plugin: 'jacoco' } apply plugin: 'org.jetbrains.kotlin.jvm' -// apply plugin: 'org.jmailen.kotlinter' apply plugin: 'io.gitlab.arturbosch.detekt' if (System.env.CI != 'true') { apply plugin: 'org.jetbrains.dokka' @@ -216,11 +214,6 @@ subprojects { check.dependsOn << 'jacocoTestReport' } -// kotlinter { -// indentSize = 2 -// reporters = ['checkstyle', 'plain', 'json'] -// } - detekt { failFast = false config = files(rootProject.file("config/detekt-config.yml")) diff --git a/gradle.properties b/gradle.properties index be973c5f00..5849ec661b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ groovyVersion=3.0.7 groovy2Version=2.5.10 -kotlinVersion=1.4.21 +kotlinVersion=1.4.30 httpBuilderVersion=1.0.4 commonsLang3Version=3.4 httpClientVersion=4.5.13