From 5f32b01eb58f2e7b4ddfaf711ac47ea4e1bab38d Mon Sep 17 00:00:00 2001
From: Jakub Chrzanowski <jakub.chrzanowski@jetbrains.com>
Date: Fri, 11 Sep 2020 09:12:48 +0200
Subject: [PATCH] Fixed `pluginName` variable name collision with `intellij`
 closure getter in Gradle configuration #29

---
 CHANGELOG.md      | 5 +++++
 build.gradle.kts  | 6 ++++--
 gradle.properties | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2b794e..6fc14d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 # IntelliJ Platform Plugin Template Changelog
 
 ## [Unreleased]
+### Changed
+- GitHub Actions: allow releasing plugin even for the base project
+
+### Fixed
+- `pluginName` variable name collision with `intellij` closure getter in Gradle configuration #29
 
 ## [0.3.2]
 ### Changed
diff --git a/build.gradle.kts b/build.gradle.kts
index abb0b56..ffaec5b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,9 @@ plugins {
 
 // Import variables from gradle.properties file
 val pluginGroup: String by project
-val pluginName: String by project
+// `pluginName_` variable ends with `_` because of the collision with Kotlin magic getter in the `intellij` closure.
+// Read more about the issue: https://github.com/JetBrains/intellij-platform-plugin-template/issues/29
+val pluginName_: String by project
 val pluginVersion: String by project
 val pluginSinceBuild: String by project
 val pluginUntilBuild: String by project
@@ -44,7 +46,7 @@ dependencies {
 // Configure gradle-intellij-plugin plugin.
 // Read more: https://github.com/JetBrains/gradle-intellij-plugin
 intellij {
-    pluginName = pluginName
+    pluginName = pluginName_
     version = platformVersion
     type = platformType
     downloadSources = platformDownloadSources.toBoolean()
diff --git a/gradle.properties b/gradle.properties
index c200049..1905253 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@
 # -> https://www.jetbrains.org/intellij/sdk/docs/reference_guide/intellij_artifacts.html
 
 pluginGroup = org.jetbrains.plugins.template
-pluginName = Template
+pluginName_ = Template
 pluginVersion = 0.3.4
 pluginSinceBuild = 193
 pluginUntilBuild = 202.*