Skip to content

Commit a1d4188

Browse files
committed
updating plugin to account for file being in metadata
1 parent bba22a3 commit a1d4188

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package datadog.gradle.plugin.config
22

3+
import org.gradle.api.Project
34
import org.gradle.api.file.ProjectLayout
45
import org.gradle.api.model.ObjectFactory
56
import javax.inject.Inject
67

7-
open class SupportedTracerConfigurations @Inject constructor(objects: ObjectFactory, layout: ProjectLayout) {
8+
open class SupportedTracerConfigurations @Inject constructor(objects: ObjectFactory, layout: ProjectLayout, project: Project) {
89
val configOwnerPath = objects.property<String>(String::class.java).convention(":utils:config-utils")
910
val className = objects.property<String>(String::class.java).convention("datadog.trace.config.inversion.GeneratedSupportedConfigurations")
1011

11-
val jsonFile = objects.fileProperty().convention(layout.projectDirectory.file("src/main/resources/supported-configurations.json"))
12+
val jsonFile = objects.fileProperty().convention(project.rootProject.layout.projectDirectory.file("metadata/supported-configurations.json"))
1213

1314
val destinationDirectory = objects.directoryProperty().convention(layout.buildDirectory.dir("generated/supportedConfigurations"))
1415
}

dd-java-agent/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,6 @@ dependencies {
303303
transitive = false
304304
}
305305

306-
sharedShadowInclude project(':utils:config-utils'), { transitive = false }
307-
308306
sharedShadowInclude project(':utils:container-utils'), {
309307
transitive = false
310308
}

0 commit comments

Comments
 (0)