From 54e6ee82ad5307a8ae8a98f7d4056692a914976e Mon Sep 17 00:00:00 2001 From: Svyatoslav Kuzmich Date: Tue, 30 Apr 2019 15:49:03 +0300 Subject: [PATCH] Exclude :kotlin-stdlib-js-ir from coreLibProjects for local builds --- build.gradle.kts | 8 +++++--- gradle.properties | 3 --- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index eb3ff78332d..5f3cc13492c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -230,11 +230,13 @@ extra["compilerModules"] = arrayOf( ":compiler:fir:fir2ir" ) -val coreLibProjects = listOf( +val coreLibProjects = listOfNotNull( ":kotlin-stdlib", ":kotlin-stdlib-common", ":kotlin-stdlib-js", - ":kotlin-stdlib-js-ir", + // Local builds are disabled at the request of the lib team + // TODO: Enable when tests are fixed + ":kotlin-stdlib-js-ir".takeIf { isTeamcityBuild }, ":kotlin-stdlib-jdk7", ":kotlin-stdlib-jdk8", ":kotlin-test:kotlin-test-common", @@ -736,4 +738,4 @@ allprojects { repositories.redirect() } } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 401ee628f35..e8169d3e404 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,3 @@ kotlin.compiler.newInferenceEnabled=true #jpsBuild=true #cidrPluginsEnabled=true - -kotlin.stdlib.js.ir.publish=false -kotlin.stdlib.js.ir.dist=false