Skip to content

Commit a6ff54b

Browse files
committed
Fix CI
1 parent f6ba00b commit a6ff54b

File tree

4 files changed

+30
-27
lines changed

4 files changed

+30
-27
lines changed

.github/workflows/gradle.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,23 @@ jobs:
1212
env:
1313
# see https://www.jetbrains.com/idea/download/previous.html
1414
# and https://www.jetbrains.com/intellij-repository/snapshots/
15-
- IDEA_VERSION: IU-2022.2
16-
KOTLIN_VERSION: 1.6.21
15+
#- IDEA_VERSION: IU-2022.3
16+
# KOTLIN_VERSION: 1.7.22
1717
#- IDEA_VERSION: IU-2023.1
1818
# KOTLIN_VERSION: 1.8.0
1919
- IDEA_VERSION: IU-2023.3.3
2020
KOTLIN_VERSION: 1.9.10
21-
- IDEA_VERSION: IU-LATEST-EAP-SNAPSHOT
22-
KOTLIN_VERSION: 1.9.10
21+
- IDEA_VERSION: IU-251.23774.318
22+
KOTLIN_VERSION: 2.1.0
2323

2424
steps:
25-
- uses: actions/checkout@v1
25+
- uses: actions/checkout@v4
2626
- name: Set up JDK 17
27-
uses: actions/setup-java@v1
27+
uses: actions/setup-java@v4
2828
with:
2929
java-version: 17
30+
distribution: temurin
31+
3032
- name: Build with Gradle
3133
run: ./gradlew build -PideaVersion=${IDEA_VERSION} -PkotlinVersion=${KOTLIN_VERSION}
3234
env: ${{ matrix.env }}
@@ -35,7 +37,7 @@ jobs:
3537
run: cd build/distributions && unzip -d tmp pebble-intellij-next-SNAPSHOT.zip
3638

3739
- name: Archive distribution artifact
38-
uses: actions/upload-artifact@v3
40+
uses: actions/upload-artifact@v4
3941
with:
4042
name: "pebble-intellij-development"
4143
path: build/distributions/tmp

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
VERSION_SUFFIX: ""
3232

3333
steps:
34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3535
- name: Set up JDK 17
36-
uses: actions/setup-java@v3
36+
uses: actions/setup-java@v4
3737
with:
3838
java-version: 17
3939
distribution: temurin

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ buildscript {
1919
}
2020

2121
plugins {
22-
id("org.jetbrains.intellij.platform") version "2.2.0"
22+
id("org.jetbrains.intellij.platform") version "2.5.0"
2323
id("org.sonarqube") version "4.3.0.3225"
2424
kotlin("jvm")
2525
jacoco
@@ -45,6 +45,7 @@ project(":") {
4545
create(ideaVersion)
4646

4747
bundledPlugins("com.intellij.spring", "com.intellij.spring.boot", "com.intellij.java", "org.intellij.intelliLang")
48+
testFramework(TestFrameworkType.Platform)
4849
testFramework(TestFrameworkType.Plugin.Java)
4950
}
5051

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
package com.intellij.spring.boot.application.metadata
2-
3-
import com.intellij.psi.PsiFile
4-
5-
/**
6-
* Dummy class to fix an exception when running tests.
7-
* [See this issue](https://youtrack.jetbrains.com/issue/IDEA-318652/Spring-tests-of-custom-plugin-depending-on-Spring-cannot-find-TestSpringBootMetadataEditorNotificationsService)
8-
*/
9-
@Suppress("unused")
10-
class TestSpringBootMetadataEditorNotificationsService : SpringBootMetadataEditorNotificationsService {
11-
override fun updateData(psiFile: PsiFile) {
12-
}
13-
14-
override fun isApplicable(): Boolean {
15-
return false
16-
}
17-
}
1+
//package com.intellij.spring.boot.application.metadata
2+
//
3+
//import com.intellij.psi.PsiFile
4+
//
5+
///**
6+
// * Dummy class to fix an exception when running tests.
7+
// * [See this issue](https://youtrack.jetbrains.com/issue/IDEA-318652/Spring-tests-of-custom-plugin-depending-on-Spring-cannot-find-TestSpringBootMetadataEditorNotificationsService)
8+
// */
9+
//@Suppress("unused")
10+
//class TestSpringBootMetadataEditorNotificationsService : SpringBootMetadataEditorNotificationsService {
11+
// override fun updateData(psiFile: PsiFile) {
12+
// }
13+
//
14+
// override fun isApplicable(): Boolean {
15+
// return false
16+
// }
17+
//}

0 commit comments

Comments
 (0)