From d046198886440cacdc4dfe53b2474c9c6ac2674e Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Thu, 1 Dec 2022 10:16:49 +0100 Subject: [PATCH 1/4] Update IntelliJ to 2022.3 --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f067f389..c600c9c8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,7 +27,7 @@ intellij { // see https://www.jetbrains.com/intellij-repository/releases/ // and https://www.jetbrains.com/intellij-repository/snapshots/ - version.set("2022.2") + version.set("2022.3") type.set("IU") downloadSources.set(!System.getenv().containsKey("CI")) @@ -37,7 +37,7 @@ intellij { // Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 // // com.dmarcotte.handlebars: see https://plugins.jetbrains.com/plugin/6884-handlebars-mustache/versions - plugins.set(listOf("JavaScriptLanguage", "CSS", "yaml", "com.dmarcotte.handlebars:222.3345.108")) + plugins.set(listOf("JavaScript", "com.intellij.css", "yaml", "com.dmarcotte.handlebars:223.7571.117")) sandboxDir.set(project.rootDir.canonicalPath + "/.sandbox") } From 005e09a83b625cd863ca61fad4b17f8fc05851bc Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Thu, 1 Dec 2022 10:27:39 +0100 Subject: [PATCH 2/4] EmberGotoClassContributor: Adjust method signature to match parent class --- .../kotlin/com/emberjs/navigation/EmberGotoClassContributor.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/emberjs/navigation/EmberGotoClassContributor.kt b/src/main/kotlin/com/emberjs/navigation/EmberGotoClassContributor.kt index 015a230b..91fb6aa9 100644 --- a/src/main/kotlin/com/emberjs/navigation/EmberGotoClassContributor.kt +++ b/src/main/kotlin/com/emberjs/navigation/EmberGotoClassContributor.kt @@ -17,7 +17,7 @@ import com.intellij.util.indexing.FindSymbolParameters.searchScopeFor class EmberGotoClassContributor : GotoClassContributor { private val iconProvider by lazy { EmberIconProvider() } - override fun getQualifiedName(item: NavigationItem?): String? { + override fun getQualifiedName(item: NavigationItem): String? { if (item is DelegatingNavigationItem) { return item.presentation?.presentableText?.replace("-", qualifiedNameSeparator) } From 4a7e19eaa608ff3d629ccce6e4f27f56063bb0f2 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Thu, 1 Dec 2022 10:27:17 +0100 Subject: [PATCH 3/4] Gradle: Update JVM target versions This addresses a build warning from the IntelliJ plugin --- build.gradle.kts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c600c9c8..668e84cf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -43,13 +43,12 @@ intellij { } tasks { - // Set the compatibility versions to 1.8 withType { - sourceCompatibility = "1.8" - targetCompatibility = "1.8" + sourceCompatibility = "17" + targetCompatibility = "17" } withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" } publishPlugin { From 943fa18b29a42d5f702b36429c191d50e34f0801 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Thu, 1 Dec 2022 10:37:36 +0100 Subject: [PATCH 4/4] CI: Update Java version --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23789266..d5539534 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/setup-java@v3.6.0 with: - java-version: '11' + java-version: '17' distribution: 'zulu' - run: ./gradlew assemble diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96da5a83..eff89700 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-java@v3.6.0 with: - java-version: '11' + java-version: '17' distribution: 'zulu' - run: ./gradlew buildPlugin