From 521bc6519a66401fe9094fd7ac35795ab351f997 Mon Sep 17 00:00:00 2001 From: kotlinisland Date: Wed, 13 Dec 2023 14:34:37 +1000 Subject: [PATCH 1/5] Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now --- .github/template-cleanup/gradle.properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/template-cleanup/gradle.properties b/.github/template-cleanup/gradle.properties index 1395677..d2e9f17 100644 --- a/.github/template-cleanup/gradle.properties +++ b/.github/template-cleanup/gradle.properties @@ -29,6 +29,3 @@ org.gradle.configuration-cache = true # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html org.gradle.caching = true - -# Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment -systemProp.org.gradle.unsafe.kotlin.assignment = true From 8d42508c6cb3d252cd104ba7f94c03b5aadaf1dc Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Fri, 1 Dec 2023 13:26:46 +0000 Subject: [PATCH 2/5] Changelog update - v1.11.3 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fde9b62..5312727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ## [Unreleased] +## [1.11.3] - 2023-12-01 + ### Changed - Upgrade Gradle Wrapper to `8.5` @@ -646,7 +648,8 @@ - GitHub Actions to automate testing and deployment - Kotlin support -[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.2...HEAD +[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.3...HEAD +[1.11.3]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.2...v1.11.3 [1.11.2]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.1...v1.11.2 [1.11.1]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.0...v1.11.1 [1.11.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.10.0...v1.11.0 From 0186f695085ae49c8d01b66076e905fdfd59b0c4 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Thu, 1 Feb 2024 09:48:10 +0100 Subject: [PATCH 3/5] Remove Gradle Kotlin DSL Lazy Property Assignment from the main `gradle.properties` file --- gradle.properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6d9bbd4..c54e780 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,6 +29,3 @@ org.gradle.configuration-cache = true # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html org.gradle.caching = true - -# Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment -systemProp.org.gradle.unsafe.kotlin.assignment = true From fc3f3f4c9ff9c49b76792fa06e60389aea357606 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Thu, 1 Feb 2024 09:51:15 +0100 Subject: [PATCH 4/5] CHANGELOG update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5312727..41cbf7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ## [Unreleased] +### Removed + +- Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now + ## [1.11.3] - 2023-12-01 ### Changed From b3cb370194b0ecb73ddec043d4ba453418807997 Mon Sep 17 00:00:00 2001 From: Ryan Rushton Date: Thu, 1 Feb 2024 20:27:58 +1100 Subject: [PATCH 5/5] Fix create draft release (#427) * Fix bash variable access in Create Release Draft step. * Fix channels assignment in publishPlugin task. * Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now * Changelog update - v1.11.3 * Remove Gradle Kotlin DSL Lazy Property Assignment from the main `gradle.properties` file * CHANGELOG update * Adjust obtaining the value for `publishPlugin.channels` property. * CHANGELOG update --------- Co-authored-by: kotlinisland Co-authored-by: GitHub Action Co-authored-by: Jakub Chrzanowski --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 5 +++++ build.gradle.kts | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e21b5a..57a4862 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -256,7 +256,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh release create v${{ needs.build.outputs.version }} \ + gh release create "v${{ needs.build.outputs.version }}" \ --draft \ --title "v${{ needs.build.outputs.version }}" \ --notes "$(cat << 'EOM' diff --git a/CHANGELOG.md b/CHANGELOG.md index 41cbf7e..ee2b30c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ ## [Unreleased] +### Fixed + +- Adjusted obtaining the value for `publishPlugin.channels` property in `build.gradle.kts` +- Fixed bash variable access in the Create Release Draft step. + ### Removed - Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now diff --git a/build.gradle.kts b/build.gradle.kts index bf0c939..7b867e7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -126,6 +126,6 @@ tasks { // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3 // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more: // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel - channels = properties("pluginVersion").map { listOf(it.split('-').getOrElse(1) { "default" }.split('.').first()) } + channels = properties("pluginVersion").map { listOf(it.substringAfter('-').substringBefore('.').ifEmpty { "default" }) } } }