From 0675e5658a2b73079ee8b059f6603cf3fdd46aaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= <sergej@koscejev.cz>
Date: Fri, 17 May 2024 17:29:46 +0200
Subject: [PATCH] 1.25.1: Remigrate: fix Kotlin incompatibility with latest MPS

---
 CHANGELOG.md                                            | 6 ++++++
 build.gradle.kts                                        | 2 +-
 src/main/kotlin/de/itemis/mps/gradle/tasks/Remigrate.kt | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77848b6..2f7b1a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.25.1
+
+### Fixed
+
+- `Remigrate`: change classpath construction to fix Kotlin library incompatibilities with latest MPS.
+
 ## 1.25.0
 
 ### Added
diff --git a/build.gradle.kts b/build.gradle.kts
index 4dc7919..6ab7604 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
     id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
 }
 
-val baseVersion = "1.25.0"
+val baseVersion = "1.25.1"
 
 group = "de.itemis.mps"
 
diff --git a/src/main/kotlin/de/itemis/mps/gradle/tasks/Remigrate.kt b/src/main/kotlin/de/itemis/mps/gradle/tasks/Remigrate.kt
index ef16429..9c252d9 100644
--- a/src/main/kotlin/de/itemis/mps/gradle/tasks/Remigrate.kt
+++ b/src/main/kotlin/de/itemis/mps/gradle/tasks/Remigrate.kt
@@ -78,8 +78,10 @@ open class Remigrate @Inject constructor(
 
         group = TaskGroups.MIGRATION
 
-        classpath(backendConfig)
+        // Additional classpath goes before backend config in order to fix problem with Kotlin version mismatch of
+        // backend vs IDEA.
         classpath(additionalClasspath)
+        classpath(backendConfig)
 
         mainClass.set("de.itemis.mps.gradle.remigrate.MainKt")
     }