diff --git a/src/intellij-test/build.gradle b/src/intellij-test/build.gradle
index 0b06a72d54..454b0d9252 100644
--- a/src/intellij-test/build.gradle
+++ b/src/intellij-test/build.gradle
@@ -1,5 +1,10 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.test.java.srcDirs += "test"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+}
+
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+}
 
 dependencies {
     implementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
diff --git a/src/kotlin-intellij/build.gradle b/src/kotlin-intellij/build.gradle
index 4c5edb0579..a229643ffb 100644
--- a/src/kotlin-intellij/build.gradle
+++ b/src/kotlin-intellij/build.gradle
@@ -1,9 +1,11 @@
-sourceSets.main.java.srcDirs += "main"
-
-sourceSets.test.java.srcDirs += "test"
-sourceSets.test.resources.srcDirs += "test/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+}
 
-ext.compat_version = project.property("idea_since_build")
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+    resources.srcDirs("test/resources")
+}
 
 dependencies {
     implementation(project(":src:intellij-compat"))
diff --git a/src/lang-core/build.gradle b/src/lang-core/build.gradle
index e780978f57..b118ba8a72 100644
--- a/src/lang-core/build.gradle
+++ b/src/lang-core/build.gradle
@@ -1,8 +1,12 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
-sourceSets.test.resources.srcDirs += "test/resources"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+    resources.srcDirs("test/resources")
+}
 
 dependencies {
     implementation(project(":src:kotlin-intellij"))
diff --git a/src/lang-java/build.gradle b/src/lang-java/build.gradle
index 70595f6283..8024a426f2 100644
--- a/src/lang-java/build.gradle
+++ b/src/lang-java/build.gradle
@@ -1,8 +1,12 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
-sourceSets.test.resources.srcDirs += "test/resources"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+    resources.srcDirs("test/resources")
+}
 
 dependencies {
     intellijPlatform {
diff --git a/src/lang-xdm/build.gradle b/src/lang-xdm/build.gradle
index f14e231db7..9a2ee2f816 100644
--- a/src/lang-xdm/build.gradle
+++ b/src/lang-xdm/build.gradle
@@ -1,8 +1,12 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
-sourceSets.test.resources.srcDirs += "test/resources"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+    resources.srcDirs("test/resources")
+}
 
 dependencies {
     implementation(project(":src:kotlin-intellij"))
diff --git a/src/lang-xpath/build.gradle b/src/lang-xpath/build.gradle
index 9635a9f40a..b642f2790a 100644
--- a/src/lang-xpath/build.gradle
+++ b/src/lang-xpath/build.gradle
@@ -1,8 +1,12 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
-sourceSets.test.resources.srcDirs += "test/resources"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+    resources.srcDirs("test/resources")
+}
 
 processResources {
     from ("main") {
diff --git a/src/lang-xpm/build.gradle b/src/lang-xpm/build.gradle
index 6e918d210f..b89bdf6cdc 100644
--- a/src/lang-xpm/build.gradle
+++ b/src/lang-xpm/build.gradle
@@ -1,8 +1,12 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
-sourceSets.test.resources.srcDirs += "test/resources"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+    resources.srcDirs("test/resources")
+}
 
 dependencies {
     implementation(project(":src:kotlin-intellij"))
diff --git a/src/lang-xproc/build.gradle b/src/lang-xproc/build.gradle
index e5e6f9293e..d5cf9baf1e 100644
--- a/src/lang-xproc/build.gradle
+++ b/src/lang-xproc/build.gradle
@@ -1,8 +1,12 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
-sourceSets.test.resources.srcDirs += "test/resources"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+    resources.srcDirs("test/resources")
+}
 
 dependencies {
     implementation(project(":src:intellij-compat"))
diff --git a/src/lang-xqdoc/build.gradle b/src/lang-xqdoc/build.gradle
index 24e061cf73..97e3f25ee1 100644
--- a/src/lang-xqdoc/build.gradle
+++ b/src/lang-xqdoc/build.gradle
@@ -1,7 +1,11 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+}
 
 dependencies {
     implementation(project(":src:kotlin-intellij"))
diff --git a/src/lang-xquery/build.gradle b/src/lang-xquery/build.gradle
index 84cb1140c9..c9b4b9b297 100644
--- a/src/lang-xquery/build.gradle
+++ b/src/lang-xquery/build.gradle
@@ -1,8 +1,12 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
-sourceSets.test.resources.srcDirs += "test/resources"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+    resources.srcDirs("test/resources")
+}
 
 processResources {
     from ("main") {
diff --git a/src/lang-xslt/build.gradle b/src/lang-xslt/build.gradle
index 93b20cd76a..cc0dfaf7c3 100644
--- a/src/lang-xslt/build.gradle
+++ b/src/lang-xslt/build.gradle
@@ -1,8 +1,12 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
-sourceSets.test.resources.srcDirs += "test/resources"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+    resources.srcDirs("test/resources")
+}
 
 processResources {
     from ("main") {
diff --git a/src/plugin-api/build.gradle b/src/plugin-api/build.gradle
index 68c096ca9e..4a1e3d981d 100644
--- a/src/plugin-api/build.gradle
+++ b/src/plugin-api/build.gradle
@@ -1,7 +1,11 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+}
 
 dependencies {
     implementation(project(":src:intellij-compat"))
diff --git a/src/plugin-basex/build.gradle b/src/plugin-basex/build.gradle
index 36df248d05..d58bb63847 100644
--- a/src/plugin-basex/build.gradle
+++ b/src/plugin-basex/build.gradle
@@ -1,7 +1,11 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+}
 
 dependencies {
     implementation(project(":src:kotlin-intellij"))
diff --git a/src/plugin-existdb/build.gradle b/src/plugin-existdb/build.gradle
index 6bc964e696..a65c1007f9 100644
--- a/src/plugin-existdb/build.gradle
+++ b/src/plugin-existdb/build.gradle
@@ -1,7 +1,11 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+}
 
 dependencies {
     implementation(project(":src:kotlin-intellij"))
diff --git a/src/plugin-expath/build.gradle b/src/plugin-expath/build.gradle
index 49a4addd69..c2e0fcbfe7 100644
--- a/src/plugin-expath/build.gradle
+++ b/src/plugin-expath/build.gradle
@@ -1,8 +1,12 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
-sourceSets.test.resources.srcDirs += "test/resources"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+    resources.srcDirs("test/resources")
+}
 
 dependencies {
     implementation(project(":src:kotlin-intellij"))
diff --git a/src/plugin-exquery/build.gradle b/src/plugin-exquery/build.gradle
index c3210ea553..c8f6f2b59e 100644
--- a/src/plugin-exquery/build.gradle
+++ b/src/plugin-exquery/build.gradle
@@ -1,5 +1,7 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
 dependencies {
     implementation(project(":src:intellij-compat"))
diff --git a/src/plugin-marklogic/build.gradle b/src/plugin-marklogic/build.gradle
index 7c7122e671..e9f176b9b2 100644
--- a/src/plugin-marklogic/build.gradle
+++ b/src/plugin-marklogic/build.gradle
@@ -1,8 +1,12 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
-sourceSets.test.resources.srcDirs += "test/resources"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+    resources.srcDirs("test/resources")
+}
 
 dependencies {
     intellijPlatform {
diff --git a/src/plugin-saxon/build.gradle b/src/plugin-saxon/build.gradle
index febeb460ce..bdf6524bc3 100644
--- a/src/plugin-saxon/build.gradle
+++ b/src/plugin-saxon/build.gradle
@@ -1,7 +1,11 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+}
 
 dependencies {
     implementation(project(":src:kotlin-intellij"))
diff --git a/src/plugin-w3/build.gradle b/src/plugin-w3/build.gradle
index 60339cc13e..618debadcf 100644
--- a/src/plugin-w3/build.gradle
+++ b/src/plugin-w3/build.gradle
@@ -1,8 +1,12 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
-sourceSets.test.resources.srcDirs += "test/resources"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+    resources.srcDirs("test/resources")
+}
 
 dependencies {
     implementation(project(":src:kotlin-intellij"))
diff --git a/src/plugin-xijp/build.gradle b/src/plugin-xijp/build.gradle
index 6f37df0929..3eb159a193 100644
--- a/src/plugin-xijp/build.gradle
+++ b/src/plugin-xijp/build.gradle
@@ -1,7 +1,11 @@
-sourceSets.main.java.srcDirs += "main"
-sourceSets.main.resources.srcDirs += "main/resources"
+kotlin.sourceSets.main {
+    kotlin.srcDirs("main")
+    resources.srcDirs("main/resources")
+}
 
-sourceSets.test.java.srcDirs += "test"
+kotlin.sourceSets.test {
+    kotlin.srcDirs("test")
+}
 
 dependencies {
     implementation(project(":src:lang-xpath"))