Merge pull request #99 from domaframework/ci/publish-version-setting

Ci/publish version setting

Author: xterao

.github/workflows/release.yml

@@ -51,7 +51,7 @@ jobs:
           CERTIFICATE_CHAIN: ${{ secrets.CERTIFICATE_CHAIN }}
           PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
           PRIVATE_KEY_PASSWORD: ${{ secrets.PRIVATE_KEY_PASSWORD }}
-        run: ./gradlew publishPlugin -Pversion=${{ github.event.release.tag_name }}
+        run: ./gradlew publishPlugin
 
       # Upload artifact as a release asset
       - name: Upload Release Asset

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## [Unreleased]
 
-## [0.5.0-beta] - 2025-04-14
+## [0.5.0] - 2025-04-11
 
 ### New Features
 
@@ -32,35 +32,23 @@
 - Update plugin spotless to v7.0.3 ([#78])
 - Update dependency org.jetbrains.intellij.platform to v2.5.0 ([#62])
 
-## [0.5.0] - 2025-04-11
+[#80]:https://github.com/domaframework/doma-tools-for-intellij/pull/80
+[#96]:https://github.com/domaframework/doma-tools-for-intellij/pull/96
+[#95]:https://github.com/domaframework/doma-tools-for-intellij/pull/95
+[#94]:https://github.com/domaframework/doma-tools-for-intellij/pull/94
+[#92]:https://github.com/domaframework/doma-tools-for-intellij/pull/92
+[#88]:https://github.com/domaframework/doma-tools-for-intellij/pull/88
+[#89]:https://github.com/domaframework/doma-tools-for-intellij/pull/89
+[#87]:https://github.com/domaframework/doma-tools-for-intellij/pull/87
+[#86]:https://github.com/domaframework/doma-tools-for-intellij/pull/86
+[#82]:https://github.com/domaframework/doma-tools-for-intellij/pull/82
+[#79]:https://github.com/domaframework/doma-tools-for-intellij/pull/79
+[#93]:https://github.com/domaframework/doma-tools-for-intellij/pull/93
+[#91]:https://github.com/domaframework/doma-tools-for-intellij/pull/91
+[#90]:https://github.com/domaframework/doma-tools-for-intellij/pull/90
+[#78]:https://github.com/domaframework/doma-tools-for-intellij/pull/78
+[#62]:https://github.com/domaframework/doma-tools-for-intellij/pull/62
 
-### New Features
-
-- Function Parameter Block Code Completion ([#80])
-
-### Bug Fixes
-
-- Add option --no-configuration-cache ([#96])
-- Execute the required processing within `doLast`. ([#95])
-- Call project before the task execution phase. ([#94])
-- Null check for virtualFile ([#92])
-- SQL format call log ([#88])
-- Prevents the post processor from running if the usage flag is False ([#89])
-- Strengthen checks when referencing nullable objects. ([#87])
-- Fix/formatter indent ([#86])
-- inspection in function parameters ([#82])
-- Fix:Strings are concatenated when completing code for % directives ([#79])
-
-### Maintenance
-
-- Automating development version updates ([#93])
-- Add beta to Build Version ([#91])
-
-### Dependency Updates
-
-- Update plugin org.gradle.toolchains.foojay-resolver-convention to v0.10.0 ([#90])
-- Update plugin spotless to v7.0.3 ([#78])
-- Update dependency org.jetbrains.intellij.platform to v2.5.0 ([#62])
 
 ## [0.4.0] - 2025-04-07
 
@@ -77,6 +65,12 @@
 - Update dependency com.google.googlejavaformat:google-java-format to v1.26.0 ([#68])
 - Update dependency org.jetbrains.kotlin.jvm to v2.1.20 ([#61])
 
+[#69]:https://github.com/domaframework/doma-tools-for-intellij/pull/69
+[#70]:https://github.com/domaframework/doma-tools-for-intellij/pull/70
+[#68]:https://github.com/domaframework/doma-tools-for-intellij/pull/68
+[#61]:https://github.com/domaframework/doma-tools-for-intellij/pull/61
+
+
 ## [0.3.2] - 2025-03-27
 
 ### Bug Fixes
@@ -99,6 +93,19 @@
 
 - Update dependency ch.qos.logback:logback-classic to v1.5.18 ([#60])
 
+[#56]:https://github.com/domaframework/doma-tools-for-intellij/pull/56
+[#57]:https://github.com/domaframework/doma-tools-for-intellij/pull/57
+[#58]:https://github.com/domaframework/doma-tools-for-intellij/pull/58
+[#59]:https://github.com/domaframework/doma-tools-for-intellij/pull/59
+[#64]:https://github.com/domaframework/doma-tools-for-intellij/pull/64
+[#65]:https://github.com/domaframework/doma-tools-for-intellij/pull/65
+[#48]:https://github.com/domaframework/doma-tools-for-intellij/pull/48
+[#49]:https://github.com/domaframework/doma-tools-for-intellij/pull/49
+[#45]:https://github.com/domaframework/doma-tools-for-intellij/pull/45
+[#43]:https://github.com/domaframework/doma-tools-for-intellij/pull/43
+[#60]:https://github.com/domaframework/doma-tools-for-intellij/pull/60
+
+
 ## [0.3.1] - 2025-03-11
 
 ### Bug Fixes
@@ -124,6 +131,22 @@
 - Update dependency org.slf4j:slf4j-api to v2.0.17 ([#8])
 - Update dependency ch.qos.logback:logback-classic to v1.5.17 ([#7])
 
+[#20]:https://github.com/domaframework/doma-tools-for-intellij/pull/20
+[#21]:https://github.com/domaframework/doma-tools-for-intellij/pull/21
+[#35]:https://github.com/domaframework/doma-tools-for-intellij/pull/35
+[#34]:https://github.com/domaframework/doma-tools-for-intellij/pull/34
+[#26]:https://github.com/domaframework/doma-tools-for-intellij/pull/26
+[#25]:https://github.com/domaframework/doma-tools-for-intellij/pull/25
+[#27]:https://github.com/domaframework/doma-tools-for-intellij/pull/27
+[#10]:https://github.com/domaframework/doma-tools-for-intellij/pull/10
+[#24]:https://github.com/domaframework/doma-tools-for-intellij/pull/24
+[#9]:https://github.com/domaframework/doma-tools-for-intellij/pull/9
+[#12]:https://github.com/domaframework/doma-tools-for-intellij/pull/12
+[#11]:https://github.com/domaframework/doma-tools-for-intellij/pull/11
+[#8]:https://github.com/domaframework/doma-tools-for-intellij/pull/8
+[#7]:https://github.com/domaframework/doma-tools-for-intellij/pull/7
+
+
 ## [0.3.0] - 2025-03-07
 
 ### Dao Support Features
@@ -156,55 +179,9 @@
   - Rename SQL file directory when renaming Dao
   - Change Dao package name or SQL file directory configuration when changing configuration
 
-[Unreleased]: https://github.com/domaframework/doma-tools-for-intellij/compare/v0.5.0-beta...HEAD
-[0.5.0]: https://github.com/domaframework/doma-tools-for-intellij/compare/v0.4.0...v0.5.0
-[0.5.0-beta]: https://github.com/domaframework/doma-tools-for-intellij/compare/v0.5.0...v0.5.0-beta
-[0.4.0]: https://github.com/domaframework/doma-tools-for-intellij/compare/v0.3.2...v0.4.0
-[0.3.2]: https://github.com/domaframework/doma-tools-for-intellij/compare/v0.3.1...v0.3.2
-[0.3.1]: https://github.com/domaframework/doma-tools-for-intellij/compare/v0.3.0...v0.3.1
-[0.3.0]: https://github.com/domaframework/doma-tools-for-intellij/commits/v0.3.0
-[#10]: https://github.com/domaframework/doma-tools-for-intellij/pull/10
-[#11]: https://github.com/domaframework/doma-tools-for-intellij/pull/11
-[#12]: https://github.com/domaframework/doma-tools-for-intellij/pull/12
-[#20]: https://github.com/domaframework/doma-tools-for-intellij/pull/20
-[#21]: https://github.com/domaframework/doma-tools-for-intellij/pull/21
-[#24]: https://github.com/domaframework/doma-tools-for-intellij/pull/24
-[#25]: https://github.com/domaframework/doma-tools-for-intellij/pull/25
-[#26]: https://github.com/domaframework/doma-tools-for-intellij/pull/26
-[#27]: https://github.com/domaframework/doma-tools-for-intellij/pull/27
-[#34]: https://github.com/domaframework/doma-tools-for-intellij/pull/34
-[#35]: https://github.com/domaframework/doma-tools-for-intellij/pull/35
-[#43]: https://github.com/domaframework/doma-tools-for-intellij/pull/43
-[#45]: https://github.com/domaframework/doma-tools-for-intellij/pull/45
-[#48]: https://github.com/domaframework/doma-tools-for-intellij/pull/48
-[#49]: https://github.com/domaframework/doma-tools-for-intellij/pull/49
-[#56]: https://github.com/domaframework/doma-tools-for-intellij/pull/56
-[#57]: https://github.com/domaframework/doma-tools-for-intellij/pull/57
-[#58]: https://github.com/domaframework/doma-tools-for-intellij/pull/58
-[#59]: https://github.com/domaframework/doma-tools-for-intellij/pull/59
-[#60]: https://github.com/domaframework/doma-tools-for-intellij/pull/60
-[#61]: https://github.com/domaframework/doma-tools-for-intellij/pull/61
-[#62]: https://github.com/domaframework/doma-tools-for-intellij/pull/62
-[#64]: https://github.com/domaframework/doma-tools-for-intellij/pull/64
-[#65]: https://github.com/domaframework/doma-tools-for-intellij/pull/65
-[#68]: https://github.com/domaframework/doma-tools-for-intellij/pull/68
-[#69]: https://github.com/domaframework/doma-tools-for-intellij/pull/69
-[#7]: https://github.com/domaframework/doma-tools-for-intellij/pull/7
-[#70]: https://github.com/domaframework/doma-tools-for-intellij/pull/70
-[#78]: https://github.com/domaframework/doma-tools-for-intellij/pull/78
-[#79]: https://github.com/domaframework/doma-tools-for-intellij/pull/79
-[#8]: https://github.com/domaframework/doma-tools-for-intellij/pull/8
-[#80]: https://github.com/domaframework/doma-tools-for-intellij/pull/80
-[#82]: https://github.com/domaframework/doma-tools-for-intellij/pull/82
-[#86]: https://github.com/domaframework/doma-tools-for-intellij/pull/86
-[#87]: https://github.com/domaframework/doma-tools-for-intellij/pull/87
-[#88]: https://github.com/domaframework/doma-tools-for-intellij/pull/88
-[#89]: https://github.com/domaframework/doma-tools-for-intellij/pull/89
-[#9]: https://github.com/domaframework/doma-tools-for-intellij/pull/9
-[#90]: https://github.com/domaframework/doma-tools-for-intellij/pull/90
-[#91]: https://github.com/domaframework/doma-tools-for-intellij/pull/91
-[#92]: https://github.com/domaframework/doma-tools-for-intellij/pull/92
-[#93]: https://github.com/domaframework/doma-tools-for-intellij/pull/93
-[#94]: https://github.com/domaframework/doma-tools-for-intellij/pull/94
-[#95]: https://github.com/domaframework/doma-tools-for-intellij/pull/95
-[#96]: https://github.com/domaframework/doma-tools-for-intellij/pull/96
+[Unreleased]: https://github.com/domaframework/doma-tools-for-intellij/commits/main
+[0.3.0]: https://github.com/domaframework/doma-tools-for-intellij/compare/v0.3.0
+[0.3.1]: https://github.com/domaframework/doma-tools-for-intellij/compare/v0.3.0...0.3.1
+[0.3.2]: https://github.com/domaframework/doma-tools-for-intellij/compare/0.3.1...0.3.2
+[0.4.0]: https://github.com/domaframework/doma-tools-for-intellij/compare/0.3.2...0.4.0
+[0.5.0]: https://github.com/domaframework/doma-tools-for-intellij/compare/0.4.0...0.5.0

build.gradle.kts

@@ -98,7 +98,7 @@ dependencies {
 
 intellijPlatform {
     pluginConfiguration {
-        version = providers.gradleProperty("pluginVersion")
+        version = providers.gradleProperty("pluginVersion").map { it.substringBefore('-', "") }
         description =
             providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {
                 val start = "<!-- Plugin description -->"
@@ -114,16 +114,19 @@ intellijPlatform {
 
         val changelog = project.changelog
         changeNotes =
-            providers.gradleProperty("pluginVersion").map { pluginVersion ->
-                with(changelog) {
-                    renderItem(
-                        (getOrNull(pluginVersion) ?: getUnreleased())
-                            .withHeader(false)
-                            .withEmptySections(false),
-                        Changelog.OutputType.HTML,
-                    )
+            providers
+                .gradleProperty("pluginVersion")
+                .map { it.substringBefore('-', "") }
+                .map { pluginVersion ->
+                    with(changelog) {
+                        renderItem(
+                            (getOrNull(pluginVersion) ?: getUnreleased())
+                                .withHeader(false)
+                                .withEmptySections(false),
+                            Changelog.OutputType.HTML,
+                        )
+                    }
                 }
-            }
 
         ideaVersion {
             sinceBuild = providers.gradleProperty("pluginSinceBuild")
@@ -138,9 +141,12 @@ intellijPlatform {
     }
 
     publishing {
+        // TODO: During release, refrain from reformatting the version number.
+        //  Instead, set the release version before tagging to allow releases to any chosen channel.
         token = providers.environmentVariable("PUBLISH_TOKEN")
-        channels =
-            providers.gradleProperty("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
+        version =
+            providers.gradleProperty("pluginVersion").map { it.substringBefore('-', "") }
+        channels = listOf("default")
     }
 
     pluginVerification {