Merge pull request #763 from modelix/dependabot/gradle/kotlin-2.0.0

build(deps): bump kotlin from 1.9.24 to 2.0.0

Author: Oleksandr Dzhychko

.gitignore

@@ -11,3 +11,4 @@ kotlin_gen
 /node_modules
 **/.ideaconfig
 **/.mpsconfig
+.kotlin

build-logic/src/main/kotlin/org/modelix/CopyMps.kt

@@ -20,7 +20,11 @@ import org.gradle.api.Project
 import org.gradle.api.file.Directory
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.support.unzipTo
+import org.gradle.kotlin.dsl.support.zipTo
 import java.io.File
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 import java.util.zip.ZipInputStream
 
 val Project.mpsMajorVersion: String get() {
@@ -105,6 +109,32 @@ fun Project.copyMps(): File {
         }
     }
 
+    // Workaround for https://youtrack.jetbrains.com/issue/KT-69541/Kotlin-2.0-compiler-cannot-use-JAR-packaged-as-ZIP64
+    //
+    // The issue was first detected with `lib/app.jar` in 2022.2 and 2022.3.
+    // This JAR is needed since this versions because it contained `com.intellij.openapi.project.ProjectManager`.
+    // Before that, `lib/platform-api.jar` contained `com.intellij.openapi.project.ProjectManager`.
+    //
+    // The workaround is to unzip the JAR with and zip it again.
+    // Unzipping with Gradle supports ZIP64, but ZIP64 is not used when zipping again.
+    //
+    // TODO MODELIX-968 Remove this workaround after it is not needed anymore.
+    val appJarFile = mpsHomeDir.get().asFile.resolve("lib/app.jar")
+    if (appJarFile.exists()) {
+        val appJarContent = mpsHomeDir.get().asFile.resolve("lib/appJarContent")
+        val appJarFileNotZip64 = mpsHomeDir.get().asFile.resolve("lib/appNotZip64.jar")
+        println("Unzipping $appJarFile into $appJarContent")
+        unzipTo(appJarContent, appJarFile)
+        println("Zipping $appJarContent into $appJarFileNotZip64")
+        zipTo(appJarFileNotZip64, appJarContent)
+        println("Deleting $appJarContent")
+        delete {
+            this.delete(appJarContent)
+        }
+        println("Overriding $appJarFile with $appJarFileNotZip64")
+        Files.move(appJarFileNotZip64.toPath(), appJarFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+    }
+
     // The build number of a local IDE is expected to contain a product code, otherwise an exception is thrown.
     val buildTxt = mpsHomeDir.get().asFile.resolve("build.txt")
     val buildNumber = buildTxt.readText()

build.gradle.kts

@@ -77,19 +77,19 @@ subprojects {
     val kotlinApiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_6
     subproject.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
         if (!name.lowercase().contains("test")) {
-            this.kotlinOptions {
-                jvmTarget = "11"
-                freeCompilerArgs += listOf("-Xjvm-default=all-compatibility", "-Xexpect-actual-classes")
-                apiVersion = kotlinApiVersion.version
+            this.compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_11)
+                freeCompilerArgs.addAll(listOf("-Xjvm-default=all-compatibility", "-Xexpect-actual-classes"))
+                apiVersion.set(kotlinApiVersion)
             }
         }
     }
     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
+            this.compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_11)
+                freeCompilerArgs.addAll(listOf("-Xjvm-default=all-compatibility"))
+                apiVersion.set(kotlinApiVersion)
             }
         }
     }

