Skip to content

Commit dcce4f2

Browse files
committed
chore: Renames jvmConstraints to testJvmConstraints
1 parent 594cbb1 commit dcce4f2

File tree

40 files changed

+102
-103
lines changed

40 files changed

+102
-103
lines changed

buildSrc/src/main/kotlin/datadog.test-jvm-contraints.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import datadog.gradle.plugin.testJvmConstraints.ProvideJvmArgsOnJvmLauncherVersion
22
import datadog.gradle.plugin.testJvmConstraints.TestJvmConstraintsExtension
33
import datadog.gradle.plugin.testJvmConstraints.TestJvmJavaLauncher
4-
import datadog.gradle.plugin.testJvmConstraints.*
5-
import org.gradle.api.JavaVersion
6-
import org.gradle.api.provider.Provider
7-
import org.gradle.kotlin.dsl.*
4+
import datadog.gradle.plugin.testJvmConstraints.isJavaLauncherAllowed
5+
import datadog.gradle.plugin.testJvmConstraints.isJavaVersionAllowed
6+
import datadog.gradle.plugin.testJvmConstraints.isJdkExcluded
7+
import datadog.gradle.plugin.testJvmConstraints.isJdkForced
88

99
plugins {
1010
java

buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ interface TestJvmConstraintsExtension {
1919
val allowReflectiveAccessToJdk: Property<Boolean>
2020

2121
companion object {
22-
const val NAME = "jvmConstraint"
22+
const val NAME = "testJvmConstraint"
2323
}
2424
}

dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
// Set properties before any plugins get loaded
22
ext {
3-
minJavaVersionForTests = JavaVersion.VERSION_11
43
// By default tests with be compiled for `minJavaVersionForTests` version,
54
// but in this case we would like to avoid this since we would like to run with ZULU8
65
skipSettingTestJavaVersion = true
7-
excludeJdk = ['SEMERU11', 'SEMERU17']
86
}
97

108
apply from: "$rootDir/gradle/java.gradle"
119
apply plugin: 'idea'
1210

11+
testJvmConstraint {
12+
minJavaVersionForTests = JavaVersion.VERSION_11
13+
excludeJdk = ['SEMERU11', 'SEMERU17']
14+
}
15+
1316
minimumBranchCoverage = 0.5
1417
minimumInstructionCoverage = 0.7
1518

dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
22

3-
// Set properties before any plugins get loaded
4-
ext {
3+
apply from: "$rootDir/gradle/java.gradle"
4+
apply plugin: 'idea'
5+
6+
testJvmConstraint {
57
// the tests need Java 11 because the JFR writer got compiled with a version
68
// of ByteBuffer.position(int) which is binary incompatible with Java 8 ¯\_(ツ)_/¯
79
minJavaVersionForTests = JavaVersion.VERSION_11
810

911
excludeJdk = ['SEMERU11', 'SEMERU17']
1012
}
1113

12-
apply from: "$rootDir/gradle/java.gradle"
13-
apply plugin: 'idea'
14-
1514
dependencies {
1615
api project(':dd-java-agent:agent-profiling:profiling-controller')
1716

dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
// Set properties before any plugins get loaded
22
ext {
3-
minJavaVersionForTests = JavaVersion.VERSION_11
4-
// Zulu has backported profiling support
5-
forceJdk = ['ZULU8']
6-
excludeJdk = ['SEMERU11', 'SEMERU17']
73
// By default tests with be compiled for `minJavaVersionForTests` version,
84
// but in this case we would like to avoid this since we would like to run with ZULU8
95
skipSettingTestJavaVersion = true
@@ -12,6 +8,13 @@ ext {
128
apply from: "$rootDir/gradle/java.gradle"
139
apply plugin: 'idea'
1410

11+
testJvmConstraint {
12+
minJavaVersionForTests = JavaVersion.VERSION_11
13+
// Zulu has backported profiling support
14+
forceJdk = ['ZULU8']
15+
excludeJdk = ['SEMERU11', 'SEMERU17']
16+
}
17+
1518
dependencies {
1619
api libs.slf4j
1720
api project(':internal-api')

dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Set properties before any plugins get loaded
22
ext {
3-
// Need to force Oracle JDK 8 since it is the only JDK compatible with this implementation
4-
forceJdk = ['ORACLE8']
53
// By default tests with be compiled for `minJavaVersionForTests` version,
64
// but in this case we would like to avoid this since we would like to run with ORACLE8
75
skipSettingTestJavaVersion = true

dd-java-agent/instrumentation/aerospike-4.0/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
1515
addTestSuiteExtendingForDir("latest7DepForkedTest", "latest7DepTest", "test")
1616

1717
tasks.named("latestDepTest", Test) {
18-
jvmConstraint {
18+
testJvmConstraint {
1919
minJavaVersionForTests = JavaVersion.VERSION_21
2020
}
2121
}
2222

2323
tasks.named("latestDepForkedTest", Test) {
24-
jvmConstraint {
24+
testJvmConstraint {
2525
minJavaVersionForTests = JavaVersion.VERSION_21
2626
}
2727
}

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ addTestSuiteForDir 'version102IastTest', 'iastTest'
1818
addTestSuiteForDir 'latestDepIastTest', 'iastTest'
1919

2020
tasks.named("lagomTest", Test) {
21-
jvmConstraint {
21+
testJvmConstraint {
2222
maxJavaVersionForTests = JavaVersion.VERSION_1_8
2323
}
2424
}

dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ addTestSuiteExtendingForDir("jetty9LatestDepTest", "latestDepTest", "test/jetty9
2222
addTestSuiteExtendingForDir("jetty11LatestDepTest", "latestDepTest", "test/jetty11")
2323

2424
tasks.named("jetty11Test", Test) {
25-
jvmConstraint {
25+
testJvmConstraint {
2626
minJavaVersionForTests = JavaVersion.VERSION_11
2727
}
2828
}

dd-java-agent/instrumentation/avro/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ addTestSuiteForDir('latestDepTest','test')
1313
addTestSuiteForDir('latestDepTest8','test')
1414

1515
tasks.named("latestDepTest", Test) {
16-
jvmConstraint {
16+
testJvmConstraint {
1717
minJavaVersionForTests = JavaVersion.VERSION_11
1818
}
1919
}

0 commit comments

Comments
 (0)