Convert all samples to Groovy DSL

jjohannes · Aug 31, 2023 · 25f44ed · 25f44ed
1 parent afd04d5
commit 25f44ed
Show file tree

Hide file tree

Showing 402 changed files with 737 additions and 735 deletions.
diff --git a/...tings_File/my-project/settings.gradle.kts → ..._Settings_File/my-project/settings.gradle b/...tings_File/my-project/settings.gradle.kts → ..._Settings_File/my-project/settings.gradle
diff --git a/...ild_Files/my-project/app/build.gradle.kts → ...e_Build_Files/my-project/app/build.gradle b/...ild_Files/my-project/app/build.gradle.kts → ...e_Build_Files/my-project/app/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
 }
 
 dependencies {

diff --git a/...y-project/business-logic/build.gradle.kts → ...es/my-project/business-logic/build.gradle b/...y-project/business-logic/build.gradle.kts → ...es/my-project/business-logic/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
 }
 
 dependencies {

diff --git a/02_The_Build_Files/my-project/data-model/build.gradle b/02_The_Build_Files/my-project/data-model/build.gradle
@@ -0,0 +1,7 @@
+plugins {
+    id("java-library")
+}
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
+}
diff --git a/02_The_Build_Files/my-project/data-model/build.gradle.kts b/02_The_Build_Files/my-project/data-model/build.gradle.kts
diff --git a/...uild_Files/my-project/settings.gradle.kts → ...he_Build_Files/my-project/settings.gradle b/...uild_Files/my-project/settings.gradle.kts → ...he_Build_Files/my-project/settings.gradle
diff --git a/...ild-logic/kotlin-plugins/build.gradle.kts → .../my-build-logic/java-plugins/build.gradle b/...ild-logic/kotlin-plugins/build.gradle.kts → .../my-build-logic/java-plugins/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    `kotlin-dsl`
+    id("groovy-gradle-plugin")
 }
 
 dependencies {

diff --git a/03_Plugins/my-build-logic/java-plugins/src/main/groovy/my-java-application.gradle b/03_Plugins/my-build-logic/java-plugins/src/main/groovy/my-java-application.gradle
@@ -0,0 +1,11 @@
+plugins {
+    id("application")
+}
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
+}
+
+tasks.named("test") {
+    useJUnitPlatform()
+}
diff --git a/...rc/main/kotlin/my-java-library.gradle.kts → ...ns/src/main/groovy/my-java-library.gradle b/...rc/main/kotlin/my-java-library.gradle.kts → ...ns/src/main/groovy/my-java-library.gradle
@@ -4,10 +4,10 @@ plugins {
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
 }
 
