Skip to content

Commit b50bb6d

Browse files
Fixed build logic for dd-java-agent to correctly handle classes compiled with Java 6. (#8899)
1 parent aac0226 commit b50bb6d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

dd-java-agent/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ compileMain_java6Java.configure {
2929
setJavaVersion(it, 8)
3030
sourceCompatibility = JavaVersion.VERSION_1_6
3131
targetCompatibility = JavaVersion.VERSION_1_6
32-
destinationDirectory = layout.buildDirectory.dir("classes/java/main")
3332
}
3433

3534
tasks.compileJava.dependsOn compileMain_java6Java
@@ -52,6 +51,9 @@ ext.generalShadowJarConfig = {
5251

5352
duplicatesStrategy = DuplicatesStrategy.FAIL
5453

54+
// Include AgentPreCheck compiled with Java 6.
55+
from sourceSets.main_java6.output
56+
5557
// Remove some cruft from the final jar.
5658
// These patterns should NOT include **/META-INF/maven/**/pom.properties, which is
5759
// used to report our own dependencies, but we should remove the top-level metadata

0 commit comments

Comments
 (0)