Skip to content

Commit c9ada08

Browse files
WhiteMemory99WhiteMemory99
committed
Update dependencies
1 parent 345abae commit c9ada08

File tree

5 files changed

+47
-32
lines changed

5 files changed

+47
-32
lines changed

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
# Validate wrapper
4949
- name: Gradle Wrapper Validation
50-
uses: gradle/[email protected].4
50+
uses: gradle/[email protected].5
5151

5252
# Setup Java 11 environment for the next steps
5353
- name: Setup Java
@@ -65,18 +65,18 @@ jobs:
6565
VERSION="$(echo "$PROPERTIES" | grep "^version:" | cut -f2- -d ' ')"
6666
NAME="$(echo "$PROPERTIES" | grep "^pluginName:" | cut -f2- -d ' ')"
6767
CHANGELOG="$(./gradlew getChangelog --unreleased --no-header --console=plain -q)"
68-
CHANGELOG="${CHANGELOG//'%'/'%25'}"
69-
CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
70-
CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
71-
echo "::set-output name=version::$VERSION"
72-
echo "::set-output name=name::$NAME"
73-
echo "::set-output name=changelog::$CHANGELOG"
74-
echo "::set-output name=pluginVerifierHomeDir::~/.pluginVerifier"
68+
echo "version=$VERSION" >> $GITHUB_OUTPUT
69+
echo "name=$NAME" >> $GITHUB_OUTPUT
70+
echo "pluginVerifierHomeDir=~/.pluginVerifier" >> $GITHUB_OUTPUT
71+
72+
echo "changelog<<EOF" >> $GITHUB_OUTPUT
73+
echo "$CHANGELOG" >> $GITHUB_OUTPUT
74+
echo "EOF" >> $GITHUB_OUTPUT
7575
./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier
7676
7777
# Run tests
7878
- name: Run Tests
79-
run: ./gradlew test
79+
run: ./gradlew check
8080

8181
# Collect Tests Result of failed tests
8282
- name: Collect Tests Result
@@ -113,7 +113,7 @@ jobs:
113113
cd ${{ github.workspace }}/build/distributions
114114
FILENAME=`ls *.zip`
115115
unzip "$FILENAME" -d content
116-
echo "::set-output name=filename::${FILENAME:0:-4}"
116+
echo "filename=${FILENAME:0:-4}" >> $GITHUB_OUTPUT
117117
# Store already-built plugin as an artifact for downloading
118118
- name: Upload artifact
119119
uses: actions/upload-artifact@v3
@@ -136,15 +136,15 @@ jobs:
136136
- name: Fetch Sources
137137
uses: actions/checkout@v3
138138

139-
# Remove old release drafts by using the curl request for the available releases with draft flag
139+
# Remove old release drafts by using the curl request for the available releases with a draft flag
140140
- name: Remove Old Release Drafts
141141
env:
142142
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
143143
run: |
144144
gh api repos/{owner}/{repo}/releases \
145145
--jq '.[] | select(.draft == true) | .id' \
146146
| xargs -I '{}' gh api -X DELETE repos/{owner}/{repo}/releases/{}
147-
# Create new release draft - which is not publicly visible and requires manual acceptance
147+
# Create a new release draft which is not publicly visible and requires manual acceptance
148148
- name: Create Release Draft
149149
env:
150150
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
CHANGELOG="${CHANGELOG//'%'/'%25'}"
4141
CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
4242
CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
43-
echo "::set-output name=changelog::$CHANGELOG"
43+
echo "changelog=$CHANGELOG" >> $GITHUB_OUTPUT
4444
# Update Unreleased section with the current release note
4545
- name: Patch Changelog
4646
if: ${{ steps.properties.outputs.changelog != '' }}
@@ -68,13 +68,18 @@ jobs:
6868
run: |
6969
VERSION="${{ github.event.release.tag_name }}"
7070
BRANCH="changelog-update-$VERSION"
71+
LABEL="release changelog"
7172
git config user.email "[email protected]"
7273
git config user.name "GitHub Action"
7374
git checkout -b $BRANCH
7475
git commit -am "Changelog update - $VERSION"
7576
git push --set-upstream origin $BRANCH
77+
78+
gh label create "$LABEL" \
79+
--description "Pull requests with release changelog update" \
80+
|| true
7681
gh pr create \
7782
--title "Changelog update - \`$VERSION\`" \
7883
--body "Current pull request contains patched \`CHANGELOG.md\` file for the \`$VERSION\` version." \
79-
--base main \
84+
--label "$LABEL" \
8085
--head $BRANCH

