From 3d552ae7bbf3b8eda625059d7b1b75d7658fd387 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 9 Sep 2020 13:21:29 +0300 Subject: [PATCH] Update jar collision rules (cherry picked from commit c92160b3639a0bfdc82b9e6dfc50a8eed8684d31) --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a7ea2f398d5..787f78cbbf5 100644 --- a/build.gradle +++ b/build.gradle @@ -312,8 +312,9 @@ task detectJarCollision(type: CollisionDetector) { 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", - "config", "config.jvm", "js.config", "javac-wrapper", + librariesWithIgnoredClassCollisions.addAll(["util", "container", "resolution.common", "resolution", "serialization", "psi", + "deserialization.common", "deserialization.common.jvm", + "frontend", "config", "config.jvm", "js.config", "javac-wrapper", "frontend.common", "frontend.java", "cli-common", "ir.tree", "ir.tree.impl", "ir.tree.persisting", "ir.psi2ir", "ir.backend.common", "backend.jvm", "backend.js",