From fb3b5d4f13d6073dc1cdaa96387fb30194dd5b68 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 29 Sep 2024 08:49:55 +0200 Subject: [PATCH] update documentation/changelog + fix a wrong task name --- CHANGELOG.md | 21 +++++++++++++++++++ docs/plugins/download-jbr.md | 3 +++ .../de/itemis/mps/gradle/common.gradle.kts | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14bbaeea..0f0772c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,27 @@ 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.29.0 + +### Changed + +- Upgraded to Gradle 8.10.2 and Kotlin to 1.9.24. + +### Added + +- A few new helper functions are now available through extensions when applying `de.itemis.mps.gradle.common`: + - `ci` (determineCI(), isCI(), buildNumber(), registerDependencyRepositories()) + - `jdk` (determine(JavaVersion)) + - `itemis` (mbeddrGitHub(), itemisNexus()) + - `githubAuth` (user, token) + - `directories` (artifactsDir(), scriptFile(String), jnLibraryPath()) +- `de.itemis.mps.gradle.common` creates configurations for MPS (`common_mps`), language dependencies (`common_languageLibs`) and the ant lib (common_antLib) automatically. Tasks `commonCleanMps` and `commonResolveMps` are also created when you apply `de.itemis.mps.gradle.common`. +- The plugin `downloadJbr` has a new flag `defaultJavaExecutable` to set the downloaded JBR as the default Java executable. + +### Fixed + +- The `GetMpsInBrowser` task works again for all platforms including Mac Apple Silicon. + ## 1.28.0 ### Added diff --git a/docs/plugins/download-jbr.md b/docs/plugins/download-jbr.md index ea295d73..19adbffe 100644 --- a/docs/plugins/download-jbr.md +++ b/docs/plugins/download-jbr.md @@ -30,6 +30,7 @@ repositories { downloadJbr { jbrVersion = "11_0_6-b520.66" + defaultJavaExecutable.set(true) // optional } ``` @@ -45,6 +46,7 @@ repositories { downloadJbr { jbrVersion = '11_0_6-b520.66' + defaultJavaExecutable.set(true) // optional } ``` @@ -52,6 +54,7 @@ downloadJbr { * `jbrVersion` - version of the JBR to download. While this supports maven version selectors we highly recommend not using wildcards like `*` or `+` in there for reproducible builds. +* `defaultJavaExecutable` - set the downloaded JBR as the default Java executable * `distributionType` - optional distribution type for the JBR to use. Will default to `jbr_jcef` if omitted. * `downloadDir` - optional directory where the downloaded JBR is downloaded and extracted to. The plugin defaults to `build/jbrDownload`. diff --git a/src/main/kotlin/de/itemis/mps/gradle/common.gradle.kts b/src/main/kotlin/de/itemis/mps/gradle/common.gradle.kts index 31104d9f..bd29dd74 100644 --- a/src/main/kotlin/de/itemis/mps/gradle/common.gradle.kts +++ b/src/main/kotlin/de/itemis/mps/gradle/common.gradle.kts @@ -134,7 +134,7 @@ tasks.register("commonCleanMps") { } tasks.named("clean") { - dependsOn("cleanMPS") + dependsOn("commonCleanMPS") } extensions.create("githubAuth", project)