Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more fixes #227

Merged
merged 22 commits into from
Aug 21, 2024
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
12 changes: 7 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down Expand Up @@ -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
Expand All @@ -93,6 +93,7 @@ val compileDotNet by tasks.registering {
val executable: String by setBuildTool.get().extra
val arguments = (setBuildTool.get().extra["args"] as List<String>).toMutableList()
arguments.add("/t:Restore;Rebuild")

exec {
executable(executable)
args(arguments)
Expand All @@ -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)
}
}
Expand All @@ -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)
Expand Down Expand Up @@ -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)
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet/Plugin.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<SdkVersion>2024.2.0</SdkVersion>
<SdkVersion>2024.2.1</SdkVersion>
<Title>CleanCode</Title>
<Description>Automates some of the concepts in Uncle Bob's Clean Code book</Description>
<Authors>Martin Oehlert, Hadi Hariri, Matt Ellis</Authors>
Expand Down
Loading