Merge branch 'mhlidd/config_inversion_plugins' into mhlidd/migrate_config-utils_tests

Author: mhlidd

buildSrc/src/main/kotlin/datadog/gradle/plugin/config/SupportedTracerConfigurations.kt

@@ -1,14 +1,15 @@
 package datadog.gradle.plugin.config
 
+import org.gradle.api.Project
 import org.gradle.api.file.ProjectLayout
 import org.gradle.api.model.ObjectFactory
 import javax.inject.Inject
 
-open class SupportedTracerConfigurations @Inject constructor(objects: ObjectFactory, layout: ProjectLayout) {
+open class SupportedTracerConfigurations @Inject constructor(objects: ObjectFactory, layout: ProjectLayout, project: Project) {
   val configOwnerPath = objects.property<String>(String::class.java).convention(":utils:config-utils")
   val className = objects.property<String>(String::class.java).convention("datadog.trace.config.inversion.GeneratedSupportedConfigurations")
 
-  val jsonFile = objects.fileProperty().convention(layout.projectDirectory.file("src/main/resources/supported-configurations.json"))
+  val jsonFile = objects.fileProperty().convention(project.rootProject.layout.projectDirectory.file("metadata/supported-configurations.json"))
 
   val destinationDirectory = objects.directoryProperty().convention(layout.buildDirectory.dir("generated/supportedConfigurations"))
 }

dd-java-agent/build.gradle

@@ -93,8 +93,6 @@ ext.generalShadowJarConfig = {
   exclude '**/io/airlift/compress/snappy/**'
   relocate 'io.airlift', 'datadog.io.airlift'
 
-  exclude '**/supported-configurations.json'
-
   final String projectName = "${project.name}"
 
   // Prevents conflict with other instances, but doesn't relocate instrumentation
@@ -305,8 +303,6 @@ dependencies {
     transitive = false
   }
 
-  sharedShadowInclude project(':utils:config-utils'), { transitive = false }
-
   sharedShadowInclude project(':utils:container-utils'), {
     transitive = false
   }

utils/config-utils/src/main/resources/supported-configurations.json renamed to metadata/supported-configurations.json

@@ -54,11 +54,3 @@ dependencies {
 
   testImplementation(project(":utils:test-utils"))
 }
-
-tasks.named<ProcessResources>("processResources") {
-  exclude("supported-configurations.json")
-}
-
-tasks.named<Jar>("jar") {
-  exclude("supported-configurations.json")
-}