From 2e172ee7bf7d249f0c397fd721a04336a4de41d0 Mon Sep 17 00:00:00 2001
From: Andrew Byrd <andrew@fastmail.net>
Date: Thu, 17 Aug 2023 22:02:02 +0800
Subject: [PATCH] remove stray quote, set java toolchain on exec

---
 build.gradle | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d0e5586f6..d34f7451a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -97,7 +97,7 @@ task runBackend (type: JavaExec) {
 task testRunnable(type: JavaExec) {
     dependsOn(build)
     classpath(sourceSets.main.runtimeClasspath)
-    mainClass = 'com.conveyal.analysis.BackendMain"'
+    mainClass = 'com.conveyal.analysis.BackendMain'
     jvmArgs("-Dconveyal.immediate.shutdown=true")
 }
 
@@ -120,6 +120,12 @@ task createVersionProperties(dependsOn: processResources) {
     }
 }
 
+// Fix inconsistent Gradle behavior (see https://github.com/gradle/gradle/issues/16791)
+// By default JavaExec tasks use the JVM Gradle was launched with, ignoring the project-level toolchain.
+tasks.withType(JavaExec).configureEach {
+    javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
+}
+
 classes {
     dependsOn createVersionProperties
 }