From 6ac134b19f46f70dfcb47ede836648cbcc62d32d Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Fri, 18 Aug 2023 11:25:03 +0200 Subject: [PATCH] Ensure .class files aren't present in the resources library MR jar (#9245) --- instrumentation/resources/library/build.gradle.kts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/instrumentation/resources/library/build.gradle.kts b/instrumentation/resources/library/build.gradle.kts index 52e35a61d3..fa690dd23f 100644 --- a/instrumentation/resources/library/build.gradle.kts +++ b/instrumentation/resources/library/build.gradle.kts @@ -50,9 +50,17 @@ for (version in mrJarVersions) { tasks { withType(Jar::class) { + val sourcePathProvider = if (name == "jar") { + { ss: SourceSet? -> ss?.output } + } else if (name == "sourcesJar") { + { ss: SourceSet? -> ss?.java } + } else { + { project.objects.fileCollection() } + } + for (version in mrJarVersions) { into("META-INF/versions/$version") { - from(sourceSets["java$version"].output) + from(sourcePathProvider(sourceSets["java$version"])) } } manifest.attributes(