build: migration to Gradle 7

7 files changed, 31 insertions, 31 deletions

diff --git a/gradle/java-common.gradle b/gradle/java-common.gradle
index ee7bfad8..a070c378 100644
--- a/gradle/java-common.gradle
+++ b/gradle/java-common.gradle
@@ -5,16 +5,10 @@ repositories {
         }
 }
 
-apply plugin: 'java'
-
 sourceCompatibility = '11'
 targetCompatibility = '11'
 
-configurations.all {
-        exclude group: 'asm'
-}
-
-jar {
+tasks.named('jar') {
         manifest {
                 attributes 'Bundle-SymbolicName': project.name
         }
diff --git a/gradle/jmh.gradle b/gradle/jmh.gradle
index 71fec300..698a57cf 100644
--- a/gradle/jmh.gradle
+++ b/gradle/jmh.gradle
@@ -1,6 +1,6 @@
 configurations {
         jmh {
-                extendsFrom compile
+                extendsFrom implementation
         }
 }
 
@@ -14,17 +14,18 @@ sourceSets {
 }
 
 dependencies {
-        jmhCompile "org.openjdk.jmh:jmh-core:${jmhVersion}"
+        jmhImplementation "org.openjdk.jmh:jmh-core:${jmhVersion}"
         jmhAnnotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:${jmhVersion}"
 }
 
-task jmh(type: JavaExec, dependsOn: jmhClasses) {
+tasks.register('jmh', JavaExec) {
+        dependsOn tasks.named('jmhClasses')
     main = 'org.openjdk.jmh.Main'
     classpath = sourceSets.jmh.compileClasspath + sourceSets.jmh.runtimeClasspath
 }
 
 eclipse.classpath {
-        plusConfigurations += [configurations.jmhCompile, configurations.jmhRuntime]
+        plusConfigurations += [configurations.jmhCompileClasspath, configurations.jmhRuntimeClasspath]
 
         file.whenMerged { classpath ->
                 for (entry in classpath.entries) {
diff --git a/gradle/junit.gradle b/gradle/junit.gradle
index f603a4e4..da0cea8c 100644
--- a/gradle/junit.gradle
+++ b/gradle/junit.gradle
@@ -1,27 +1,28 @@
 apply plugin: 'jacoco'
 
 dependencies {
-        testCompile "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
-        testRuntime "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
-        testCompile "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
-        testCompile "org.hamcrest:hamcrest:${hamcrestVersion}"
+        testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
+        testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
+        testImplementation "org.hamcrest:hamcrest:${hamcrestVersion}"
 }
 
-test {
+def jacocoTestReport = tasks.named('jacocoTestReport')
+jacocoTestReport.configure {
+        dependsOn test
+        reports {
+                xml.required = true
+        }
+}
+
+tasks.named('test') {
         useJUnitPlatform {
                 excludeTags 'slow'
         }
+        finalizedBy jacocoTestReport
 }
 
-task slowTest(type: Test) {
+tasks.register('slowTest', Test) {
         useJUnitPlatform()
+        finalizedBy jacocoTestReport
 }
-
-jacocoTestReport {
-        dependsOn test
-        reports {
-                xml.enabled true
-        }
-}
-
-test.finalizedBy(jacocoTestReport)
\ No newline at end of file
diff --git a/gradle/mwe2.gradle b/gradle/mwe2.gradle
index 5fd53126..b4ea8bb8 100644
--- a/gradle/mwe2.gradle
+++ b/gradle/mwe2.gradle
@@ -1,6 +1,6 @@
 configurations {
         mwe2 {
-                extendsFrom compile
+                extendsFrom implementation
         }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5028f28f..ffed3a25 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/xtend.gradle b/gradle/xtend.gradle
index b0a62d70..900a95f2 100644
--- a/gradle/xtend.gradle
+++ b/gradle/xtend.gradle
@@ -9,7 +9,7 @@ sourceSets {
         }
 }
 
-clean.doLast {
+tasks.named('clean') {
         delete 'src/main/xtend-gen'
         delete 'src/test/xtend-gen'
 }
diff --git a/gradle/xtext-common.gradle b/gradle/xtext-common.gradle
index f34108f3..4993ed7e 100644
--- a/gradle/xtext-common.gradle
+++ b/gradle/xtext-common.gradle
@@ -1,7 +1,11 @@
 apply from: "${rootDir}/gradle/java-common.gradle"
 
 dependencies {
-        compile platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")
+        implementation platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")
+}
+
+configurations.all {
+        exclude group: 'asm'
 }
 
 sourceSets {
@@ -15,7 +19,7 @@ sourceSets {
         }
 }
 
-clean.doLast {
+tasks.named('clean') {
         delete 'src/main/xtext-gen'
         delete 'src/test/xtext-gen'
 }