Skip to content

Commit ab06d3d

Browse files
committed
Merge branch 'release/1.2.28'
2 parents 1465fef + 7b37301 commit ab06d3d

File tree

7 files changed

+65
-15
lines changed

7 files changed

+65
-15
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373

7474
# Setup Gradle
7575
- name: Setup Gradle
76-
uses: gradle/gradle-build-action@v2.10.0
76+
uses: gradle/gradle-build-action@v2.12.0
7777

7878
# Set environment variables
7979
- name: Export Properties
@@ -122,7 +122,7 @@ jobs:
122122
123123
# Store already-built plugin as an artifact for downloading
124124
- name: Upload artifact
125-
uses: actions/upload-artifact@v3.1.3
125+
uses: actions/upload-artifact@v4.3.0
126126
with:
127127
name: ${{ steps.artifact.outputs.filename }}
128128
path: ./build/distributions/content/*/*
@@ -147,7 +147,7 @@ jobs:
147147

148148
# Setup Gradle
149149
- name: Setup Gradle
150-
uses: gradle/gradle-build-action@v2.10.0
150+
uses: gradle/gradle-build-action@v2.12.0
151151

152152
# Run tests
153153
- name: Run Tests
@@ -156,14 +156,14 @@ jobs:
156156
# Collect Tests Result of failed tests
157157
- name: Collect Tests Result
158158
if: ${{ failure() }}
159-
uses: actions/upload-artifact@v3.1.3
159+
uses: actions/upload-artifact@v4.3.0
160160
with:
161161
name: tests-result
162162
path: ${{ github.workspace }}/build/reports/tests
163163

164164
# Upload Kover report to CodeCov
165165
- name: Upload Code Coverage Report
166-
uses: codecov/codecov-action@v3.1.4
166+
uses: codecov/codecov-action@v3.1.5
167167
with:
168168
files: ${{ github.workspace }}/build/reports/kover/xml/report.xml
169169

@@ -191,7 +191,7 @@ jobs:
191191

192192
# Run Qodana inspections
193193
- name: Qodana - Code Inspection
194-
uses: JetBrains/qodana-action@v2023.2.9
194+
uses: JetBrains/qodana-action@v2023.3.1
195195
with:
196196
cache-default-branch-only: true
197197

@@ -220,11 +220,11 @@ jobs:
220220

221221
# Setup Gradle
222222
- name: Setup Gradle
223-
uses: gradle/gradle-build-action@v2.10.0
223+
uses: gradle/gradle-build-action@v2.12.0
224224

225225
# Cache Plugin Verifier IDEs
226226
- name: Setup Plugin Verifier IDEs Cache
227-
uses: actions/cache@v3.3.2
227+
uses: actions/cache@v4.0.0
228228
with:
229229
path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
230230
key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
@@ -236,7 +236,7 @@ jobs:
236236
# Collect Plugin Verifier Result
237237
- name: Collect Plugin Verifier Result
238238
if: ${{ always() }}
239-
uses: actions/upload-artifact@v3.1.3
239+
uses: actions/upload-artifact@v4.3.0
240240
with:
241241
name: pluginVerifier-result
242242
path: ${{ github.workspace }}/build/reports/pluginVerifier

.github/workflows/git-flow.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Name of the workflow
2+
name: Git Flow
3+
4+
# Defines the event that triggers the workflow
5+
on:
6+
push:
7+
branches:
8+
- 'feature/*' # Trigger for pushes to feature branches
9+
- 'bugfix/*' # Trigger for pushes to bugfix branches
10+
- 'release/*' # Trigger for pushes to release branches
11+
- 'hotfix/*' # Trigger for pushes to hotfix branches
12+
13+
# Jobs are a set of steps that execute on the same runner
14+
jobs:
15+
create-pull-request:
16+
# Specifies the runner environment, using the latest Ubuntu
17+
runs-on: ubuntu-latest
18+
name: Create Pull Request
19+
permissions: write-all
20+
21+
# Steps are individual tasks that run commands in a job
22+
steps:
23+
# Checks out the repository code under $GITHUB_WORKSPACE, so the job can access it
24+
- name: Checkout Repository Code
25+
uses: actions/checkout@v4.1.1
26+
27+
# This step uses the Git Flow Action to create PRs based on branch types
28+
- name: Execute Git Flow Action
29+
uses: nekofar/git-flow-action@develop # Specifies the Git Flow Action to use and the branch
30+
with:
31+
# The GitHub Token for authentication with GitHub API
32+
github-token: ${{ secrets.GITHUB_TOKEN }}
33+
# The branch to target for release and hotfix PRs
34+
master-branch: 'master'
35+
# The branch to target for feature and bugfix PRs
36+
develop-branch: 'develop'
37+
# Prefix for feature branches
38+
feature-prefix: 'feature/'
39+
# Prefix for bugfix branches
40+
bugfix-prefix: 'bugfix/'
41+
# Prefix for release branches
42+
release-prefix: 'release/'
43+
# Prefix for hotfix branches
44+
hotfix-prefix: 'hotfix/'

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
# Setup Gradle
3535
- name: Setup Gradle
36-
uses: gradle/gradle-build-action@v2.10.0
36+
uses: gradle/gradle-build-action@v2.12.0
3737

3838
# Publish the plugin to the Marketplace
3939
- name: Publish Plugin

.github/workflows/run-ui-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Setup Gradle
4646
- name: Setup Gradle
47-
uses: gradle/gradle-build-action@v2.10.0
47+
uses: gradle/gradle-build-action@v2.12.0
4848

4949
# Run IDEA prepared for UI testing
5050
- name: Run IDE

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
6+
## [1.2.28] - 2024-01-28
7+
8+
### Bug Fixes
9+
10+
- Solve some minor issues and update dependencies
11+
612
## [1.2.27] - 2023-12-12
713

814
### Bug Fixes

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ pluginName = IntelliJ Next.js Plugin
55
pluginRepositoryUrl = https://github.com/nekofar/intellij-nextjs
66

77
# SemVer format -> https://semver.org
8-
pluginVersion = 1.2.27
8+
pluginVersion = 1.2.28
99

1010
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
1111
pluginSinceBuild = 222
1212
pluginUntilBuild = 222.*
1313

1414
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
1515
platformType = IU
16-
platformVersion = 2022.2
16+
platformVersion = 2023.1
1717

1818
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1919
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
annotations = "24.1.0"
44

55
# plugins
6-
kotlin = "1.9.21"
6+
kotlin = "1.9.22"
77
changelog = "2.2.0"
8-
gradleIntelliJPlugin = "1.16.1"
8+
gradleIntelliJPlugin = "1.17.0"
99
qodana = "0.1.13"
1010
kover = "0.7.5"
1111

0 commit comments

Comments
 (0)