From 99949557818d7325f77323403a67ed49ae6f14c1 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 6 Dec 2023 08:03:48 +0100 Subject: [PATCH 1/4] downloadJbr should copy if jbr uses dash previously only jbr versions with an underscore were supported. --- src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3302f64..920d44e 100644 --- a/src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt +++ b/src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt @@ -46,7 +46,7 @@ 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") workingDir = downloadDir From e0719190f1ba6cdfb377eee8110beef17fa997e7 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 6 Dec 2023 08:05:16 +0100 Subject: [PATCH 2/4] Bump patch version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8a11b17..89aa157 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" From 0ed20dc69f3b46d23990758e77d93eb97f05e31a Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 6 Dec 2023 08:05:57 +0100 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c835f6..8d3e9c5 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 From 144ccfe0c6ff910101e724fa4b583cf923a5df3c Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 6 Dec 2023 09:05:04 +0100 Subject: [PATCH 4/4] Update src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sergej Koščejev --- src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 920d44e..b747c49 100644 --- a/src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt +++ b/src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt @@ -48,7 +48,7 @@ open class DownloadJbrProjectPlugin : Plugin { 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 } }