From df73475e7e6a3ab43c0cfa96676b8b1ababf9884 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Wed, 20 Nov 2024 11:39:38 +0000 Subject: [PATCH] Use function call syntax for build.gradle dependencies. --- build.gradle | 60 +++++++++++++++---------------- src/intellij-test/build.gradle | 8 ++--- src/kotlin-intellij/build.gradle | 2 +- src/lang-core/build.gradle | 2 +- src/lang-java/build.gradle | 10 +++--- src/lang-xdm/build.gradle | 14 ++++---- src/lang-xpath/build.gradle | 18 +++++----- src/lang-xpm/build.gradle | 8 ++--- src/lang-xproc/build.gradle | 10 +++--- src/lang-xqdoc/build.gradle | 10 +++--- src/lang-xquery/build.gradle | 28 +++++++-------- src/lang-xslt/build.gradle | 16 ++++----- src/plugin-api/build.gradle | 14 ++++---- src/plugin-basex/build.gradle | 18 +++++----- src/plugin-existdb/build.gradle | 18 +++++----- src/plugin-expath/build.gradle | 10 +++--- src/plugin-exquery/build.gradle | 10 +++--- src/plugin-marklogic/build.gradle | 30 ++++++++-------- src/plugin-saxon/build.gradle | 18 +++++----- src/plugin-w3/build.gradle | 20 +++++------ src/plugin-xijp/build.gradle | 14 ++++---- 21 files changed, 169 insertions(+), 169 deletions(-) diff --git a/build.gradle b/build.gradle index 4a8aa2ccb7..3f0aa3f74a 100644 --- a/build.gradle +++ b/build.gradle @@ -79,12 +79,12 @@ configure(allprojects - project(":src")) { testFramework TestFrameworkType.Platform.INSTANCE } - testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version" - testImplementation "org.hamcrest:hamcrest-core:1.3" + testImplementation("org.junit.jupiter:junit-jupiter-api:$junit5_version") + testImplementation("org.hamcrest:hamcrest-core:1.3") - testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit5_version" - testRuntimeOnly "junit:junit:4.13" + testRuntimeOnly("org.junit.platform:junit-platform-launcher:$junit_platform_version") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit5_version") + testRuntimeOnly("junit:junit:4.13") } // Subproject tasks: @@ -111,41 +111,41 @@ configure(allprojects - project(":src")) { dependencies { intellijPlatform { - bundledPlugin "org.intellij.intelliLang" - bundledPlugin "com.intellij.java" - bundledPlugin "com.intellij.properties" + bundledPlugin("org.intellij.intelliLang") + bundledPlugin("com.intellij.java") + bundledPlugin("com.intellij.properties") if (idea_since_build >= 243) { - bundledPlugin "com.intellij.modules.json" + bundledPlugin("com.intellij.modules.json") } } - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-core") - implementation project(":src:plugin-api") + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-core")) + implementation(project(":src:plugin-api")) - implementation project(":src:plugin-basex") - implementation project(":src:plugin-existdb") - implementation project(":src:plugin-marklogic") - implementation project(":src:plugin-saxon") - implementation project(":src:plugin-xijp") + implementation(project(":src:plugin-basex")) + implementation(project(":src:plugin-existdb")) + implementation(project(":src:plugin-marklogic")) + implementation(project(":src:plugin-saxon")) + implementation(project(":src:plugin-xijp")) - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) - implementation project(":src:lang-xpath") - implementation project(":src:lang-xquery") - implementation project(":src:lang-xslt") - implementation project(":src:lang-xproc") + implementation(project(":src:lang-xpath")) + implementation(project(":src:lang-xquery")) + implementation(project(":src:lang-xslt")) + implementation(project(":src:lang-xproc")) - implementation project(":src:lang-java") - implementation project(":src:lang-xqdoc") + implementation(project(":src:lang-java")) + implementation(project(":src:lang-xqdoc")) - implementation project(":src:plugin-expath") - implementation project(":src:plugin-exquery") - implementation project(":src:plugin-w3") + implementation(project(":src:plugin-expath")) + implementation(project(":src:plugin-exquery")) + implementation(project(":src:plugin-w3")) - testImplementation project(":src:intellij-test") - testImplementation "org.hamcrest:hamcrest-core:1.3" + testImplementation(project(":src:intellij-test")) + testImplementation("org.hamcrest:hamcrest-core:1.3") } if (idea_type == "IU") { diff --git a/src/intellij-test/build.gradle b/src/intellij-test/build.gradle index 1411ef58f7..0b06a72d54 100644 --- a/src/intellij-test/build.gradle +++ b/src/intellij-test/build.gradle @@ -2,16 +2,16 @@ sourceSets.main.java.srcDirs += "main" sourceSets.test.java.srcDirs += "test" dependencies { - implementation "org.junit.jupiter:junit-jupiter-api:5.7.0" + implementation("org.junit.jupiter:junit-jupiter-api:5.7.0") - implementation project(":src:intellij-compat") + implementation(project(":src:intellij-compat")) - implementation project(":src:kotlin-intellij") + implementation(project(":src:kotlin-intellij")) } // Include the testFramework dependency in the main build dependencies. configurations.getByName("intellijPlatformTestDependencies").dependencies.each { dependency -> dependencies { - implementation "${dependency.group}:${dependency.name}:${dependency.version}" + implementation("${dependency.group}:${dependency.name}:${dependency.version}") } } diff --git a/src/kotlin-intellij/build.gradle b/src/kotlin-intellij/build.gradle index 533c4196a2..4c5edb0579 100644 --- a/src/kotlin-intellij/build.gradle +++ b/src/kotlin-intellij/build.gradle @@ -6,5 +6,5 @@ sourceSets.test.resources.srcDirs += "test/resources" ext.compat_version = project.property("idea_since_build") dependencies { - implementation project(":src:intellij-compat") + implementation(project(":src:intellij-compat")) } diff --git a/src/lang-core/build.gradle b/src/lang-core/build.gradle index 911c6e8e50..e780978f57 100644 --- a/src/lang-core/build.gradle +++ b/src/lang-core/build.gradle @@ -5,5 +5,5 @@ sourceSets.test.java.srcDirs += "test" sourceSets.test.resources.srcDirs += "test/resources" dependencies { - implementation project(":src:kotlin-intellij") + implementation(project(":src:kotlin-intellij")) } diff --git a/src/lang-java/build.gradle b/src/lang-java/build.gradle index 2417cb8456..70595f6283 100644 --- a/src/lang-java/build.gradle +++ b/src/lang-java/build.gradle @@ -6,12 +6,12 @@ sourceSets.test.resources.srcDirs += "test/resources" dependencies { intellijPlatform { - bundledPlugin "com.intellij.java" + bundledPlugin("com.intellij.java") } - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-test")) } diff --git a/src/lang-xdm/build.gradle b/src/lang-xdm/build.gradle index 6e9ce09ab8..f14e231db7 100644 --- a/src/lang-xdm/build.gradle +++ b/src/lang-xdm/build.gradle @@ -5,12 +5,12 @@ sourceSets.test.java.srcDirs += "test" sourceSets.test.resources.srcDirs += "test/resources" dependencies { - implementation project(":src:kotlin-intellij") - implementation project(":src:intellij-compat") - implementation project(":src:lang-core") + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:intellij-compat")) + implementation(project(":src:lang-core")) - testImplementation project(":src:intellij-test") - testImplementation project(":src:lang-xpm") - testImplementation project(":src:lang-xpath") - testImplementation project(":src:lang-xquery") + testImplementation(project(":src:intellij-test")) + testImplementation(project(":src:lang-xpm")) + testImplementation(project(":src:lang-xpath")) + testImplementation(project(":src:lang-xquery")) } diff --git a/src/lang-xpath/build.gradle b/src/lang-xpath/build.gradle index 9a4ae5b44d..9635a9f40a 100644 --- a/src/lang-xpath/build.gradle +++ b/src/lang-xpath/build.gradle @@ -12,16 +12,16 @@ processResources { dependencies { intellijPlatform { - bundledPlugin "org.intellij.intelliLang" + bundledPlugin("org.intellij.intelliLang") } - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-core") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") - implementation project(":src:lang-xqdoc") - implementation project(":src:plugin-api") + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-core")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) + implementation(project(":src:lang-xqdoc")) + implementation(project(":src:plugin-api")) - testImplementation project(":src:intellij-compat") - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-compat")) + testImplementation(project(":src:intellij-test")) } diff --git a/src/lang-xpm/build.gradle b/src/lang-xpm/build.gradle index 84de315e69..6e918d210f 100644 --- a/src/lang-xpm/build.gradle +++ b/src/lang-xpm/build.gradle @@ -5,9 +5,9 @@ sourceSets.test.java.srcDirs += "test" sourceSets.test.resources.srcDirs += "test/resources" dependencies { - implementation project(":src:kotlin-intellij") - implementation project(":src:intellij-compat") - implementation project(":src:lang-xdm") + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:intellij-compat")) + implementation(project(":src:lang-xdm")) - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-test")) } diff --git a/src/lang-xproc/build.gradle b/src/lang-xproc/build.gradle index 1df1aeb72d..e5e6f9293e 100644 --- a/src/lang-xproc/build.gradle +++ b/src/lang-xproc/build.gradle @@ -5,10 +5,10 @@ sourceSets.test.java.srcDirs += "test" sourceSets.test.resources.srcDirs += "test/resources" dependencies { - implementation project(":src:intellij-compat") - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xslt") + implementation(project(":src:intellij-compat")) + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xslt")) - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-test")) } diff --git a/src/lang-xqdoc/build.gradle b/src/lang-xqdoc/build.gradle index bb3833feb5..24e061cf73 100644 --- a/src/lang-xqdoc/build.gradle +++ b/src/lang-xqdoc/build.gradle @@ -4,10 +4,10 @@ sourceSets.main.resources.srcDirs += "main/resources" sourceSets.test.java.srcDirs += "test" dependencies { - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-core") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-core")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-test")) } diff --git a/src/lang-xquery/build.gradle b/src/lang-xquery/build.gradle index a41e690915..84cb1140c9 100644 --- a/src/lang-xquery/build.gradle +++ b/src/lang-xquery/build.gradle @@ -11,20 +11,20 @@ processResources { } dependencies { - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-core") - implementation project(":src:lang-xpath") - implementation project(":src:lang-java") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") - implementation project(":src:lang-xqdoc") - implementation project(":src:plugin-api") + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-core")) + implementation(project(":src:lang-xpath")) + implementation(project(":src:lang-java")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) + implementation(project(":src:lang-xqdoc")) + implementation(project(":src:plugin-api")) - testImplementation project(":src:intellij-compat") - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-compat")) + testImplementation(project(":src:intellij-test")) - testImplementation project(":src:plugin-basex") - testImplementation project(":src:plugin-marklogic") - testImplementation project(":src:plugin-saxon") - testImplementation project(":src:plugin-w3") + testImplementation(project(":src:plugin-basex")) + testImplementation(project(":src:plugin-marklogic")) + testImplementation(project(":src:plugin-saxon")) + testImplementation(project(":src:plugin-w3")) } \ No newline at end of file diff --git a/src/lang-xslt/build.gradle b/src/lang-xslt/build.gradle index e2c314f19e..93b20cd76a 100644 --- a/src/lang-xslt/build.gradle +++ b/src/lang-xslt/build.gradle @@ -11,13 +11,13 @@ processResources { } dependencies { - implementation project(":src:intellij-compat") - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-core") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") - implementation project(":src:lang-xpath") - implementation project(":src:plugin-api") + implementation(project(":src:intellij-compat")) + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-core")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) + implementation(project(":src:lang-xpath")) + implementation(project(":src:plugin-api")) - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-test")) } \ No newline at end of file diff --git a/src/plugin-api/build.gradle b/src/plugin-api/build.gradle index 8ad234c62b..68c096ca9e 100644 --- a/src/plugin-api/build.gradle +++ b/src/plugin-api/build.gradle @@ -4,12 +4,12 @@ sourceSets.main.resources.srcDirs += "main/resources" sourceSets.test.java.srcDirs += "test" dependencies { - implementation project(":src:intellij-compat") - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-core") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") + implementation(project(":src:intellij-compat")) + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-core")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) - testImplementation project(":src:intellij-test") - testImplementation project(":src:lang-xpath") + testImplementation(project(":src:intellij-test")) + testImplementation(project(":src:lang-xpath")) } diff --git a/src/plugin-basex/build.gradle b/src/plugin-basex/build.gradle index 824083375b..36df248d05 100644 --- a/src/plugin-basex/build.gradle +++ b/src/plugin-basex/build.gradle @@ -4,14 +4,14 @@ sourceSets.main.resources.srcDirs += "main/resources" sourceSets.test.java.srcDirs += "test" dependencies { - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-core") - implementation project(":src:lang-xquery") - implementation project(":src:lang-xslt") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") - implementation project(":src:lang-xpath") - implementation project(":src:plugin-api") + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-core")) + implementation(project(":src:lang-xquery")) + implementation(project(":src:lang-xslt")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) + implementation(project(":src:lang-xpath")) + implementation(project(":src:plugin-api")) - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-test")) } diff --git a/src/plugin-existdb/build.gradle b/src/plugin-existdb/build.gradle index 433724cf47..6bc964e696 100644 --- a/src/plugin-existdb/build.gradle +++ b/src/plugin-existdb/build.gradle @@ -4,16 +4,16 @@ sourceSets.main.resources.srcDirs += "main/resources" sourceSets.test.java.srcDirs += "test" dependencies { - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-core") - implementation project(":src:lang-xquery") - implementation project(":src:lang-xslt") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") - implementation project(":src:plugin-api") + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-core")) + implementation(project(":src:lang-xquery")) + implementation(project(":src:lang-xslt")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) + implementation(project(":src:plugin-api")) - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-test")) // JSoup - implementation "org.jsoup:jsoup:$jsoup_version" + implementation("org.jsoup:jsoup:$jsoup_version") } diff --git a/src/plugin-expath/build.gradle b/src/plugin-expath/build.gradle index ae98c79324..49a4addd69 100644 --- a/src/plugin-expath/build.gradle +++ b/src/plugin-expath/build.gradle @@ -5,10 +5,10 @@ sourceSets.test.java.srcDirs += "test" sourceSets.test.resources.srcDirs += "test/resources" dependencies { - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") - implementation project(":src:lang-xpath") + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) + implementation(project(":src:lang-xpath")) - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-test")) } diff --git a/src/plugin-exquery/build.gradle b/src/plugin-exquery/build.gradle index 7e573539c9..c3210ea553 100644 --- a/src/plugin-exquery/build.gradle +++ b/src/plugin-exquery/build.gradle @@ -2,9 +2,9 @@ sourceSets.main.java.srcDirs += "main" sourceSets.main.resources.srcDirs += "main/resources" dependencies { - implementation project(":src:intellij-compat") - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") - implementation project(":src:lang-xquery") + implementation(project(":src:intellij-compat")) + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) + implementation(project(":src:lang-xquery")) } diff --git a/src/plugin-marklogic/build.gradle b/src/plugin-marklogic/build.gradle index 5a7a3e7272..7c7122e671 100644 --- a/src/plugin-marklogic/build.gradle +++ b/src/plugin-marklogic/build.gradle @@ -6,28 +6,28 @@ sourceSets.test.resources.srcDirs += "test/resources" dependencies { intellijPlatform { - bundledPlugin "com.intellij.properties" + bundledPlugin("com.intellij.properties") if (idea_since_build >= 243) { - bundledPlugin "com.intellij.modules.json" + bundledPlugin("com.intellij.modules.json") } } - implementation project(":src:intellij-compat") - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-core") - implementation project(":src:lang-xpath") - implementation project(":src:lang-xquery") - implementation project(":src:lang-xslt") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") - implementation project(":src:lang-xqdoc") - implementation project(":src:plugin-api") + implementation(project(":src:intellij-compat")) + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-core")) + implementation(project(":src:lang-xpath")) + implementation(project(":src:lang-xquery")) + implementation(project(":src:lang-xslt")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) + implementation(project(":src:lang-xqdoc")) + implementation(project(":src:plugin-api")) - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-test")) // Saxon HE - runtimeOnly "net.sf.saxon:Saxon-HE:$saxon_version" + runtimeOnly("net.sf.saxon:Saxon-HE:$saxon_version") // JSoup - implementation "org.jsoup:jsoup:$jsoup_version" + implementation("org.jsoup:jsoup:$jsoup_version") } diff --git a/src/plugin-saxon/build.gradle b/src/plugin-saxon/build.gradle index ada27de60e..febeb460ce 100644 --- a/src/plugin-saxon/build.gradle +++ b/src/plugin-saxon/build.gradle @@ -4,14 +4,14 @@ sourceSets.main.resources.srcDirs += "main/resources" sourceSets.test.java.srcDirs += "test" dependencies { - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-core") - implementation project(":src:lang-xpath") - implementation project(":src:lang-xquery") - implementation project(":src:lang-xslt") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") - implementation project(":src:plugin-api") + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-core")) + implementation(project(":src:lang-xpath")) + implementation(project(":src:lang-xquery")) + implementation(project(":src:lang-xslt")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) + implementation(project(":src:plugin-api")) - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-test")) } diff --git a/src/plugin-w3/build.gradle b/src/plugin-w3/build.gradle index aea2f59ac0..60339cc13e 100644 --- a/src/plugin-w3/build.gradle +++ b/src/plugin-w3/build.gradle @@ -5,17 +5,17 @@ sourceSets.test.java.srcDirs += "test" sourceSets.test.resources.srcDirs += "test/resources" dependencies { - implementation project(":src:kotlin-intellij") - implementation project(":src:lang-core") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpath") - implementation project(":src:lang-xquery") - implementation project(":src:lang-xslt") - implementation project(":src:lang-xpm") - implementation project(":src:lang-xqdoc") + implementation(project(":src:kotlin-intellij")) + implementation(project(":src:lang-core")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpath")) + implementation(project(":src:lang-xquery")) + implementation(project(":src:lang-xslt")) + implementation(project(":src:lang-xpm")) + implementation(project(":src:lang-xqdoc")) - testImplementation project(":src:intellij-test") + testImplementation(project(":src:intellij-test")) // JSoup - implementation "org.jsoup:jsoup:$jsoup_version" + implementation("org.jsoup:jsoup:$jsoup_version") } diff --git a/src/plugin-xijp/build.gradle b/src/plugin-xijp/build.gradle index be475c197e..6f37df0929 100644 --- a/src/plugin-xijp/build.gradle +++ b/src/plugin-xijp/build.gradle @@ -4,12 +4,12 @@ sourceSets.main.resources.srcDirs += "main/resources" sourceSets.test.java.srcDirs += "test" dependencies { - implementation project(":src:lang-xpath") - implementation project(":src:lang-xquery") - implementation project(":src:lang-xslt") - implementation project(":src:lang-xdm") - implementation project(":src:lang-xpm") + implementation(project(":src:lang-xpath")) + implementation(project(":src:lang-xquery")) + implementation(project(":src:lang-xslt")) + implementation(project(":src:lang-xdm")) + implementation(project(":src:lang-xpm")) - testImplementation project(":src:kotlin-intellij") - testImplementation project(":src:intellij-test") + testImplementation(project(":src:kotlin-intellij")) + testImplementation(project(":src:intellij-test")) }