GraphQl: Fix advices for 22+ (#7295)

DataDog · Jul 9, 2024 · 5ab86d2 · 5ab86d2
1 parent 294b617
commit 5ab86d2
Show file tree

Hide file tree

Showing 3 changed files with 150 additions and 139 deletions.
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle
@@ -1,6 +1,8 @@
 ext {
   latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
   latestDepForkedTestMinJavaVersionForTests = JavaVersion.VERSION_11
+  graphql21LatestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
+  graphql21LatestDepForkedTestMinJavaVersionForTests = JavaVersion.VERSION_11
 }
 // there are a lot of invalid version using dates (i.e. com.graphql-java-graphql-java-2018-06-04T04-23-07)
 // so we limit by chunks
@@ -32,6 +34,10 @@ apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
+addTestSuiteForDir('graphql20LatestDepTest', 'test')
+addTestSuiteExtendingForDir('graphql20LatestDepForkedTest', 'graphql20LatestDepTest', 'test')
+addTestSuiteForDir('graphql21LatestDepTest', 'test')
+addTestSuiteExtendingForDir('graphql21LatestDepForkedTest', 'graphql21LatestDepTest', 'test')
 
 dependencies {
   compileOnly group: 'com.graphql-java', name: 'graphql-java', version: '20.0'
@@ -42,9 +48,20 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:graphql-java:graphql-java-14.0')
   testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
 
-  latestDepTestImplementation group: 'com.graphql-java', name: 'graphql-java', version: '20+,23)'
+  graphql20LatestDepTestImplementation group: 'com.graphql-java', name: 'graphql-java', version: '20.+'
+  graphql21LatestDepTestImplementation group: 'com.graphql-java', name: 'graphql-java', version: '21.+'
+  latestDepTestImplementation group: 'com.graphql-java', name: 'graphql-java', version: '22.+'
 
-  [compileLatestDepTestJava, compileLatestDepForkedTestGroovy].each {
+  [
+    compileLatestDepTestJava,
+    compileLatestDepTestGroovy,
+    compileLatestDepForkedTestJava,
+    compileLatestDepForkedTestGroovy,
+    compileGraphql21LatestDepTestJava,
+    compileGraphql21LatestDepTestGroovy,
+    compileGraphql21LatestDepForkedTestJava,
+    compileGraphql21LatestDepForkedTestGroovy
+  ].each {
     it.configure {
       setJavaVersion(it, 11)
     }