1.22.2: adjust some paths in MpsCheck

mbeddr · Feb 9, 2024 · 1a5f477 · 1a5f477
1 parent 6d52c83
commit 1a5f477
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git 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.22.2
+
+### Fixed
+
+- Minor fix in the computation of `MpsCheck` input files.
+
 ## 1.22.1
 
 ### Fixed

diff --git 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.22.1"
+val baseVersion = "1.22.2"
 
 group = "de.itemis.mps"
 

diff --git a/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsCheck.kt b/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsCheck.kt
@@ -77,7 +77,8 @@ abstract class MpsCheck : JavaExec(), VerificationTask {
     @get:SkipWhenEmpty
     @get:PathSensitive(PathSensitivity.NONE)
     protected val sources: FileTree = projectLocation.asFileTree.matching {
-        exclude(project.layout.buildDirectory.get().asFile.relativeTo(projectLocation.get().asFile).path + "/**")
+        exclude(project.layout.buildDirectory.get().asFile.toRelativeString(projectLocation.get().asFile))
+        exclude("**/*_gen*")
         exclude("**/*_gen*/**")
 
         include("**/*.msd")
@@ -88,8 +89,8 @@ abstract class MpsCheck : JavaExec(), VerificationTask {
     @Suppress("unused")
     @get:Classpath
     protected val compiledClasses: FileTree = projectLocation.asFileTree.matching {
-        exclude(project.layout.buildDirectory.get().asFile.relativeTo(projectLocation.get().asFile).path + "/**")
-        include("**/classes_gen/*")
+        exclude(project.layout.buildDirectory.get().asFile.toRelativeString(projectLocation.get().asFile))
+        include("**/classes_gen/**")
     }
 
     init {