-tasks.test {
+tasks.named("test") {
     useJUnitPlatform()
 }
 

diff --git a/03_Plugins/my-build-logic/java-plugins/src/main/kotlin/my-java-application.gradle.kts b/03_Plugins/my-build-logic/java-plugins/src/main/kotlin/my-java-application.gradle.kts
diff --git a/...lugins/my-build-logic/settings.gradle.kts → 03_Plugins/my-build-logic/settings.gradle b/...lugins/my-build-logic/settings.gradle.kts → 03_Plugins/my-build-logic/settings.gradle
diff --git a/03_Plugins/my-project/app/build.gradle.kts → 03_Plugins/my-project/app/build.gradle b/03_Plugins/my-project/app/build.gradle.kts → 03_Plugins/my-project/app/build.gradle
diff --git a/...y-project/business-logic/build.gradle.kts → ...ns/my-project/business-logic/build.gradle b/...y-project/business-logic/build.gradle.kts → ...ns/my-project/business-logic/build.gradle
diff --git a/...ns/my-project/data-model/build.gradle.kts → ...lugins/my-project/data-model/build.gradle b/...ns/my-project/data-model/build.gradle.kts → ...lugins/my-project/data-model/build.gradle
diff --git a/03_Plugins/my-project/settings.gradle.kts → 03_Plugins/my-project/settings.gradle b/03_Plugins/my-project/settings.gradle.kts → 03_Plugins/my-project/settings.gradle
diff --git a/04_Tasks/my-build-logic/java-plugins/build.gradle b/04_Tasks/my-build-logic/java-plugins/build.gradle
@@ -0,0 +1,3 @@
+plugins {
+    id("groovy-gradle-plugin")
+}
diff --git a/04_Tasks/my-build-logic/java-plugins/build.gradle.kts b/04_Tasks/my-build-logic/java-plugins/build.gradle.kts
diff --git a/04_Tasks/my-build-logic/java-plugins/src/main/groovy/my-java-application.gradle b/04_Tasks/my-build-logic/java-plugins/src/main/groovy/my-java-application.gradle
@@ -0,0 +1,7 @@
+plugins {
+    id("application")
+}
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
+}
diff --git a/04_Tasks/my-build-logic/java-plugins/src/main/groovy/my-java-library.gradle b/04_Tasks/my-build-logic/java-plugins/src/main/groovy/my-java-library.gradle
@@ -0,0 +1,7 @@
+plugins {
+    id("java-library")
+}
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
+}
diff --git a/04_Tasks/my-build-logic/java-plugins/src/main/kotlin/my-java-application.gradle.kts b/04_Tasks/my-build-logic/java-plugins/src/main/kotlin/my-java-application.gradle.kts
diff --git a/04_Tasks/my-build-logic/java-plugins/src/main/kotlin/my-java-library.gradle.kts b/04_Tasks/my-build-logic/java-plugins/src/main/kotlin/my-java-library.gradle.kts
diff --git a/04_Tasks/my-build-logic/settings.gradle.kts → 04_Tasks/my-build-logic/settings.gradle b/04_Tasks/my-build-logic/settings.gradle.kts → 04_Tasks/my-build-logic/settings.gradle
diff --git a/04_Tasks/my-project/app/build.gradle.kts → 04_Tasks/my-project/app/build.gradle b/04_Tasks/my-project/app/build.gradle.kts → 04_Tasks/my-project/app/build.gradle
diff --git a/...y-project/business-logic/build.gradle.kts → ...ks/my-project/business-logic/build.gradle b/...y-project/business-logic/build.gradle.kts → ...ks/my-project/business-logic/build.gradle
diff --git a/...ks/my-project/data-model/build.gradle.kts → 04_Tasks/my-project/data-model/build.gradle b/...ks/my-project/data-model/build.gradle.kts → 04_Tasks/my-project/data-model/build.gradle
diff --git a/04_Tasks/my-project/settings.gradle.kts → 04_Tasks/my-project/settings.gradle b/04_Tasks/my-project/settings.gradle.kts → 04_Tasks/my-project/settings.gradle
diff --git a/05_Lifecycle_Tasks/my-build-logic/build.gradle b/05_Lifecycle_Tasks/my-build-logic/build.gradle
@@ -0,0 +1,3 @@
+tasks.register("checkAll") {
+    dependsOn(subprojects.collect { ":${it.name}:check" })
+}
diff --git a/05_Lifecycle_Tasks/my-build-logic/build.gradle.kts b/05_Lifecycle_Tasks/my-build-logic/build.gradle.kts
diff --git a/05_Lifecycle_Tasks/my-build-logic/java-plugins/build.gradle b/05_Lifecycle_Tasks/my-build-logic/java-plugins/build.gradle
@@ -0,0 +1,3 @@
+plugins {
+    id("groovy-gradle-plugin")
+}
diff --git a/05_Lifecycle_Tasks/my-build-logic/java-plugins/build.gradle.kts b/05_Lifecycle_Tasks/my-build-logic/java-plugins/build.gradle.kts
diff --git a/...ain/kotlin/my-java-application.gradle.kts → ...rc/main/groovy/my-java-application.gradle b/...ain/kotlin/my-java-application.gradle.kts → ...rc/main/groovy/my-java-application.gradle
@@ -3,7 +3,7 @@ plugins {
     id("application")
 }
 
