diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c835f65..8d3e9c51 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.21.2 + +### Fixed + +- `downloadJbr` handles jbr versions with dashes in their name + ## 1.21.1 ### Fixed diff --git a/build.gradle.kts b/build.gradle.kts index 8a11b170..89aa157c 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.21.1" +val baseVersion = "1.21.2" group = "de.itemis.mps" diff --git a/src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt b/src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt index 3302f64c..b747c49e 100644 --- a/src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt +++ b/src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt @@ -46,9 +46,9 @@ open class DownloadJbrProjectPlugin : Plugin { workingDir = downloadDir } - if (downloadDir.listFiles { _, name -> name.startsWith("jbr_") }!!.any()) { + if (downloadDir.listFiles { _, name -> name.startsWith("jbr_") || name.startsWith("jbr-") }!!.any()) { exec { - commandLine("sh", "-c", "mv jbr_* jbr") + commandLine("sh", "-c", "mv jbr* jbr") workingDir = downloadDir } }