fix(mps-model-server-plugin): MPS 2022.3 requires Java 17

Author: slisson

.github/workflows/mps-compatibility.yaml

@@ -15,11 +15,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Build with MPS 2020.3.6
         run: ./gradlew :mps-model-adapters:build :mps-model-server-plugin:build -Pmps.version=2020.3.6
       - name: Build with MPS 2021.1.4

build.gradle.kts

@@ -19,8 +19,11 @@ import kotlinx.html.unsafe
 import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.DokkaBaseConfiguration
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin
 import org.semver.Version
 
 buildscript {
@@ -63,6 +66,7 @@ dependencies {
 }
 
 subprojects {
+    val subproject = this
     apply(plugin = "maven-publish")
     apply(plugin = "org.jetbrains.dokka")
     apply(plugin = "org.jlleitschuh.gradle.ktlint")
@@ -82,18 +86,42 @@ subprojects {
     }
 
     val kotlinApiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_6
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
+    subproject.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
         if (!name.lowercase().contains("test")) {
-            kotlinOptions {
+            this.kotlinOptions {
                 jvmTarget = "11"
                 freeCompilerArgs += listOf("-Xjvm-default=all-compatibility")
                 apiVersion = kotlinApiVersion.version
             }
         }
     }
+    subproject.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
+        if (!name.lowercase().contains("test")) {
+            this.kotlinOptions {
+                jvmTarget = "11"
+                freeCompilerArgs += listOf("-Xjvm-default=all-compatibility")
+                apiVersion = kotlinApiVersion.version
+            }
+        }
+    }
+
+    subproject.plugins.withType<JavaPlugin> {
+        subproject.extensions.configure<JavaPluginExtension> {
+            sourceCompatibility = JavaVersion.VERSION_11
+            targetCompatibility = JavaVersion.VERSION_11
+        }
+    }
+
+    subproject.plugins.withType<KotlinPlatformJvmPlugin> {
+        subproject.extensions.configure<KotlinJvmProjectExtension> {
+            compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_11)
+            }
+        }
+    }
 
-    plugins.withType<KotlinMultiplatformPluginWrapper> {
-        project.extensions.configure<KotlinMultiplatformExtension> {
+    subproject.plugins.withType<KotlinMultiplatformPluginWrapper> {
+        subproject.extensions.configure<KotlinMultiplatformExtension> {
             sourceSets.all {
                 if (!name.lowercase().contains("test")) {
                     languageSettings {
@@ -104,8 +132,8 @@ subprojects {
         }
     }
 
-    plugins.withType<NodePlugin> {
-        project.extensions.configure<NodeExtension> {
+    subproject.plugins.withType<NodePlugin> {
+        subproject.extensions.configure<NodeExtension> {
             version.set(libs.versions.node)
             download.set(true)
         }

mps-model-server-plugin/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("org.jetbrains.kotlin.jvm")
     id("org.jetbrains.intellij") version "1.15.0"
@@ -18,7 +20,8 @@ if (!mpsToIdeaMap.containsKey(mpsVersion)) {
 }
 // identify the corresponding intelliJ platform version used by the MPS version
 val ideaVersion = mpsToIdeaMap.getValue(mpsVersion)
-println("Building for MPS version $mpsVersion and IntelliJ version $ideaVersion")
+val mpsJavaVersion = if (mpsVersion >= "2022.3") 17 else 11
+println("Building for MPS version $mpsVersion and IntelliJ version $ideaVersion and Java $mpsJavaVersion")
 
 dependencies {
     implementation(project(":model-server-lib"))
@@ -41,9 +44,20 @@ intellij {
     // plugins.set(listOf("jetbrains.mps.core", "com.intellij.modules.mps"))
 }
 
+java {
+    sourceCompatibility = JavaVersion.toVersion(mpsJavaVersion)
+    targetCompatibility = JavaVersion.toVersion(mpsJavaVersion)
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.fromTarget(mpsJavaVersion.toString()))
+    }
+}
+
 tasks {
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = mpsJavaVersion.toString()
     }
 
     patchPluginXml {