From 3da5ba4efe9441f0ae9a51278aec4e51f282d6da Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 10 Jul 2017 18:54:53 +0200 Subject: [PATCH] Switch to the newer gradle plugin, fix jansi problem, in-process compiling in gradle parts Switching to in-process to avoid compilation warnings caused by introduced daemon interface changes. Switching to the gradle plugin 1.1.3 causes jansi incompatibility in in-process compilation mode, so disabling jansi usage to avoid it. --- libraries/commonConfiguration.gradle | 5 +++++ libraries/versions.gradle | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle index 5586b3f1079..10a330aacab 100644 --- a/libraries/commonConfiguration.gradle +++ b/libraries/commonConfiguration.gradle @@ -30,6 +30,11 @@ ext.configureJvmProject = { Project project -> tasks.withType(project.compileKotlin.class) { kotlinOptions.jdkHome = JDK_16 + doFirst { + System.setProperty("kotlin.colors.enabled", "false") + // TODO: fix daemon compatibility (if possible) and remove in-process compilation here + System.setProperty("kotlin.compiler.execution.strategy", "in-process") + } } test { diff --git a/libraries/versions.gradle b/libraries/versions.gradle index bebaaad04f1..caf2f2c0074 100644 --- a/libraries/versions.gradle +++ b/libraries/versions.gradle @@ -1,3 +1,3 @@ ext.kotlin_version = findProperty("deployVersion") ?: "1.1-SNAPSHOT" ext.kotlin_language_version = "1.1" -ext.kotlin_gradle_plugin_version = "1.1.2" \ No newline at end of file +ext.kotlin_gradle_plugin_version = "1.1.3" \ No newline at end of file