Reset javaLauncher that was set by the backendLauncher

mbeddr · Oct 24, 2023 · 49cd15b · 49cd15b
1 parent 6211115
commit 49cd15b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/main/kotlin/de/itemis/mps/gradle/generate/Plugin.kt b/src/main/kotlin/de/itemis/mps/gradle/generate/Plugin.kt
@@ -68,6 +68,10 @@ open class GenerateMpsProjectPlugin : Plugin<Project> {
                 generate.configure {
                     val backendLauncher: MpsBackendLauncher = project.objects.newInstance(MpsBackendLauncher::class)
                     backendLauncher.configureJavaForMpsVersion(this, mpsLocation, mpsVersion)
+
+                    // For backwards compatibility reset the javaLauncher set by the backendLauncher
+                    javaLauncher.set(null)
+
                     dependsOn(fake)
 
                     argumentProviders.add(argsFromBaseExtension(extension))

diff --git a/src/main/kotlin/de/itemis/mps/gradle/modelcheck/Plugin.kt b/src/main/kotlin/de/itemis/mps/gradle/modelcheck/Plugin.kt
@@ -54,6 +54,10 @@ open class ModelcheckMpsProjectPlugin : Plugin<Project> {
                 checkmodels.configure {
                     val backendLauncher: MpsBackendLauncher = project.objects.newInstance(MpsBackendLauncher::class)
                     backendLauncher.configureJavaForMpsVersion(this, mpsLocation, mpsVersion)
+
+                    // For backwards compatibility reset the javaLauncher set by the backendLauncher
+                    javaLauncher.set(null)
+
                     dependsOn(resolveMps)
 
                     argumentProviders.add(argsFromBaseExtension(extension))