bulk-model-sync-lib/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
 }
 
 kotlin {
+    jvmToolchain(11)
     js(IR) {
         browser {
             testTask {
@@ -13,7 +14,6 @@ kotlin {
         }
     }
     jvm {
-        jvmToolchain(11)
         testRuns["test"].executionTask.configure {
             useJUnitPlatform()
         }

bulk-model-sync-lib/mps-test/build.gradle.kts

@@ -38,6 +38,7 @@ dependencies {
 
 intellij {
     localPath = copyMps().absolutePath
+    instrumentCode = false
 }
 
 tasks {

gradle/libs.versions.toml

@@ -25,7 +25,7 @@ kotlinx-kover = { id = "org.jetbrains.kotlinx.kover", version = "0.8.2" }
 docker-compose = { id = "com.avast.gradle.docker-compose" , version = "0.17.7" }
 
 [versions]
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 kotlinCoroutines="1.8.1"
 ktor="2.3.12"
 kotlinHtml="0.8.0"

kotlin-js-store/yarn.lock

@@ -137,14 +137,6 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
 brace-expansion@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
@@ -225,11 +217,6 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
-[email protected]:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
 cssom@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
@@ -408,17 +395,16 @@ glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob@7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+glob@8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^5.0.1"
     once "^1.3.0"
-    path-is-absolute "^1.0.0"
 
 has-flag@^4.0.0:
   version "4.0.0"
@@ -614,17 +600,17 @@ [email protected]:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^3.0.4:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+minimatch@^5.0.1:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
   dependencies:
-    brace-expansion "^1.1.7"
+    brace-expansion "^2.0.1"
 
-mocha@10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8"
-  integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==
+mocha@10.3.0:
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.3.0.tgz#0e185c49e6dccf582035c05fa91084a4ff6e3fe9"
+  integrity sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg==
   dependencies:
     ansi-colors "4.1.1"
     browser-stdout "1.3.1"
@@ -633,13 +619,12 @@ [email protected]:
     diff "5.0.0"
     escape-string-regexp "4.0.0"
     find-up "5.0.0"
-    glob "7.2.0"
+    glob "8.1.0"
     he "1.2.0"
     js-yaml "4.1.0"
     log-symbols "4.1.0"
     minimatch "5.0.1"
     ms "2.1.3"
-    nanoid "3.3.3"
     serialize-javascript "6.0.0"
     strip-json-comments "3.1.1"
     supports-color "8.1.1"
@@ -658,11 +643,6 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-[email protected]:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
-  integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
-
 [email protected]:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
@@ -725,11 +705,6 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
 picomatch@^2.0.4, picomatch@^2.2.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -902,10 +877,10 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-typescript@5.0.4:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b"
-  integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==
+typescript@5.4.3:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff"
+  integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==
 
 universalify@^0.2.0:
   version "0.2.0"

light-model-client/src/commonMain/kotlin/org/modelix/client/light/LightModelClient.kt

@@ -766,7 +766,9 @@ private class AutoTransactions(val delegate: ITransactionManager) : ITransaction
     }
 }
 
-expect class PlatformSpecificLightModelClientBuilder() : LightModelClientBuilder
+expect class PlatformSpecificLightModelClientBuilder() : LightModelClientBuilder {
+    override fun getDefaultEngineFactory(): HttpClientEngineFactory<*>
+}
 
 abstract class LightModelClientBuilder {
     private var host: String = "localhost"

light-model-client/src/jsMain/kotlin/org/modelix/client/light/PlatformSpecificLightModelClientBuilder.kt

@@ -17,5 +17,5 @@ import io.ktor.client.engine.HttpClientEngineFactory
 import io.ktor.client.engine.js.Js
 
 actual class PlatformSpecificLightModelClientBuilder actual constructor() : LightModelClientBuilder() {
-    override fun getDefaultEngineFactory(): HttpClientEngineFactory<*> = Js
+    actual override fun getDefaultEngineFactory(): HttpClientEngineFactory<*> = Js
 }

light-model-client/src/jvmMain/kotlin/org/modelix/client/light/PlatformSpecificLightModelClientBuilder.kt

@@ -17,5 +17,5 @@ import io.ktor.client.engine.HttpClientEngineFactory
 import io.ktor.client.engine.cio.CIO
 
 actual class PlatformSpecificLightModelClientBuilder : LightModelClientBuilder() {
-    override fun getDefaultEngineFactory(): HttpClientEngineFactory<*> = CIO
+    actual override fun getDefaultEngineFactory(): HttpClientEngineFactory<*> = CIO
 }