From 6647d8fd93ab4c68503e03a25f69896268faa5bc Mon Sep 17 00:00:00 2001
From: Sergey Rostov <sergey.rostov@jetbrains.com>
Date: Thu, 27 Jun 2019 17:35:38 +0300
Subject: [PATCH] Build: remove mergeServiceFiles from reflectShadowJar

---
 libraries/reflect/build.gradle.kts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts
index 212869f0afd..2e15f1f42ee 100644
--- a/libraries/reflect/build.gradle.kts
+++ b/libraries/reflect/build.gradle.kts
@@ -109,14 +109,13 @@ class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer {
 
 val reflectShadowJar by task<ShadowJar> {
     archiveClassifier.set("shadow")
+    duplicatesStrategy = DuplicatesStrategy.FAIL
     configurations = listOf(embedded)
 
     callGroovy("manifestAttributes", manifest, project, "Main" /*true*/)
 
     exclude("**/*.proto")
 
-    mergeServiceFiles()
-
     if (kotlinBuildProperties.relocation) {
         transform(KotlinModuleShadowTransformer(logger))
         relocate("org.jetbrains.kotlin", "kotlin.reflect.jvm.internal.impl")