chore(deps): upgrade to frontend-jdk17 8.0.0

6 files changed, 11 insertions, 36 deletions

diff --git a/.gitignore b/.gitignore
index 3117507a..fcb4a271 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *._trace
 .classpath
 .idea/
+.frontend-gradle-plugin/
 .gradle/
 .launch
 .log/
diff --git a/buildSrc/src/main/kotlin/tools/refinery/gradle/frontend-workspace.gradle.kts b/buildSrc/src/main/kotlin/tools/refinery/gradle/frontend-workspace.gradle.kts
index f1f6d952..e2bd9aec 100644
--- a/buildSrc/src/main/kotlin/tools/refinery/gradle/frontend-workspace.gradle.kts
+++ b/buildSrc/src/main/kotlin/tools/refinery/gradle/frontend-workspace.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
@@ -16,13 +16,13 @@ tasks {
                 enabled = false
         }
 
-        installYarnGlobally {
-                dependsOn(rootProject.tasks.named("installYarnGlobally"))
+        resolvePackageManager {
+                dependsOn(rootProject.tasks.named("resolvePackageManager"))
                 enabled = false
         }
 
-        installYarn {
-                dependsOn(rootProject.tasks.named("installYarn"))
+        installPackageManager {
+                dependsOn(rootProject.tasks.named("installPackageManager"))
                 enabled = false
         }
 
diff --git a/buildSrc/src/main/kotlin/tools/refinery/gradle/frontend-worktree.gradle.kts b/buildSrc/src/main/kotlin/tools/refinery/gradle/frontend-worktree.gradle.kts
index 609e6f24..30cfb26f 100644
--- a/buildSrc/src/main/kotlin/tools/refinery/gradle/frontend-worktree.gradle.kts
+++ b/buildSrc/src/main/kotlin/tools/refinery/gradle/frontend-worktree.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
@@ -14,11 +14,7 @@ plugins {
         id("tools.refinery.gradle.internal.frontend-conventions")
 }
 
-val yarn1Version = providers.gradleProperty("frontend.yarn1Version")
-
 frontend {
-        yarnGlobalInstallScript.set(yarn1Version.map { version -> "install -g yarn@$version" })
-        yarnInstallScript.set(frontend.yarnVersion.map { version -> "set version $version --only-if-needed" })
         installScript.set(provider {
                 if (project.hasProperty("ci")) "install --immutable --inline-builds" else "install"
         })
@@ -61,20 +57,6 @@ tasks {
                 }
         }
 
-        installYarnGlobally {
-                onlyIf {
-                        getFrontendProperty("installedYarn1Version") != yarn1Version.get()
-                }
-                doLast {
-                        putFrontedProperty("installedYarn1Version", yarn1Version.get())
-                }
-                outputs.dir(frontend.nodeInstallDirectory.map { dir -> "$dir/lib/node_modules/yarn" })
-        }
-
-        installYarn {
-                outputs.file(frontend.yarnVersion.map { version -> ".yarn/releases/yarn-$version.cjs" })
-        }
-
         installFrontend {
                 inputs.files("package.json", "yarn.lock")
                 outputs.files(".pnp.cjs", ".pnp.loader.mjs")
diff --git a/buildSrc/src/main/kotlin/tools/refinery/gradle/internal/frontend-conventions.gradle.kts b/buildSrc/src/main/kotlin/tools/refinery/gradle/internal/frontend-conventions.gradle.kts
index bd5d0197..65481bd1 100644
--- a/buildSrc/src/main/kotlin/tools/refinery/gradle/internal/frontend-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/tools/refinery/gradle/internal/frontend-conventions.gradle.kts
@@ -1,22 +1,15 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
 package tools.refinery.gradle.internal
 
 plugins {
-        id("org.siouan.frontend-jdk11")
+        id("org.siouan.frontend-jdk17")
 }
 
 frontend {
         nodeVersion.set(providers.gradleProperty("frontend.nodeVersion"))
         nodeInstallDirectory.set(file("$rootDir/.node"))
-        yarnEnabled.set(true)
-        yarnVersion.set(providers.gradleProperty("frontend.yarnVersion"))
-}
-
-tasks.enableYarnBerry {
-        // There is no need to enable berry manually, because berry files are already committed to the repo.
-        enabled = false
 }
diff --git a/gradle.properties b/gradle.properties
index d9fcc8c5..35134b03 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,6 @@
 file.encoding=UTF-8
 frontend.nodeVersion=20.12.1
 frontend.yarnVersion=4.1.1
-frontend.yarn1Version=1.22.22
 group=tools.refinery
 # Set to true once tools.refinery.gradle.frontend-worktree supports the cache.
 org.gradle.configuration-cache=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e1d3b404..98df7f01 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+# SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
 #
 # SPDX-License-Identifier: EPL-2.0
 
@@ -18,7 +18,7 @@ eclipseCollections-api = { group = "org.eclipse.collections", name = "eclipse-co
 ecore = { group = "org.eclipse.emf", name = "org.eclipse.emf.ecore", version = "2.36.0" }
 ecore-xmi = { group = "org.eclipse.emf", name = "org.eclipse.emf.ecore.xmi", version = "2.37.0" }
 ecore-codegen = { group = "org.eclipse.emf", name = "org.eclipse.emf.codegen.ecore", version = "2.37.0" }
-gradlePlugin-frontend = { group = "org.siouan", name = "frontend-gradle-plugin-jdk11", version = "6.0.0" }
+gradlePlugin-frontend = { group = "org.siouan", name = "frontend-jdk17", version = "8.0.0" }
 gradlePlugin-shadow = { group = "com.github.johnrengelman", name = "shadow", version = "8.1.1" }
 gradlePlugin-sonarqube = { group = "org.sonarsource.scanner.gradle", name = "sonarqube-gradle-plugin", version = "5.0.0.4638" }
 gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" }