Refactor preview feature task to better support composite builds (#117594)

mark-vieira · web-flow · commit 82be243b648f · 2024-11-26T14:54:31.000-08:00
diff --git a/build-tools-internal/src/main/groovy/elasticsearch.ide.gradle b/build-tools-internal/src/main/groovy/elasticsearch.ide.gradle
@@ -142,13 +142,18 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') {
     description = 'Enables preview features on native library module'
     dependsOn tasks.named("enableExternalConfiguration")
 
-    doLast {
-      ['main', 'test'].each { sourceSet ->
-        modifyXml(".idea/modules/libs/native/elasticsearch.libs.native.${sourceSet}.iml") { xml ->
-          xml.component.find { it.'@name' == 'NewModuleRootManager' }?.'@LANGUAGE_LEVEL' = 'JDK_21_PREVIEW'
+    ext {
+      enablePreview = { moduleFile, languageLevel ->
+        modifyXml(moduleFile) { xml ->
+          xml.component.find { it.'@name' == 'NewModuleRootManager' }?.'@LANGUAGE_LEVEL' = languageLevel
         }
       }
     }
+
+    doLast {
+      enablePreview('.idea/modules/libs/native/elasticsearch.libs.native.main.iml', 'JDK_21_PREVIEW')
+      enablePreview('.idea/modules/libs/native/elasticsearch.libs.native.test.iml', 'JDK_21_PREVIEW')
+    }
   }
 
   tasks.register('buildDependencyArtifacts') {

Original file line number	Diff line number	Diff line change
`@@ -142,13 +142,18 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') {`
`142`	`142`	`description = 'Enables preview features on native library module'`
`143`	`143`	`dependsOn tasks.named("enableExternalConfiguration")`
`144`	`144`
`145`		`- doLast {`
`146`		`- ['main', 'test'].each { sourceSet ->`
`147`		`- modifyXml(".idea/modules/libs/native/elasticsearch.libs.native.${sourceSet}.iml") { xml ->`
`148`		`- xml.component.find { it.'@name' == 'NewModuleRootManager' }?.'@LANGUAGE_LEVEL' = 'JDK_21_PREVIEW'`
	`145`	`+ ext {`
	`146`	`+ enablePreview = { moduleFile, languageLevel ->`
	`147`	`+ modifyXml(moduleFile) { xml ->`
	`148`	`+ xml.component.find { it.'@name' == 'NewModuleRootManager' }?.'@LANGUAGE_LEVEL' = languageLevel`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`	`}`
	`152`	`+`
	`153`	`+ doLast {`
	`154`	`+ enablePreview('.idea/modules/libs/native/elasticsearch.libs.native.main.iml', 'JDK_21_PREVIEW')`
	`155`	`+ enablePreview('.idea/modules/libs/native/elasticsearch.libs.native.test.iml', 'JDK_21_PREVIEW')`
	`156`	`+ }`
`152`	`157`	`}`
`153`	`158`
`154`	`159`	`tasks.register('buildDependencyArtifacts') {`