Skip to content

Commit f5a892a

Browse files
bric3bric3
committed
refactor: Renames min|maxJavaVersionForTests to min|maxJavaVersion
1 parent 1e2e37b commit f5a892a

File tree

94 files changed

+135
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+135
-147
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ tasks.withType<Test>().configureEach {
2727
inputs.property("${TestJvmConstraintsExtension.NAME}.excludeJdk", taskExtension.excludeJdk)
2828
inputs.property("${TestJvmConstraintsExtension.NAME}.includeJdk", taskExtension.includeJdk)
2929
inputs.property("${TestJvmConstraintsExtension.NAME}.forceJdk", taskExtension.forceJdk)
30-
inputs.property("${TestJvmConstraintsExtension.NAME}.minJavaVersionForTests", taskExtension.minJavaVersionForTests).optional(true)
31-
inputs.property("${TestJvmConstraintsExtension.NAME}.maxJavaVersionForTests", taskExtension.maxJavaVersionForTests).optional(true)
30+
inputs.property("${TestJvmConstraintsExtension.NAME}.minJavaVersion", taskExtension.minJavaVersion).optional(true)
31+
inputs.property("${TestJvmConstraintsExtension.NAME}.maxJavaVersion", taskExtension.maxJavaVersion).optional(true)
3232

3333
extensions.add(TestJvmConstraintsExtension.NAME, taskExtension)
3434

@@ -101,13 +101,13 @@ private fun Test.configureConventions(
101101
taskExtension: TestJvmConstraintsExtension,
102102
projectExtension: TestJvmConstraintsExtension
103103
) {
104-
taskExtension.minJavaVersionForTests.convention(projectExtension.minJavaVersionForTests
104+
taskExtension.minJavaVersion.convention(projectExtension.minJavaVersion
105105
.orElse(providers.provider { project.findProperty("${name}MinJavaVersionForTests") as? JavaVersion })
106-
.orElse(providers.provider { project.findProperty("minJavaVersionForTests") as? JavaVersion })
106+
.orElse(providers.provider { project.findProperty("minJavaVersion") as? JavaVersion })
107107
)
108-
taskExtension.maxJavaVersionForTests.convention(projectExtension.maxJavaVersionForTests
108+
taskExtension.maxJavaVersion.convention(projectExtension.maxJavaVersion
109109
.orElse(providers.provider { project.findProperty("${name}MaxJavaVersionForTests") as? JavaVersion })
110-
.orElse(providers.provider { project.findProperty("maxJavaVersionForTests") as? JavaVersion })
110+
.orElse(providers.provider { project.findProperty("maxJavaVersion") as? JavaVersion })
111111
)
112112
taskExtension.forceJdk.convention(projectExtension.forceJdk
113113
.orElse(providers.provider {

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
11
package datadog.gradle.plugin.testJvmConstraints
22

33
import org.gradle.api.JavaVersion
4-
import org.gradle.api.Project
5-
import org.gradle.api.model.ObjectFactory
64
import org.gradle.api.provider.ListProperty
75
import org.gradle.api.provider.Property
8-
import org.gradle.api.provider.ProviderFactory
9-
import org.gradle.kotlin.dsl.extra
10-
import org.gradle.kotlin.dsl.listProperty
11-
import org.gradle.kotlin.dsl.property
12-
import javax.inject.Inject
136

147
interface TestJvmConstraintsExtension {
158
/**
169
* Sets an explicit minimum bound to allowed JDK version
1710
*/
18-
val minJavaVersionForTests: Property<JavaVersion>
11+
val minJavaVersion: Property<JavaVersion>
1912

2013
/**
2114
* Sets an explicit maximum bound to allowed JDK version
2215
*/
23-
val maxJavaVersionForTests: Property<JavaVersion>
16+
val maxJavaVersion: Property<JavaVersion>
2417

2518
/**
2619
* List of allowed JDK names (passed through the `testJvm` property).

‎buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsUtils.kt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package datadog.gradle.plugin.testJvmConstraints
22

33
import org.gradle.api.JavaVersion
44
import org.gradle.api.logging.Logging
5-
import org.gradle.jvm.toolchain.JavaLauncher
65

76
private val logger = Logging.getLogger("TestJvmConstraintsUtils")
87

@@ -32,16 +31,16 @@ internal fun TestJvmConstraintsExtension.isTestJvmAllowed(testJvmSpec: TestJvmSp
3231
}
3332

3433
private fun TestJvmConstraintsExtension.isWithinAllowedRange(currentJvmVersion: JavaVersion): Boolean {
35-
val definedMin = minJavaVersionForTests.isPresent
36-
val definedMax = maxJavaVersionForTests.isPresent
34+
val definedMin = minJavaVersion.isPresent
35+
val definedMax = maxJavaVersion.isPresent
3736

38-
if (definedMin && (minJavaVersionForTests.get()) > currentJvmVersion) {
39-
logger.info("isJavaVersionAllowedForProperty returns false b/o minProp=${minJavaVersionForTests.get()} is defined and greater than version=$currentJvmVersion")
37+
if (definedMin && (minJavaVersion.get()) > currentJvmVersion) {
38+
logger.info("isWithinAllowedRange returns false b/o minProp=${minJavaVersion.get()} is defined and greater than version=$currentJvmVersion")
4039
return false
4140
}
4241

43-
if (definedMax && (maxJavaVersionForTests.get()) < currentJvmVersion) {
44-
logger.info("isJavaVersionAllowedForProperty returns false b/o maxProp=${maxJavaVersionForTests.get()} is defined and lower than version=$currentJvmVersion")
42+
if (definedMax && (maxJavaVersion.get()) < currentJvmVersion) {
43+
logger.info("isWithinAllowedRange returns false b/o maxProp=${maxJavaVersion.get()} is defined and lower than version=$currentJvmVersion")
4544
return false
4645
}
4746

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ apply plugin: 'idea'
33

44
tracerJava {
55
addSourceSetFor(JavaVersion.VERSION_11) {
6-
// By default tests with be compiled for `minJavaVersionForTests` version,
6+
// By default tests with be compiled for `minJavaVersion` version,
77
// but in this case we would like to avoid this since we would like to run with ZULU8
88
applyForTestSources = false
99
}
1010
}
1111

1212
testJvmConstraint {
13-
minJavaVersionForTests = JavaVersion.VERSION_11
13+
minJavaVersion = JavaVersion.VERSION_11
1414
excludeJdk = ['SEMERU11', 'SEMERU17']
1515
}
1616

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'idea'
66
testJvmConstraint {
77
// the tests need Java 11 because the JFR writer got compiled with a version
88
// of ByteBuffer.position(int) which is binary incompatible with Java 8 ¯\_(ツ)_/¯
9-
minJavaVersionForTests = JavaVersion.VERSION_11
9+
minJavaVersion = JavaVersion.VERSION_11
1010

1111
excludeJdk = ['SEMERU11', 'SEMERU17']
1212
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apply from: "$rootDir/gradle/java.gradle"
55
apply plugin: 'idea'
66

77
testJvmConstraint {
8-
minJavaVersionForTests = JavaVersion.VERSION_1_8
8+
minJavaVersion = JavaVersion.VERSION_1_8
99
}
1010

1111
sourceSets {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ apply plugin: 'idea'
33

44
tracerJava {
55
addSourceSetFor(JavaVersion.VERSION_11) {
6-
// By default tests with be compiled for `minJavaVersionForTests` version,
6+
// By default tests with be compiled for `minJavaVersion` version,
77
// but in this case we would like to avoid this since we would like to run with ZULU8
88
applyForTestSources = false
99
}
1010
}
1111

1212
testJvmConstraint {
13-
minJavaVersionForTests = JavaVersion.VERSION_11
13+
minJavaVersion = JavaVersion.VERSION_11
1414
// Zulu has backported profiling support
1515
forceJdk = ['ZULU8']
1616
excludeJdk = ['SEMERU11', 'SEMERU17']

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/java.gradle"
22

33
tracerJava {
44
addSourceSetFor(JavaVersion.VERSION_11) {
5-
// By default tests with be compiled for `minJavaVersionForTests` version,
5+
// By default tests with be compiled for `minJavaVersion` version,
66
// but in this case we would like to avoid this since we would like to run with ZULU8
77
applyForTestSources = false
88
}

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

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

1717
tasks.named("latestDepTest", Test) {
1818
testJvmConstraint {
19-
minJavaVersionForTests = JavaVersion.VERSION_21
19+
minJavaVersion = JavaVersion.VERSION_21
2020
}
2121
}
2222

2323
tasks.named("latestDepForkedTest", Test) {
2424
testJvmConstraint {
25-
minJavaVersionForTests = JavaVersion.VERSION_21
25+
minJavaVersion = JavaVersion.VERSION_21
2626
}
2727
}
2828

‎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
@@ -19,7 +19,7 @@ addTestSuiteForDir 'latestDepIastTest', 'iastTest'
1919

2020
tasks.named("lagomTest", Test) {
2121
testJvmConstraint {
22-
maxJavaVersionForTests = JavaVersion.VERSION_1_8
22+
maxJavaVersion = JavaVersion.VERSION_1_8
2323
}
2424
}
2525

0 commit comments

Comments
 (0)