From 487c57e2e027e0875de0468f0cd2ffdcba737787 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Tue, 27 Nov 2018 12:52:20 +0300 Subject: [PATCH] Move resources, kotlin-reflect.jar: remove manually included META-INF/services/* Now it already included. Manually including causes duplicated contents in resulting files, for example: 1 kotlin.reflect.jvm.internal.impl.load.java.FieldOverridabilityCondition 2 kotlin.reflect.jvm.internal.impl.load.java.ErasedOverridabilityCondition 3 kotlin.reflect.jvm.internal.impl.load.java.JavaIncompatibilityRulesOverridabilityCondition 4 + kotlin.reflect.jvm.internal.impl.load.java.FieldOverridabilityCondition 5 + kotlin.reflect.jvm.internal.impl.load.java.ErasedOverridabilityCondition 6 + kotlin.reflect.jvm.internal.impl.load.java.JavaIncompatibilityRulesOverridabilityCondition Removing this line fixes that. --- libraries/reflect/build.gradle.kts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index ffb08150342..553b9a950ec 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -111,13 +111,6 @@ val reflectShadowJar by task { version = null callGroovy("manifestAttributes", manifest, project, "Main" /*true*/) - from(project(":core:descriptors.jvm").mainSourceSet.resources) { - include("META-INF/services/**") - } - from(project(":core:deserialization").mainSourceSet.resources) { - include("META-INF/services/**") - } - exclude("**/*.proto") transform(KotlinModuleShadowTransformer(logger))