‎build.gradle.kts‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
import org.jetbrains.changelog.Changelog
12
import org.jetbrains.changelog.date
23
import org.jetbrains.changelog.markdownToHTML
34

45
fun properties(key: String) = project.findProperty(key).toString()
56

67
plugins {
7-
id("org.jetbrains.kotlin.jvm") version "1.6.20"
8-
id("org.jetbrains.intellij") version "1.9.0"
9-
id("org.jetbrains.changelog") version "1.3.1"
8+
id("org.jetbrains.kotlin.jvm") version "1.8.0"
9+
id("org.jetbrains.intellij") version "1.12.0"
10+
id("org.jetbrains.changelog") version "2.0.0"
1011
}
1112

1213
group = properties("pluginGroup")
@@ -31,9 +32,9 @@ intellij {
3132
}
3233

3334
changelog {
34-
version.set(properties("pluginVersion"))
3535
header.set(provider { "[${version.get()}] - ${date()}" })
3636
groups.set(emptyList())
37+
repositoryUrl.set(properties("pluginRepositoryUrl"))
3738
}
3839

3940
tasks {
@@ -51,20 +52,26 @@ tasks {
5152
untilBuild.set(properties("pluginUntilBuild"))
5253

5354
changeNotes.set(provider {
54-
changelog.run {
55-
getOrNull(properties("pluginVersion")) ?: getLatest()
56-
}.toHTML()
55+
with(changelog) {
56+
renderItem(
57+
getOrNull(properties("pluginVersion"))
58+
?: runCatching { getLatest() }.getOrElse { getUnreleased() },
59+
Changelog.OutputType.HTML,
60+
)
61+
}
5762
})
5863

59-
pluginDescription.set(file("README.md").readText().lines().run {
60-
val start = "<!-- Plugin description -->"
61-
val end = "<!-- Plugin description end -->"
62-
63-
if (!containsAll(listOf(start, end))) {
64-
throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
65-
}
66-
subList(indexOf(start) + 1, indexOf(end))
67-
}.joinToString("\n").run { markdownToHTML(this) })
64+
pluginDescription.set(
65+
file("README.md").readText().lines().run {
66+
val start = "<!-- Plugin description -->"
67+
val end = "<!-- Plugin description end -->"
68+
69+
if (!containsAll(listOf(start, end))) {
70+
throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
71+
}
72+
subList(indexOf(start) + 1, indexOf(end))
73+
}.joinToString("\n").let { markdownToHTML(it) }
74+
)
6875
}
6976

7077
signPlugin {

‎gradle.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
pluginGroup = space.whitememory.pythoninlayparams
22
pluginName = Python Inlay Params
3+
pluginRepositoryUrl = https://github.com/WhiteMemory99/Intellij-Python-Inlay-Params
4+
35
pluginVersion = 0.3.1
46

57
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
@@ -19,7 +21,7 @@ platformPlugins = PythonCore
1921
javaVersion = 11
2022

2123
# Gradle Releases -> https://github.com/gradle/gradle/releases
22-
gradleVersion = 7.5.1
24+
gradleVersion = 7.6
2325

2426
# Opt-out flag for bundling Kotlin standard library.
2527
# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)