From d27e2ca87a7565d678147c8a385fa120c5ce846c Mon Sep 17 00:00:00 2001
From: Jens Wille <jens.wille@hbz-nrw.de>
Date: Fri, 16 Feb 2024 16:03:47 +0100
Subject: [PATCH] Replace Gradle conventions with configuration blocks. (#341)

Access to plugin conventions has been deprecated and is scheduled to be removed in Gradle 9.0.

See: https://docs.gradle.org/8.6/userguide/upgrading_version_8.html#deprecated_access_to_conventions
---
 gradle/source-layout.gradle | 4 +++-
 metafix-ide/build.gradle    | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gradle/source-layout.gradle b/gradle/source-layout.gradle
index a5d55599..a90ce496 100644
--- a/gradle/source-layout.gradle
+++ b/gradle/source-layout.gradle
@@ -22,5 +22,7 @@ jar {
 }
 
 plugins.withId('war') {
-  webAppDirName = 'src/main/webapp'
+  war {
+    webAppDirectory = file('src/main/webapp')
+  }
 }
diff --git a/metafix-ide/build.gradle b/metafix-ide/build.gradle
index 58ef5428..79bcc358 100644
--- a/metafix-ide/build.gradle
+++ b/metafix-ide/build.gradle
@@ -12,11 +12,13 @@ dependencies {
 apply plugin: 'application'
 apply plugin: 'com.github.johnrengelman.shadow'
 
-mainClassName = 'org.eclipse.xtext.ide.server.ServerLauncher'
-applicationName = 'xtext-server'
+application {
+  mainClass = 'org.eclipse.xtext.ide.server.ServerLauncher'
+  applicationName = 'xtext-server'
+}
 
 shadowJar {
-  from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output)
+  from(sourceSets.main.output)
   configurations = [project.configurations.runtimeClasspath]
 
   exclude(