From 08e2ee0951c81eb260a4d89ae9851b6e35f1f16d Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 30 Aug 2017 18:16:00 +0300 Subject: [PATCH] Restore legacy kotlin-runtime maven artifact --- libraries/tools/runtime/build.gradle | 18 ++++++++++-------- settings.gradle | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libraries/tools/runtime/build.gradle b/libraries/tools/runtime/build.gradle index b431a9be81b..24aff9fdd86 100644 --- a/libraries/tools/runtime/build.gradle +++ b/libraries/tools/runtime/build.gradle @@ -10,17 +10,19 @@ dependencies { } sourceSets { - if(!System.properties.'idea.active') main { - java { - srcDir "${rootDir}/core/builtins/src" - srcDir "${rootDir}/core/runtime.jvm/src" - exclude 'org/jetbrains/annotations/**' - } - kotlin { - exclude 'org/jetbrains/annotations/**' + if(!System.properties.'idea.active') { + java { + srcDir "${rootDir}/core/builtins/src" + srcDir "${rootDir}/core/runtime.jvm/src" + exclude 'org/jetbrains/annotations/**' + } + kotlin { + exclude 'org/jetbrains/annotations/**' + } } } + } jar { diff --git a/settings.gradle b/settings.gradle index d40acebde48..8eb15c463c1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -80,7 +80,7 @@ include ":kotlin-build-common", ":plugins:kapt3", ":plugins:plugins-tests", ":kotlin-script-runtime", -// ":kotlin-runtime", + ":kotlin-runtime", ":kotlin-test:kotlin-test-common", ":kotlin-test:kotlin-test-jvm", ":kotlin-test:kotlin-test-junit",