From 0942baa419665857227666a508be156a4a2362e2 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 23 Sep 2020 17:50:33 +0300 Subject: [PATCH] Add new kotlin module to :detectJarCollision (cherry picked from commit f324c92b4d97438bbaad02a5993b7a00a78423a9) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 955251ef012..87396fe2545 100644 --- a/build.gradle +++ b/build.gradle @@ -318,7 +318,7 @@ task detectJarCollision(type: CollisionDetector) { resolvingRules["META-INF/compiler.version"] = "kotlin-compiler" resolvingRules["kotlinManifest.properties"] = "kotlin-compiler" librariesWithIgnoredClassCollisions.addAll(["util", "container", "resolution.common", "resolution", "serialization", "psi", - "deserialization.common", "deserialization.common.jvm", + "deserialization.common", "deserialization.common.jvm", "compiler.backend.common.jvm" "frontend", "config", "config.jvm", "js.config", "javac-wrapper", "frontend.common", "frontend.java", "cli-common", "ir.tree", "ir.tree.impl", "ir.tree.persisting",