diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d5da41..7236043 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,13 @@ 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 +## 1.22.1 + +### Fixed + +- `MpsGenerate` task is placed into "generation" group by default, rather than (incorrect) "verification". + +## 1.22.0 ### Added diff --git a/build.gradle.kts b/build.gradle.kts index f1d0db4..e556347 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.22.0" +val baseVersion = "1.22.1" group = "de.itemis.mps" diff --git a/src/main/kotlin/de/itemis/mps/gradle/TaskGroups.kt b/src/main/kotlin/de/itemis/mps/gradle/TaskGroups.kt new file mode 100644 index 0000000..51ffa88 --- /dev/null +++ b/src/main/kotlin/de/itemis/mps/gradle/TaskGroups.kt @@ -0,0 +1,8 @@ +package de.itemis.mps.gradle + +import org.gradle.language.base.plugins.LifecycleBasePlugin + +internal object TaskGroups { + const val VERIFICATION = LifecycleBasePlugin.VERIFICATION_GROUP // "verification" + const val GENERATION = "generation" +} diff --git a/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsCheck.kt b/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsCheck.kt index 7ebb086..117b414 100644 --- a/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsCheck.kt +++ b/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsCheck.kt @@ -2,6 +2,7 @@ package de.itemis.mps.gradle.tasks import de.itemis.mps.gradle.BackendConfigurations import de.itemis.mps.gradle.ErrorMessages +import de.itemis.mps.gradle.TaskGroups import de.itemis.mps.gradle.launcher.MpsBackendBuilder import de.itemis.mps.gradle.launcher.MpsVersionDetection import org.gradle.api.GradleException @@ -142,7 +143,7 @@ abstract class MpsCheck : JavaExec(), VerificationTask { result }) - group = LifecycleBasePlugin.VERIFICATION_GROUP + group = TaskGroups.VERIFICATION classpath(project.configurations.named(BackendConfigurations.MODELCHECK_BACKEND_CONFIGURATION_NAME)) classpath(additionalModelcheckBackendClasspath) diff --git a/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsGenerate.kt b/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsGenerate.kt index a0c7cbd..642c36a 100644 --- a/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsGenerate.kt +++ b/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsGenerate.kt @@ -3,6 +3,7 @@ package de.itemis.mps.gradle.tasks import de.itemis.mps.gradle.BackendConfigurations import de.itemis.mps.gradle.EnvironmentKind import de.itemis.mps.gradle.ErrorMessages +import de.itemis.mps.gradle.TaskGroups import de.itemis.mps.gradle.launcher.MpsBackendBuilder import de.itemis.mps.gradle.launcher.MpsVersionDetection import org.gradle.api.GradleException @@ -131,7 +132,7 @@ abstract class MpsGenerate : JavaExec() { result }) - group = LifecycleBasePlugin.VERIFICATION_GROUP + group = TaskGroups.GENERATION classpath(project.configurations.named(BackendConfigurations.GENERATE_BACKEND_CONFIGURATION_NAME)) classpath(additionalGenerateBackendClasspath)