-val myBuildGroup = "my project build"
+def myBuildGroup = "my project build"
 
 tasks.named("run") {
     group = myBuildGroup

diff --git a/...s/src/main/kotlin/my-java-base.gradle.kts → ...ugins/src/main/groovy/my-java-base.gradle b/...s/src/main/kotlin/my-java-base.gradle.kts → ...ugins/src/main/groovy/my-java-base.gradle
@@ -3,21 +3,21 @@ plugins {
     id("checkstyle")
 }
 
-val myBuildGroup = "my project build"
-tasks.named<TaskReportTask>("tasks") {
+def myBuildGroup = "my project build"
+tasks.named("tasks") {
     displayGroup = myBuildGroup
 }
 
-tasks.register<TaskReportTask>("tasksAll") {
+tasks.register("tasksAll", TaskReportTask) {
     group = myBuildGroup
     description = "Show additional tasks."
     setShowDetail(true)
 }
 
-tasks.build {
+tasks.named("build") {
     group = myBuildGroup
 }
-tasks.check {
+tasks.named("check") {
     group = myBuildGroup
     description = "Runs checks (including tests)."
 }
@@ -49,10 +49,10 @@ tasks.register("lifecycleTasks") {
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
 }
 
-tasks.test {
+tasks.named("test") {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
 }

diff --git a/...rc/main/kotlin/my-java-library.gradle.kts → ...ns/src/main/groovy/my-java-library.gradle b/...rc/main/kotlin/my-java-library.gradle.kts → ...ns/src/main/groovy/my-java-library.gradle
diff --git a/..._Tasks/my-build-logic/settings.gradle.kts → ...ycle_Tasks/my-build-logic/settings.gradle b/..._Tasks/my-build-logic/settings.gradle.kts → ...ycle_Tasks/my-build-logic/settings.gradle
diff --git a/05_Lifecycle_Tasks/my-other-project/build.gradle b/05_Lifecycle_Tasks/my-other-project/build.gradle
@@ -0,0 +1,3 @@
+tasks.register("checkAll") {
+    dependsOn(subprojects.collect { ":${it.name}:check" })
+}
diff --git a/05_Lifecycle_Tasks/my-other-project/build.gradle.kts b/05_Lifecycle_Tasks/my-other-project/build.gradle.kts
diff --git a/...asks/my-other-project/settings.gradle.kts → ...le_Tasks/my-other-project/settings.gradle b/...asks/my-other-project/settings.gradle.kts → ...le_Tasks/my-other-project/settings.gradle
diff --git a/...cle_Tasks/my-project/app/build.gradle.kts → ...fecycle_Tasks/my-project/app/build.gradle b/...cle_Tasks/my-project/app/build.gradle.kts → ...fecycle_Tasks/my-project/app/build.gradle
diff --git a/05_Lifecycle_Tasks/my-project/build.gradle b/05_Lifecycle_Tasks/my-project/build.gradle
@@ -0,0 +1,17 @@
+def globalBuildGroup = "My global build"
+def ciBuildGroup = "My CI build"
+
+tasks.named("tasks") {
+    displayGroup = globalBuildGroup
+}
+
+tasks.register("qualityCheckAll") {
+    group = globalBuildGroup
+    dependsOn(subprojects.collect { ":${it.name}:qualityCheck" })
+}
+
+tasks.register("checkAll") {
+    group = ciBuildGroup
+    dependsOn(subprojects.collect { ":${it.name}:check" })
+    dependsOn(gradle.includedBuilds.collect { it.task(":checkAll") })
+}
diff --git a/05_Lifecycle_Tasks/my-project/build.gradle.kts b/05_Lifecycle_Tasks/my-project/build.gradle.kts
diff --git a/...y-project/business-logic/build.gradle.kts → ...ks/my-project/business-logic/build.gradle b/...y-project/business-logic/build.gradle.kts → ...ks/my-project/business-logic/build.gradle
diff --git a/...ks/my-project/data-model/build.gradle.kts → ..._Tasks/my-project/data-model/build.gradle b/...ks/my-project/data-model/build.gradle.kts → ..._Tasks/my-project/data-model/build.gradle
diff --git a/...ycle_Tasks/my-project/settings.gradle.kts → ...ifecycle_Tasks/my-project/settings.gradle b/...ycle_Tasks/my-project/settings.gradle.kts → ...ifecycle_Tasks/my-project/settings.gradle
diff --git a/06_Configuring_Task_Inputs_And_Outputs/my-build-logic/java-plugins/build.gradle b/06_Configuring_Task_Inputs_And_Outputs/my-build-logic/java-plugins/build.gradle
@@ -0,0 +1,3 @@
+plugins {
+    id("groovy-gradle-plugin")
+}
diff --git a/06_Configuring_Task_Inputs_And_Outputs/my-build-logic/java-plugins/build.gradle.kts b/06_Configuring_Task_Inputs_And_Outputs/my-build-logic/java-plugins/build.gradle.kts
diff --git a/...ain/kotlin/my-java-application.gradle.kts → ...rc/main/groovy/my-java-application.gradle b/...ain/kotlin/my-java-application.gradle.kts → ...rc/main/groovy/my-java-application.gradle
@@ -2,9 +2,9 @@ plugins {
     id("my-java-base")
 }
 
-val packageApp = tasks.register<Zip>("packageApp") {
+def packageApp = tasks.register("packageApp", Zip) {
     from(layout.projectDirectory.file("run.sh"))
-    from(tasks.jar) {
+    from(tasks.named("jar")) {
         into("libs")
     }
     from(configurations.runtimeClasspath) {
@@ -15,7 +15,7 @@ val packageApp = tasks.register<Zip>("packageApp") {
     archiveFileName.set("myApplication.zip")
 }
 
-tasks.build {
+tasks.named("build") {
     dependsOn(packageApp)
 }
 
diff --git a/...g_Task_Inputs_And_Outputs/my-build-logic/java-plugins/src/main/groovy/my-java-base.gradle b/...g_Task_Inputs_And_Outputs/my-build-logic/java-plugins/src/main/groovy/my-java-base.gradle
@@ -0,0 +1,7 @@
+plugins {
+    id("java")
+}
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
+}
diff --git a/...rc/main/kotlin/my-java-library.gradle.kts → ...ns/src/main/groovy/my-java-library.gradle b/...rc/main/kotlin/my-java-library.gradle.kts → ...ns/src/main/groovy/my-java-library.gradle
diff --git a/...sk_Inputs_And_Outputs/my-build-logic/java-plugins/src/main/kotlin/my-java-base.gradle.kts b/...sk_Inputs_And_Outputs/my-build-logic/java-plugins/src/main/kotlin/my-java-base.gradle.kts
diff --git a/...utputs/my-build-logic/settings.gradle.kts → ...nd_Outputs/my-build-logic/settings.gradle b/...utputs/my-build-logic/settings.gradle.kts → ...nd_Outputs/my-build-logic/settings.gradle
diff --git a/...d_Outputs/my-project/app/build.gradle.kts → ...s_And_Outputs/my-project/app/build.gradle b/...d_Outputs/my-project/app/build.gradle.kts → ...s_And_Outputs/my-project/app/build.gradle
diff --git a/...y-project/business-logic/build.gradle.kts → ...ts/my-project/business-logic/build.gradle b/...y-project/business-logic/build.gradle.kts → ...ts/my-project/business-logic/build.gradle
diff --git a/...ts/my-project/data-model/build.gradle.kts → ...utputs/my-project/data-model/build.gradle b/...ts/my-project/data-model/build.gradle.kts → ...utputs/my-project/data-model/build.gradle
diff --git a/...nd_Outputs/my-project/settings.gradle.kts → ...ts_And_Outputs/my-project/settings.gradle b/...nd_Outputs/my-project/settings.gradle.kts → ...ts_And_Outputs/my-project/settings.gradle
diff --git a/07_Implementing_Tasks_and_Extensions/my-build-logic/java-plugins/build.gradle b/07_Implementing_Tasks_and_Extensions/my-build-logic/java-plugins/build.gradle
@@ -0,0 +1,3 @@
+plugins {
+    id("groovy-gradle-plugin")
+}
diff --git a/07_Implementing_Tasks_and_Extensions/my-build-logic/java-plugins/build.gradle.kts b/07_Implementing_Tasks_and_Extensions/my-build-logic/java-plugins/build.gradle.kts
diff --git a/...ain/kotlin/my-java-application.gradle.kts → ...rc/main/groovy/my-java-application.gradle b/...ain/kotlin/my-java-application.gradle.kts → ...rc/main/groovy/my-java-application.gradle
@@ -5,14 +5,14 @@ plugins {
     id("my-java-base")
 }
 
-val myApp = extensions.create<MyAppExtension>("myApp")
+def myApp = extensions.create("myApp", MyAppExtension)
 
-val generateStartScript = tasks.register<GenerateStartScript>("generateStartScript") {
+def generateStartScript = tasks.register("generateStartScript", GenerateStartScript) {
     mainClass.convention(myApp.mainClass)
     scriptFile.set(layout.buildDirectory.file("run.sh"))
 }
 
-val packageApp = tasks.register<Zip>("packageApp") {
+def packageApp = tasks.register("packageApp", Zip) {
     from(generateStartScript)
     from(tasks.jar) {
         into("libs")
@@ -25,7 +25,7 @@ val packageApp = tasks.register<Zip>("packageApp") {
     archiveFileName.set("myApplication.zip")
 }
 
-tasks.build {
+tasks.named("build") {
     dependsOn(packageApp)
 }
 
diff --git a/...ting_Tasks_and_Extensions/my-build-logic/java-plugins/src/main/groovy/my-java-base.gradle b/...ting_Tasks_and_Extensions/my-build-logic/java-plugins/src/main/groovy/my-java-base.gradle
@@ -0,0 +1,7 @@
+plugins {
+    id("java")
+}
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
+}
diff --git a/...rc/main/kotlin/my-java-library.gradle.kts → ...ns/src/main/groovy/my-java-library.gradle b/...rc/main/kotlin/my-java-library.gradle.kts → ...ns/src/main/groovy/my-java-library.gradle
diff --git a/...ns/my-build-logic/java-plugins/src/main/groovy/myproject/tasks/GenerateStartScript.groovy b/...ns/my-build-logic/java-plugins/src/main/groovy/myproject/tasks/GenerateStartScript.groovy
@@ -0,0 +1,36 @@
+package myproject.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+import java.nio.file.Files
+import static java.nio.file.attribute.PosixFilePermission.*
+
+@CacheableTask
+abstract class GenerateStartScript extends DefaultTask {
+
+    @Input
+    abstract Property<String> getMainClass()
+
+    @OutputFile
+    abstract RegularFileProperty getScriptFile()
+
+    @TaskAction
+    def generate() {
+        def main = mainClass.get() // String
+        def out = scriptFile.get().asFile // java.io.File
+        def script = "java -cp 'libs/*' $main"
+
+        out.text = script
+        Files.setPosixFilePermissions(out.toPath(), [
+            OWNER_READ, OWNER_WRITE, OWNER_EXECUTE,
+            GROUP_READ, GROUP_EXECUTE,
+            OTHERS_EXECUTE, OTHERS_READ
+        ] as Set)
+    }
+}
diff --git a/.../kotlin/myproject/tasks/MyAppExtension.kt → ...ovy/myproject/tasks/MyAppExtension.groovy b/.../kotlin/myproject/tasks/MyAppExtension.kt → ...ovy/myproject/tasks/MyAppExtension.groovy
@@ -3,5 +3,5 @@ package myproject.tasks
 import org.gradle.api.provider.Property
 
 interface MyAppExtension {
-    val mainClass: Property<String>
+    Property<String> getMainClass()
 }
diff --git a/..._Tasks_and_Extensions/my-build-logic/java-plugins/src/main/kotlin/my-java-base.gradle.kts b/..._Tasks_and_Extensions/my-build-logic/java-plugins/src/main/kotlin/my-java-base.gradle.kts