aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2023-04-09 01:46:48 +0200
committerLibravatar Kristóf Marussy <kristof@marussy.com>2023-04-09 01:46:48 +0200
commitc6fbf876fb8e858a7207f8ecfd2bcf8533ea583f (patch)
treefc7a1fcea2b9b7be5020f8ec2deb46db8c279fe0
parentchore(web): fix lint errors (diff)
downloadrefinery-c6fbf876fb8e858a7207f8ecfd2bcf8533ea583f.tar.gz
refinery-c6fbf876fb8e858a7207f8ecfd2bcf8533ea583f.tar.zst
refinery-c6fbf876fb8e858a7207f8ecfd2bcf8533ea583f.zip
build: avoid repeating task names in build scripts
-rw-r--r--buildSrc/src/main/kotlin/refinery-eclipse.gradle.kts6
-rw-r--r--buildSrc/src/main/kotlin/refinery-java-conventions.gradle.kts2
-rw-r--r--buildSrc/src/main/kotlin/refinery-jmh.gradle.kts2
-rw-r--r--subprojects/frontend/build.gradle.kts2
-rw-r--r--subprojects/language-ide/build.gradle.kts2
-rw-r--r--subprojects/language-web/build.gradle.kts4
6 files changed, 9 insertions, 9 deletions
diff --git a/buildSrc/src/main/kotlin/refinery-eclipse.gradle.kts b/buildSrc/src/main/kotlin/refinery-eclipse.gradle.kts
index 5b78c2d2..85e47370 100644
--- a/buildSrc/src/main/kotlin/refinery-eclipse.gradle.kts
+++ b/buildSrc/src/main/kotlin/refinery-eclipse.gradle.kts
@@ -23,14 +23,14 @@ val eclipseResourceEncoding by tasks.registering {
23 } 23 }
24} 24}
25 25
26val eclipseTask = tasks.named("eclipse") { 26val eclipse by tasks.existing {
27 dependsOn(eclipseResourceEncoding) 27 dependsOn(eclipseResourceEncoding)
28} 28}
29 29
30the<EclipseModel>().synchronizationTasks(eclipseResourceEncoding) 30the<EclipseModel>().synchronizationTasks(eclipseResourceEncoding)
31 31
32tasks.register("clobberEclipse", Delete::class) { 32tasks.register<Delete>("clobberEclipse") {
33 mustRunAfter(eclipseTask) 33 mustRunAfter(eclipse)
34 delete(".classpath") 34 delete(".classpath")
35 delete(".project") 35 delete(".project")
36 delete(".settings") 36 delete(".settings")
diff --git a/buildSrc/src/main/kotlin/refinery-java-conventions.gradle.kts b/buildSrc/src/main/kotlin/refinery-java-conventions.gradle.kts
index 3f9b4208..a55350df 100644
--- a/buildSrc/src/main/kotlin/refinery-java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/refinery-java-conventions.gradle.kts
@@ -63,7 +63,7 @@ jacocoTestReport.configure {
63 } 63 }
64} 64}
65 65
66tasks.named<org.gradle.jvm.tasks.Jar>("jar") { 66tasks.named<Jar>("jar") {
67 manifest { 67 manifest {
68 attributes( 68 attributes(
69 "Bundle-SymbolicName" to "${project.group}.${project.name}", 69 "Bundle-SymbolicName" to "${project.group}.${project.name}",
diff --git a/buildSrc/src/main/kotlin/refinery-jmh.gradle.kts b/buildSrc/src/main/kotlin/refinery-jmh.gradle.kts
index 11888b59..6512ef23 100644
--- a/buildSrc/src/main/kotlin/refinery-jmh.gradle.kts
+++ b/buildSrc/src/main/kotlin/refinery-jmh.gradle.kts
@@ -36,7 +36,7 @@ dependencies {
36 jmhAnnotationProcessor(libs.jmh.annprocess) 36 jmhAnnotationProcessor(libs.jmh.annprocess)
37} 37}
38 38
39tasks.register("jmh", JavaExec::class) { 39tasks.register<JavaExec>("jmh") {
40 dependsOn(tasks.named("jmhClasses")) 40 dependsOn(tasks.named("jmhClasses"))
41 mainClass.set("org.openjdk.jmh.Main") 41 mainClass.set("org.openjdk.jmh.Main")
42 classpath = jmh.runtimeClasspath 42 classpath = jmh.runtimeClasspath
diff --git a/subprojects/frontend/build.gradle.kts b/subprojects/frontend/build.gradle.kts
index 8d2a8631..ab2f61c9 100644
--- a/subprojects/frontend/build.gradle.kts
+++ b/subprojects/frontend/build.gradle.kts
@@ -110,7 +110,7 @@ tasks.check {
110 dependsOn(lintFrontend) 110 dependsOn(lintFrontend)
111} 111}
112 112
113tasks.register("serveFrontend", RunYarn::class) { 113tasks.register<RunYarn>("serveFrontend") {
114 dependsOn(tasks.installFrontend) 114 dependsOn(tasks.installFrontend)
115 dependsOn(generateXStateTypes) 115 dependsOn(generateXStateTypes)
116 inputs.files(assembleFiles) 116 inputs.files(assembleFiles)
diff --git a/subprojects/language-ide/build.gradle.kts b/subprojects/language-ide/build.gradle.kts
index b2e6d4c1..28a460e8 100644
--- a/subprojects/language-ide/build.gradle.kts
+++ b/subprojects/language-ide/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
9 api(libs.xtext.xbase.ide) 9 api(libs.xtext.xbase.ide)
10} 10}
11 11
12val generateXtextLanguage = project(":refinery-language").tasks.named("generateXtextLanguage") 12val generateXtextLanguage by project(":refinery-language").tasks.existing
13 13
14for (taskName in listOf("compileJava", "processResources")) { 14for (taskName in listOf("compileJava", "processResources")) {
15 tasks.named(taskName) { 15 tasks.named(taskName) {
diff --git a/subprojects/language-web/build.gradle.kts b/subprojects/language-web/build.gradle.kts
index b78a0d66..b59763a8 100644
--- a/subprojects/language-web/build.gradle.kts
+++ b/subprojects/language-web/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
21 testImplementation(libs.jetty.websocket.client) 21 testImplementation(libs.jetty.websocket.client)
22} 22}
23 23
24val generateXtextLanguage = project(":refinery-language").tasks.named("generateXtextLanguage") 24val generateXtextLanguage by project(":refinery-language").tasks.existing
25 25
26for (taskName in listOf("compileJava", "processResources")) { 26for (taskName in listOf("compileJava", "processResources")) {
27 tasks.named(taskName) { 27 tasks.named(taskName) {
@@ -69,7 +69,7 @@ tasks.shadowJar {
69 } 69 }
70} 70}
71 71
72tasks.register("serveBackend", JavaExec::class) { 72tasks.register<JavaExec>("serveBackend") {
73 dependsOn(webapp) 73 dependsOn(webapp)
74 val mainRuntimeClasspath = sourceSets.main.map { it.runtimeClasspath } 74 val mainRuntimeClasspath = sourceSets.main.map { it.runtimeClasspath }
75 dependsOn(mainRuntimeClasspath) 75 dependsOn(mainRuntimeClasspath)