Skip to content

Commit 1acdc0c

Browse files
committed
Convert the subproject build.gradle files to kotlin.
1 parent 418c7e7 commit 1acdc0c

File tree

23 files changed

+151
-76
lines changed

23 files changed

+151
-76
lines changed

buildSrc/src/main/kotlin/Version.kt

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
import io.github.rhdunn.intellij.IntelliJVersion
44
import org.gradle.api.GradleException
55

6+
@Suppress("ConstPropertyName")
67
object Version {
7-
/**
8+
/**
89
* The version of the Kotlin compiler and runtime.
910
*
1011
* `SPDX-License-Identifier: Apache-2.0`
@@ -27,4 +28,37 @@ object Version {
2728
intellij.buildVersion >= 223 -> 17
2829
else -> throw GradleException("Unsupported version of IntelliJ: $intellij")
2930
}
31+
32+
/**
33+
* Versions of the various libraries used by the project.
34+
*/
35+
object Dependency {
36+
/**
37+
* The version of the `junit` test library.
38+
*
39+
* `SPDX-License-Identifier: EPL-2.0`
40+
*/
41+
const val JUnit5 = "5.9.1"
42+
43+
/**
44+
* The version of the `junit` test library.
45+
*
46+
* `SPDX-License-Identifier: EPL-2.0`
47+
*/
48+
const val JUnitPlatform = "1.9.1"
49+
50+
/**
51+
* The version of the `jsoup` package.
52+
*
53+
* `SPDX-License-Identifier: MIT`
54+
*/
55+
const val JSoup = "1.15.4"
56+
57+
/**
58+
* The version of the `saxon` XQuery and XSLT HE processor.
59+
*
60+
* `SPDX-License-Identifier: MPL-2.0`
61+
*/
62+
const val Saxon = "9.9.1-7"
63+
}
3064
}

src/intellij-compat/build.gradle

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/intellij-compat/build.gradle.kts

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
3+
val platformVersion = BuildConfiguration.getPlatformVersion(project)
4+
val platformType = BuildConfiguration.getPlatformType(project)
5+
6+
version = platformVersion.buildVersion
7+
8+
// IntelliJ 2022.3 to IntelliJ 2024.3 compatibility APIs
9+
kotlin.sourceSets.main {
10+
val srcDirs = mutableListOf<String>()
11+
12+
// IntelliJ 2023.1
13+
srcDirs += when {
14+
platformVersion.buildVersion >= 231 -> "src/231/native"
15+
else -> "src/231/compat"
16+
}
17+
18+
// IntelliJ 2023.2
19+
srcDirs += when {
20+
platformVersion.buildVersion >= 232 -> "src/232/native"
21+
else -> "src/232/compat"
22+
}
23+
24+
// IntelliJ 2023.3
25+
srcDirs += when {
26+
platformVersion.buildVersion >= 233 -> "src/233/native"
27+
else -> "src/233/compat"
28+
}
29+
30+
// IntelliJ 2024.2
31+
srcDirs += when {
32+
platformVersion.buildVersion >= 242 -> "src/242/native"
33+
else -> "src/242/compat"
34+
}
35+
srcDirs += when {
36+
platformVersion.buildVersion >= 242 -> "src/233-242/native"
37+
platformVersion.buildVersion >= 233 -> "src/233-242/233"
38+
else -> "src/233-242/232"
39+
}
40+
41+
// IntelliJ 2024.3
42+
srcDirs += when {
43+
platformVersion.buildVersion >= 243 -> "src/243/native"
44+
else -> "src/243/compat"
45+
}
46+
47+
// Microservices
48+
srcDirs += when (platformType) {
49+
"IU" -> when {
50+
platformVersion.buildVersion >= 231 -> "src/microservices/IU-231"
51+
else -> "src/microservices/IU-203"
52+
}
53+
else -> "src/microservices/IC-203"
54+
}
55+
56+
kotlin.srcDirs(srcDirs)
57+
}

src/intellij-test/build.gradle renamed to src/intellij-test/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
}
@@ -15,7 +17,7 @@ dependencies {
1517
}
1618

