Skip to content

Commit

Permalink
Use function call syntax for build.gradle dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
rhdunn committed Nov 20, 2024
1 parent 61bcca5 commit df73475
Show file tree
Hide file tree
Showing 21 changed files with 169 additions and 169 deletions.
60 changes: 30 additions & 30 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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") {
Expand Down
8 changes: 4 additions & 4 deletions src/intellij-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
}
}
2 changes: 1 addition & 1 deletion src/kotlin-intellij/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
2 changes: 1 addition & 1 deletion src/lang-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
10 changes: 5 additions & 5 deletions src/lang-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
14 changes: 7 additions & 7 deletions src/lang-xdm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
18 changes: 9 additions & 9 deletions src/lang-xpath/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
8 changes: 4 additions & 4 deletions src/lang-xpm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
10 changes: 5 additions & 5 deletions src/lang-xproc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
10 changes: 5 additions & 5 deletions src/lang-xqdoc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
28 changes: 14 additions & 14 deletions src/lang-xquery/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
16 changes: 8 additions & 8 deletions src/lang-xslt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
14 changes: 7 additions & 7 deletions src/plugin-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
18 changes: 9 additions & 9 deletions src/plugin-basex/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
18 changes: 9 additions & 9 deletions src/plugin-existdb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
10 changes: 5 additions & 5 deletions src/plugin-expath/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
10 changes: 5 additions & 5 deletions src/plugin-exquery/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
Loading

0 comments on commit df73475

Please sign in to comment.