From c79e62c6b24897ef07b77e0a0901ddf22c009962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?A=C3=A9cio=20Santos?= <aecio.solando@gmail.com>
Date: Wed, 16 Aug 2023 22:40:56 -0400
Subject: [PATCH] Use Gradle's Kotlin DSL

---
 ache-dashboard/build.gradle     | 21 ---------------------
 ache-dashboard/build.gradle.kts | 24 ++++++++++++++++++++++++
 build.gradle                    | 25 +++++++++++++++++--------
 3 files changed, 41 insertions(+), 29 deletions(-)
 delete mode 100644 ache-dashboard/build.gradle
 create mode 100644 ache-dashboard/build.gradle.kts

diff --git a/ache-dashboard/build.gradle b/ache-dashboard/build.gradle
deleted file mode 100644
index 1f4de21f5..000000000
--- a/ache-dashboard/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-plugins {
-  id "com.github.node-gradle.node" version "3.5.1"
-}
-
-node {
-  // Enable automatic download and install local copy of Node/NPM
-  download = true
-  // Version of Node.js to use.
-  version = "18.14.2"
-  // Version of npm to use.
-  npmVersion = '9.5.0'
-}
-
-task build(type: NpmTask, dependsOn: [npmInstall]) {
-  args = ['run', 'build']
-}
-
-task install(type: Copy, dependsOn: build) {
-  from "${projectDir}/build/"
-  into "${rootProject.projectDir}/ache/src/main/resources/public/"
-}
diff --git a/ache-dashboard/build.gradle.kts b/ache-dashboard/build.gradle.kts
new file mode 100644
index 000000000..39b79ffb2
--- /dev/null
+++ b/ache-dashboard/build.gradle.kts
@@ -0,0 +1,24 @@
+import com.github.gradle.node.npm.task.NpmTask
+
+plugins {
+  id("com.github.node-gradle.node") version "3.5.1"
+}
+
+node {
+  // Enable automatic download and install local copy of Node/NPM
+  download.set(true)
+  // Version of Node.js to use.
+  version.set("18.14.2")
+  // Version of npm to use.
+  npmVersion.set("9.5.0")
+}
+
+val dashboardBuildTask = tasks.register<NpmTask>("build") {
+  dependsOn(tasks.npmInstall)
+  npmCommand.set(listOf("run", "build"))
+}
+
+val dashboardInstallTask = tasks.register<Copy>("install") {
+  from("${projectDir}/build/")
+  into("${rootProject.projectDir}/ache/src/main/resources/public/")
+}
diff --git a/build.gradle b/build.gradle
index 1ba973b42..956f0604d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,23 @@
 plugins {
-    id 'java'
+    id("java")
 }
 
-subprojects {
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
 
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+tasks.named('test', Test) {
+    useJUnitPlatform()
+}
+
+subprojects {
 
     repositories {
         mavenCentral()
     }
 
-    test {
-        useJUnitPlatform()
-    }
-
     // Dependencies used by multiple sub-projects
     ext.libraries = [
         // testing
@@ -28,3 +31,9 @@ subprojects {
         logback: [group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.5'],
     ]
 }
+
+
+
+
+
+