fix: gradle smoke tests in gradle 9

Author: daniel-mohedano

dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy

@@ -34,6 +34,8 @@ class AbstractGradleTest extends CiVisibilitySmokeTest {
   private static final String GRADLE_TEST_RESOURCE_EXTENSION = ".gradleTest"
   private static final String GRADLE_REGULAR_EXTENSION = ".gradle"
 
+  private static final ComparableVersion GRADLE_9 = new ComparableVersion("9.0.0")
+
   @TempDir
   protected Path projectFolder
 
@@ -105,23 +107,23 @@ class AbstractGradleTest extends CiVisibilitySmokeTest {
     } else if (Jvm.current.java17) {
       return gradleVersion.compareTo(new ComparableVersion("7.3")) >= 0
     } else if (Jvm.current.java16) {
-      return gradleVersion.compareTo(new ComparableVersion("7.0")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("7.0"), GRADLE_9)
     } else if (Jvm.current.java15) {
-      return gradleVersion.compareTo(new ComparableVersion("6.7")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("6.7"), GRADLE_9)
     } else if (Jvm.current.java14) {
-      return gradleVersion.compareTo(new ComparableVersion("6.3")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("6.3"), GRADLE_9)
     } else if (Jvm.current.java13) {
-      return gradleVersion.compareTo(new ComparableVersion("6.0")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("6.0"), GRADLE_9)
     } else if (Jvm.current.java12) {
-      return gradleVersion.compareTo(new ComparableVersion("5.4")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("5.4"), GRADLE_9)
     } else if (Jvm.current.java11) {
-      return gradleVersion.compareTo(new ComparableVersion("5.0")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("5.0"), GRADLE_9)
     } else if (Jvm.current.java10) {
-      return gradleVersion.compareTo(new ComparableVersion("4.7")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("4.7"), GRADLE_9)
     } else if (Jvm.current.java9) {
-      return gradleVersion.compareTo(new ComparableVersion("4.3")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("4.3"), GRADLE_9)
     } else if (Jvm.current.java8) {
-      return gradleVersion.compareTo(new ComparableVersion("2.0")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("2.0"), GRADLE_9)
     }
     return false
   }

dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/build.gradleTest

@@ -30,6 +30,7 @@ repositories {
 dependencies {
     testImplementation gradleTestKit()
 
+    testImplementation 'org.junit.platform:junit-platform-launcher'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 

dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/build.gradleTest

@@ -19,7 +19,7 @@ repositories {
 testing {
     suites {
         test {
-            useJUnitJupiter()
+            useJUnitJupiter('5.9.3')
 
             dependencies {
               implementation 'org.junit.platform:junit-platform-launcher:1.9.3'

internal-api/src/main/java/datadog/trace/util/ComparableVersion.java

@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
+import javax.annotation.Nonnull;
 
 // backported from org.apache.maven:maven-artifact:3.9.9
 public class ComparableVersion implements Comparable<ComparableVersion> {
@@ -125,6 +126,11 @@ public int compareTo(ComparableVersion o) {
     return this.items.compareTo(o.items);
   }
 
+  /** Checks if the version is in the range {@code [start, end)} */
+  public boolean isWithin(@Nonnull ComparableVersion start, @Nonnull ComparableVersion end) {
+    return compareTo(start) >= 0 && compareTo(end) < 0;
+  }
+
   public String toString() {
     return this.value;
   }