Skip to content

Commit af08f20

Browse files
authored
Merge pull request #54 from bentemple/support_intelli-j_2022.1
Update to support latest version of Intelli-J 2022.1
2 parents 5c5ce5a + 5f54733 commit af08f20

File tree

6 files changed

+34
-17
lines changed

6 files changed

+34
-17
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ jobs:
3535

3636
# Check out current repository
3737
- name: Fetch Sources
38-
uses: actions/checkout@v2.4.0
38+
uses: actions/checkout@v3
3939

4040
# Validate wrapper
4141
- name: Gradle Wrapper Validation
4242
uses: gradle/wrapper-validation-action@v1.0.4
4343

4444
# Setup Java 11 environment for the next steps
4545
- name: Setup Java
46-
uses: actions/setup-java@v2
46+
uses: actions/setup-java@v3
4747
with:
4848
distribution: zulu
4949
java-version: 11
@@ -76,7 +76,7 @@ jobs:
7676
# Collect Tests Result of failed tests
7777
- name: Collect Tests Result
7878
if: ${{ failure() }}
79-
uses: actions/upload-artifact@v2
79+
uses: actions/upload-artifact@v3
8080
with:
8181
name: tests-result
8282
path: ${{ github.workspace }}/build/reports/tests
@@ -102,11 +102,11 @@ jobs:
102102

103103
# Run Qodana inspections
104104
- name: Qodana - Code Inspection
105-
uses: JetBrains/qodana-action@v2.1-eap
105+
uses: JetBrains/qodana-action@v5.1.0
106106

107107
# Collect Qodana Result
108108
- name: Collect Qodana Result
109-
uses: actions/upload-artifact@v2
109+
uses: actions/upload-artifact@v3
110110
with:
111111
name: qodana-result
112112
path: ${{ github.workspace }}/qodana
@@ -136,6 +136,8 @@ jobs:
136136
if: github.event_name != 'pull_request'
137137
needs: build
138138
runs-on: ubuntu-latest
139+
permissions:
140+
contents: write
139141
steps:
140142

141143
# Check out current repository

.github/workflows/release.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,20 @@ jobs:
1212
release:
1313
name: Publish Plugin
1414
runs-on: ubuntu-latest
15+
permissions:
16+
contents: write
17+
pull-requests: write
1518
steps:
1619

1720
# Check out current repository
1821
- name: Fetch Sources
19-
uses: actions/checkout@v2.4.0
22+
uses: actions/checkout@v3
2023
with:
2124
ref: ${{ github.event.release.tag_name }}
2225

2326
# Setup Java 11 environment for the next steps
2427
- name: Setup Java
25-
uses: actions/setup-java@v2
28+
uses: actions/setup-java@v3
2629
with:
2730
distribution: zulu
2831
java-version: 11

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ jobs:
3333

3434
# Check out current repository
3535
- name: Fetch Sources
36-
uses: actions/checkout@v2.4.0
36+
uses: actions/checkout@v3
3737

3838
# Setup Java 11 environment for the next steps
3939
- name: Setup Java
40-
uses: actions/setup-java@v2
40+
uses: actions/setup-java@v3
4141
with:
4242
distribution: zulu
4343
java-version: 11

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
# Kotlin Function Arguments Helper Changelog
44

55
## [Unreleased]
6+
### Changed
7+
- imported changes from yet unsubmitted PR [IntelliJ Platform Plugin Template#Next](https://github.com/JetBrains/intellij-platform-plugin-template/pull/240/files)
8+
- upgraded
9+
- Update `platformVersion` to `2021.2.4`
10+
- Change since/until build to `212-221.*` (2021.2 - 2022.1)
11+
- Dependencies - upgrade `org.jetbrains.intellij` to `1.6.0`
12+
- Dependencies - upgrade `org.jetbrains.kotlin.jvm` to `1.6.21`
13+
- Dependencies (GitHub Actions) - upgrade `actions/checkout` to `3`
14+
- Dependencies (GitHub Actions) - upgrade `actions/cache` to `3`
15+
- Dependencies (GitHub Actions) - upgrade `actions/setup-java` to `3`
16+
- Dependencies (GitHub Actions) - upgrade `actions/upload-artifact` to `3`
17+
- Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `5.1.0`
618

719
## [2021.3.0]
820
### Added

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ plugins {
77
// Java support
88
id("java")
99
// Kotlin support
10-
id("org.jetbrains.kotlin.jvm") version "1.6.0"
10+
id("org.jetbrains.kotlin.jvm") version "1.6.10"
1111
// Gradle IntelliJ Plugin
12-
id("org.jetbrains.intellij") version "1.3.0"
12+
id("org.jetbrains.intellij") version "1.4.0"
1313
// Gradle Changelog Plugin
1414
id("org.jetbrains.changelog") version "1.3.1"
1515
// Gradle Qodana Plugin

gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
pluginGroup = com.github.developerutils.kotlin-function-arguments-helper
55
pluginName = Kotlin Function Arguments Helper
66
# SemVer format -> https://semver.org
7-
pluginVersion = 2021.3.0
7+
pluginVersion = 2022.1.0
88

99
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
1010
# for insight into build numbers and IntelliJ Platform versions.
11-
pluginSinceBuild = 203
12-
pluginUntilBuild = 213.*
11+
pluginSinceBuild = 212
12+
pluginUntilBuild = 221.*
1313
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
1414
# See https://jb.gg/intellij-platform-builds-list for available build versions
15-
pluginVerifierIdeVersions = IC-2020.3.4, IC-2021.3
15+
pluginVerifierIdeVersions = IC-2021.2.4
1616

1717
# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
1818
platformType = IC
19-
platformVersion = 2020.3.4
19+
platformVersion = 2021.2.4
2020
platformDownloadSources = true
2121

2222
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
@@ -27,7 +27,7 @@ platformPlugins = com.intellij.java, org.jetbrains.kotlin
2727
javaVersion = 11
2828

2929
# Gradle Releases -> https://github.com/gradle/gradle/releases
30-
gradleVersion = 7.3
30+
gradleVersion = 7.4.2
3131

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

0 commit comments

Comments
 (0)