1719
// Include the testFramework dependency in the main build dependencies.
18-
configurations.getByName("intellijPlatformTestDependencies").dependencies.each { dependency ->
20+
configurations.getByName("intellijPlatformTestDependencies").dependencies.forEach { dependency ->
1921
dependencies {
2022
implementation("${dependency.group}:${dependency.name}:${dependency.version}")
2123
}

src/kotlin-intellij/build.gradle renamed to src/kotlin-intellij/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
}

src/lang-core/build.gradle renamed to src/lang-core/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")

src/lang-java/build.gradle renamed to src/lang-java/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")

src/lang-xdm/build.gradle renamed to src/lang-xdm/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")

src/lang-xpath/build.gradle renamed to src/lang-xpath/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")
@@ -8,9 +10,9 @@ kotlin.sourceSets.test {
810
resources.srcDirs("test/resources")
911
}
1012

11-
processResources {
12-
from ("main") {
13-
include "**/*.dic"
13+
tasks.processResources {
14+
from("main") {
15+
include("**/*.dic")
1416
}
1517
}
1618

src/lang-xpm/build.gradle renamed to src/lang-xpm/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")

src/lang-xproc/build.gradle renamed to src/lang-xproc/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")

src/lang-xqdoc/build.gradle renamed to src/lang-xqdoc/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")

src/lang-xquery/build.gradle renamed to src/lang-xquery/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")
@@ -8,9 +10,9 @@ kotlin.sourceSets.test {
810
resources.srcDirs("test/resources")
911
}
1012

11-
processResources {
12-
from ("main") {
13-
include "**/*.dic"
13+
tasks.processResources {
14+
from("main") {
15+
include("**/*.dic")
1416
}
1517
}
1618

src/lang-xslt/build.gradle renamed to src/lang-xslt/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")
@@ -8,9 +10,9 @@ kotlin.sourceSets.test {
810
resources.srcDirs("test/resources")
911
}
1012

11-
processResources {
12-
from ("main") {
13-
include "**/*.dic"
13+
tasks.processResources {
14+
from("main") {
15+
include("**/*.dic")
1416
}
1517
}
1618

src/plugin-api/build.gradle renamed to src/plugin-api/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")

src/plugin-saxon/build.gradle renamed to src/plugin-basex/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")
@@ -10,11 +12,11 @@ kotlin.sourceSets.test {
1012
dependencies {
1113
implementation(project(":src:kotlin-intellij"))
1214
implementation(project(":src:lang-core"))
13-
implementation(project(":src:lang-xpath"))
1415
implementation(project(":src:lang-xquery"))
1516
implementation(project(":src:lang-xslt"))
1617
implementation(project(":src:lang-xdm"))
1718
implementation(project(":src:lang-xpm"))
19+
implementation(project(":src:lang-xpath"))
1820
implementation(project(":src:plugin-api"))
1921

2022
testImplementation(project(":src:intellij-test"))

src/plugin-existdb/build.gradle renamed to src/plugin-existdb/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")
@@ -18,6 +20,5 @@ dependencies {
1820

1921
testImplementation(project(":src:intellij-test"))
2022

21-
// JSoup
22-
implementation("org.jsoup:jsoup:$jsoup_version")
23+
implementation("org.jsoup:jsoup:${Version.Dependency.JSoup}")
2324
}

src/plugin-expath/build.gradle renamed to src/plugin-expath/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")

src/plugin-exquery/build.gradle renamed to src/plugin-exquery/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")

src/plugin-marklogic/build.gradle renamed to src/plugin-marklogic/build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
3+
val platformVersion = BuildConfiguration.getPlatformVersion(project)
4+
15
kotlin.sourceSets.main {
26
kotlin.srcDirs("main")
37
resources.srcDirs("main/resources")
@@ -11,7 +15,7 @@ kotlin.sourceSets.test {
1115
dependencies {
1216
intellijPlatform {
1317
bundledPlugin("com.intellij.properties")
14-
if (idea_since_build >= 243) {
18+
if (platformVersion.buildVersion >= 243) {
1519
bundledPlugin("com.intellij.modules.json")
1620
}
1721
}
@@ -29,9 +33,7 @@ dependencies {
2933

3034
testImplementation(project(":src:intellij-test"))
3135

32-
// Saxon HE
33-
runtimeOnly("net.sf.saxon:Saxon-HE:$saxon_version")
36+
runtimeOnly("net.sf.saxon:Saxon-HE:${Version.Dependency.Saxon}")
3437

35-
// JSoup
36-
implementation("org.jsoup:jsoup:$jsoup_version")
38+
implementation("org.jsoup:jsoup:${Version.Dependency.JSoup}")
3739
}

src/plugin-basex/build.gradle renamed to src/plugin-saxon/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")
@@ -10,11 +12,11 @@ kotlin.sourceSets.test {
1012
dependencies {
1113
implementation(project(":src:kotlin-intellij"))
1214
implementation(project(":src:lang-core"))
15+
implementation(project(":src:lang-xpath"))
1316
implementation(project(":src:lang-xquery"))
1417
implementation(project(":src:lang-xslt"))
1518
implementation(project(":src:lang-xdm"))
1619
implementation(project(":src:lang-xpm"))
17-
implementation(project(":src:lang-xpath"))
1820
implementation(project(":src:plugin-api"))
1921

2022
testImplementation(project(":src:intellij-test"))

src/plugin-w3/build.gradle renamed to src/plugin-w3/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")
@@ -20,6 +22,5 @@ dependencies {
2022

2123
testImplementation(project(":src:intellij-test"))
2224

23-
// JSoup
24-
implementation("org.jsoup:jsoup:$jsoup_version")
25+
implementation("org.jsoup:jsoup:${Version.Dependency.JSoup}")
2526
}

src/plugin-xijp/build.gradle renamed to src/plugin-xijp/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2024 Reece H. Dunn. SPDX-License-Identifier: Apache-2.0
2+
13
kotlin.sourceSets.main {
24
kotlin.srcDirs("main")
35
resources.srcDirs("main/resources")

0 commit comments

Comments
 (0)