chore: Remove instrumentation afterEvaluate

# Conflicts:
#	dd-java-agent/instrumentation/build.gradle

Author: bric3

dd-java-agent/instrumentation/build.gradle

@@ -1,3 +1,6 @@
+import static org.gradle.api.plugins.JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME
+import static org.gradle.api.tasks.SourceSet.MAIN_SOURCE_SET_NAME
+
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
@@ -35,39 +38,31 @@ subprojects { Project subProj ->
       }
     }
 
+    subProj.tasks.withType(Javadoc).configureEach { enabled = false }
+
     // Configures base dependencies for additional sourceSet
     subProj.configurations
-      .matching { it.name.matches("${SourceSet.MAIN_SOURCE_SET_NAME}_java\\d+${JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME.capitalize()}") }
+      .matching { it.name.matches("${MAIN_SOURCE_SET_NAME}_java\\d+${IMPLEMENTATION_CONFIGURATION_NAME.capitalize()}") }
       .configureEach {
-        it.dependencies.add(project.dependencyFactory.create(project(':dd-trace-api')))
-        it.dependencies.add(project.dependencyFactory.create(project(':dd-java-agent:agent-tooling')))
+        it.dependencies.add(subProj.dependencyFactory.create(project(':dd-trace-api')))
+        it.dependencies.add(subProj.dependencyFactory.create(project(':dd-java-agent:agent-tooling')))
         it.dependencies.addLater(libs.bytebuddy)
       }
 
-    subProj.tasks.withType(Javadoc).configureEach { enabled = false }
-
-    if (subProj.hasProperty('minJavaVersionForTests') && subProj.findProperty('minJavaVersionForTests') != JavaVersion.VERSION_1_8) {
-      def version = JavaVersion.toVersion(subProj.findProperty('minJavaVersionForTests'))
-      def mainJavaConfigName = "main_name${version.majorVersion}Implementation"
-
-      configurations
-        .matching {it.name == mainJavaConfigName }
-        .configureEach {
-          it.dependencies.add(subProj.dependencies.project(path: ':dd-trace-api'))
-          it.dependencies.add(subProj.dependencies.project(path: ':dd-java-agent:agent-tooling'))
-          it.dependencies.addLater(libs.bytebuddy)
-        }
-    }
-
     dependencies {
+      // Main
+      annotationProcessor project(':dd-java-agent:instrumentation-annotation-processor')
+      annotationProcessor libs.autoservice.processor
+      compileOnly libs.autoservice.annotation
+
       // Apply common dependencies for instrumentation.
       implementation project(':dd-trace-api')
       implementation project(':dd-java-agent:agent-tooling')
       implementation libs.bytebuddy
 
-      annotationProcessor project(':dd-java-agent:instrumentation-annotation-processor')
-      annotationProcessor libs.autoservice.processor
-      compileOnly libs.autoservice.annotation
+      // Tests
+      testAnnotationProcessor libs.autoservice.processor
+      testCompileOnly libs.autoservice.annotation
 
       // Include instrumentations instrumenting core JDK classes to ensure interoperability with other instrumentation
       testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8')
@@ -76,8 +71,6 @@ subprojects { Project subProj ->
       testImplementation project(':dd-java-agent:instrumentation:classloading')
 
       testImplementation project(':dd-java-agent:instrumentation-testing')
-      testAnnotationProcessor libs.autoservice.processor
-      testCompileOnly libs.autoservice.annotation
     }
 
     subProj.tasks.withType(Test).configureEach { subTask ->