From 3546ad5e722bce58e9181783cefc5d72c5a457dc Mon Sep 17 00:00:00 2001
From: Elena Lepilkina <Elena.Lepilkina@jetbrains.com>
Date: Fri, 6 Mar 2020 12:19:11 +0300
Subject: [PATCH] Added one more resolving rules for composite build

(cherry picked from commit 9664abc05c1b7c2480935527a7c1e2c740d12028)
---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 4d537acae07..47619568cc6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -297,6 +297,7 @@ task detectJarCollision(type: CollisionDetector) {
     if (project.hasProperty('kotlinProjectPath')) {
         resolvingRulesWithRegexes[new Regex("META-INF/.+\\.kotlin_module")] = "kotlin-compiler"
         resolvingRules["META-INF/extensions/compiler.xml"] = "kotlin-compiler"
+        resolvingRules["META-INF/compiler.version"] = "kotlin-compiler"
         resolvingRules["kotlinManifest.properties"] = "kotlin-compiler"
         librariesWithIgnoredClassCollisions.addAll(["util", "container", "resolution", "serialization", "psi", "frontend",
                                                     "frontend.common", "frontend.java", "cli-common", "ir.tree",