diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f21c8b4..ddb5825 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,5 +32,8 @@ jobs: retention-days: 7 - name: Publish plugins to jetbrains - run: ./gradlew publishPlugin -pPublishToken=${{ secrets.PublishKey }} + shell: cmd + run: ./gradlew publishPlugin -PPublishToken="%PublishKey%" + env: + PublishKey: ${{ secrets.PublishKey }} if: github.event_name != 'pull_request' \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index f09c162..3ddff29 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ import java.io.ByteArrayOutputStream plugins { id("java") alias(libs.plugins.kotlinJvm) - id("org.jetbrains.intellij.platform") version "2.0.0" // See https://github.com/JetBrains/intellij-platform-gradle-plugin/releases + id("org.jetbrains.intellij.platform") version "2.0.1" // See https://github.com/JetBrains/intellij-platform-gradle-plugin/releases id("me.filippov.gradle.jvm.wrapper") version "0.14.0" } @@ -80,7 +80,7 @@ val setBuildTool by tasks.registering { } } - args.add("${DotnetSolution}") + args.add(DotnetSolution) args.add("/p:Configuration=${BuildConfiguration}") args.add("/p:HostFullIdentifier=") extra["args"] = args @@ -93,6 +93,7 @@ val compileDotNet by tasks.registering { val executable: String by setBuildTool.get().extra val arguments = (setBuildTool.get().extra["args"] as List).toMutableList() arguments.add("/t:Restore;Rebuild") + exec { executable(executable) args(arguments) @@ -105,7 +106,7 @@ val testDotNet by tasks.registering { doLast { exec { executable("dotnet") - args("test","${DotnetSolution}","--logger","GitHubActions") + args("test", DotnetSolution,"--logger","GitHubActions") workingDir(rootDir) } } @@ -131,6 +132,7 @@ tasks.buildPlugin { arguments.add("/p:PackageOutputPath=${rootDir}/output") arguments.add("/p:PackageReleaseNotes=${changeNotes}") arguments.add("/p:PackageVersion=${version}") + exec { executable(executable) args(arguments) @@ -193,12 +195,12 @@ tasks.prepareSandbox { tasks.publishPlugin { // dependsOn(testDotNet) dependsOn(tasks.buildPlugin) - token.set("${PublishToken}") + token.set(PublishToken) doLast { exec { executable("dotnet") - args("nuget","push","output/${DotnetPluginId}.${version}.nupkg","--api-key","${PublishToken}","--source","https://plugins.jetbrains.com") + args("nuget","push","output/${DotnetPluginId}.${version}.nupkg","--api-key", PublishToken,"--source","https://plugins.jetbrains.com") workingDir(rootDir) } } diff --git a/gradle.properties b/gradle.properties index ad72c2e..e325338 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ PublishToken="_PLACEHOLDER_" # EAP: 2020.3-EAP2-SNAPSHOT # Nightly: 2020.3-SNAPSHOT ProductVersion=2024.2 -PluginVersion=2024.2.0 +PluginVersion=2024.2.1 # Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE # https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default diff --git a/src/dotnet/Plugin.props b/src/dotnet/Plugin.props index 9702e67..359bec6 100644 --- a/src/dotnet/Plugin.props +++ b/src/dotnet/Plugin.props @@ -1,6 +1,6 @@ - 2024.2.0 + 2024.2.1 CleanCode Automates some of the concepts in Uncle Bob's Clean Code book Martin Oehlert, Hadi Hariri, Matt Ellis