Fix simdvec gradle runtime java check

ChrisHegarty · ChrisHegarty · commit 2a0d5ffc020d · 2024-10-08T09:39:21.000+01:00
diff --git a/libs/simdvec/build.gradle b/libs/simdvec/build.gradle
@@ -7,6 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
+import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.internal.precommit.CheckForbiddenApisTask
 
 apply plugin: 'elasticsearch.publish'
@@ -32,7 +33,7 @@ tasks.matching { it.name == "compileMain21Java" }.configureEach {
 }
 
 tasks.named('test').configure {
-  if (JavaVersion.current().majorVersion.toInteger() >= 21) {
+  if (BuildParams.getRuntimeJavaVersion().majorVersion.toInteger() >= 21) {
     jvmArgs '--add-modules=jdk.incubator.vector'
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`* License v3.0 only", or the "Server Side Public License, v 1".`
`8`	`8`	`*/`
`9`	`9`
	`10`	`+import org.elasticsearch.gradle.internal.info.BuildParams`
`10`	`11`	`import org.elasticsearch.gradle.internal.precommit.CheckForbiddenApisTask`
`11`	`12`
`12`	`13`	`apply plugin: 'elasticsearch.publish'`
`@@ -32,7 +33,7 @@ tasks.matching { it.name == "compileMain21Java" }.configureEach {`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`tasks.named('test').configure {`
`35`		`- if (JavaVersion.current().majorVersion.toInteger() >= 21) {`
	`36`	`+ if (BuildParams.getRuntimeJavaVersion().majorVersion.toInteger() >= 21) {`
`36`	`37`	`jvmArgs '--add-modules=jdk.incubator.vector'`
`37`	`38`	`}`
`38`	`39`	`}`