Merge pull request #342 from metafacture/gradle9Compatibility

Provide Gradle 9 forward compatibility.
metafacture · Feb 20, 2024 · 5de67d6 · 5de67d6
2 parents fa000d3 + d27e2ca
commit 5de67d6
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -39,6 +39,7 @@ subprojects {
       'equalsverifier': '3.8.2',
       'guava':          '29.0-jre',
       'jackson':        '2.13.3',
+      'jdk':            '8',
       'jena':           '3.17.0',
       'jetty':          '9.4.14.v20181114',
       'jquery':         '3.3.1-1',
@@ -66,9 +67,6 @@ subprojects {
 
   check.dependsOn(javadoc)
 
-  sourceCompatibility = '1.8'
-  targetCompatibility = '1.8'
-
   repositories {
     mavenCentral()
     maven githubPackage.invoke("metafacture")
@@ -86,6 +84,18 @@ subprojects {
     toolVersion '8.44'
   }
 
+  java {
+    toolchain {
+      languageVersion = JavaLanguageVersion.of(versions.jdk)
+    }
+  }
+
+  tasks.withType(JavaExec) {
+    javaLauncher = javaToolchains.launcherFor {
+      languageVersion = java.toolchain.languageVersion
+    }
+  }
+
   tasks.withType(JavaCompile) {
     'all -processing -rawtypes -serial'.split().each {
       options.compilerArgs << "-Xlint:${it}"

diff --git 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
@@ -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(

diff --git a/metafix/build.gradle b/metafix/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'maven-publish'
-  id 'me.champeau.jmh' version '0.6.6'
+  id 'me.champeau.jmh' version '0.7.2'
 }
 
 def passSystemProperties = {

diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java
@@ -2310,7 +2310,7 @@ public void copyFieldToSubfieldOfArrayOfObjectsWithExplicitAppend() {
 
     @Test
     public void copyFieldToSubfieldOfArrayOfStringsWithIndexImplicitAppend() {
-        MetafixTestHelpers.assertProcessException(IndexOutOfBoundsException.class, "Index 0 out of bounds for length 0", () ->
+        MetafixTestHelpers.assertProcessException(IndexOutOfBoundsException.class, "Index: 0, Size: 0", () ->
             MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                     "set_array('test[]')",
                     "copy_field('key', 'test[].1')"

diff --git a/...tafix/integration/record/fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/expected.err b/...tafix/integration/record/fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/expected.err
@@ -1,2 +1,2 @@
 ^Exception in thread "main" org\.metafacture\.metafix\.FixProcessException: Error while executing Fix expression \(at .*/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/test\.fix, line 2\): copy_field\("key", "test\[\]\.1"\)$
-^Caused by: java\.lang\.IndexOutOfBoundsException: Index 0 out of bounds for length 0$
+^Caused by: java\.lang\.IndexOutOfBoundsException: Index: 0, Size: 0$
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,7 @@
+plugins {
+  id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
+
 include 'metafix'
 include 'metafix-ide'
 include 'metafix-runner'