From fc78c2211ed3cb8121a3115df1f1722a9765a6e7 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Tue, 5 Dec 2023 12:35:11 +0100 Subject: [PATCH 1/5] Make downloadJBR aware of distributionType parameter --- .../de/itemis/mps/gradle/downloadJBR/Plugin.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 194daee..3302f64 100644 --- a/src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt +++ b/src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt @@ -95,12 +95,14 @@ open class DownloadJbrProjectPlugin : Plugin { // required for running tests. While a little bit larger than jbr_nomod it should cause the least // surprises when using it as a default. // see https://github.com/mbeddr/build.publish.jdk/commit/10bbf7d177336179ca189fc8bb4c1262029c69da - val distributionType = if(extension.distributionType == null && - Regex("""11_0_[0-9][^0-9]""").find(version) != null) { - "jbr" - } else { - "jbr_jcef" - } + val distributionType = + if (extension.distributionType != null) { + extension.distributionType + } else if (Regex("""11_0_[0-9][^0-9]""").find(version) != null) { + "jbr" + } else { + "jbr_jcef" + } val cpuArch = when(System.getProperty ("os.arch")) { "aarch64" -> "aarch64" From 19e7a33624a84ea81e956291ac6f3678a6a15317 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Tue, 5 Dec 2023 13:01:26 +0100 Subject: [PATCH 2/5] Update version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0396b88..2752ce6 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.0" +val baseVersion = "1.22.0" group = "de.itemis.mps" From 9c09f23f7d17166fc4e1ab67c8b7e03b2bb51bef Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Tue, 5 Dec 2023 13:02:19 +0100 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c4c4f4..b459e33 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.22.0 + +### Fixed + +- `downloadJbr` properly accepts the `distributionType` parameter + ## 1.21.0 ### Added From cacb06938938b02aee0e775fd03f697979bbe0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Tue, 5 Dec 2023 13:26:15 +0100 Subject: [PATCH 4/5] Only bump patch version because this is a bugfix --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2752ce6..8a11b17 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.21.1" group = "de.itemis.mps" From 113ec09f858c691a91b41860efb71c67b32154af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Tue, 5 Dec 2023 13:26:37 +0100 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b459e33..6c835f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ 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.0 +## 1.21.1 ### Fixed