Update intellij-platform-plugin to 2.0.0-beta2

apollographql · May 14, 2024 · 59c9233 · 59c9233
1 parent df143e4
commit 59c9233
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/gradle/libraries.toml b/gradle/libraries.toml
@@ -120,7 +120,7 @@ http4k-bom = "org.http4k:http4k-bom:5.8.0.0"
 http4k-core = { module = "org.http4k:http4k-core" }
 http4k-server-undertow = { module = "org.http4k:http4k-server-undertow" }
 http4k-server-jetty = { module = "org.http4k:http4k-server-jetty" }
-intellij-platform-plugin = "org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.0.0-beta1"
+intellij-platform-plugin = "org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.0.0-beta2"
 intellij-changelog = "org.jetbrains.intellij.plugins:gradle-changelog-plugin:2.0.0"
 jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }

diff --git a/intellij-plugin/build.gradle.kts b/intellij-plugin/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.changelog.markdownToHTML
-import org.jetbrains.intellij.platform.gradle.extensions.TestFrameworkType
-import org.jetbrains.intellij.platform.gradle.tasks.RunIdeTask
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.tasks.CustomRunIdeTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 import java.net.URL
 import java.text.SimpleDateFormat
@@ -45,7 +45,7 @@ fun getSnapshotVersionSuffix(): String {
 // Set the JVM language level used to build project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
 kotlin {
   jvmToolchain {
-    (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(properties("javaVersion").toInt()))
+    languageVersion = JavaLanguageVersion.of(17)
   }
 }
 
@@ -56,7 +56,7 @@ tasks {
     }
   }
 
-  withType<RunIdeTask> {
+  withType<CustomRunIdeTask> {
     // Enables debug logging for the plugin
     systemProperty("idea.log.debug.categories", "Apollo")
 
@@ -67,7 +67,7 @@ tasks {
     // systemProperty("idea.is.internal", "false")
   }
 
-  val runLocalIde by registering(RunIdeTask::class) {
+  val runLocalIde by registering(CustomRunIdeTask::class) {
     // Use a custom IJ/AS installation. Set this property in your local ~/.gradle/gradle.properties file.
     // (for AS, it should be something like '/Applications/Android Studio.app/Contents')
     // See https://plugins.jetbrains.com/docs/intellij/android-studio.html#configuring-the-plugin-gradle-build-script

diff --git a/intellij-plugin/gradle.properties b/intellij-plugin/gradle.properties
@@ -17,7 +17,7 @@ platformType=IC
 # Corresponds to AS Iguana 2023.2.1 -> https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html
 # and https://developer.android.com/studio/archive (more up to date)
 # See also https://plugins.jetbrains.com/docs/intellij/android-studio.html
-platformVersion=232.10227.8
+platformVersion=2023.2.5
 
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
@@ -26,9 +26,6 @@ platformVersion=232.10227.8
 platformBundledPlugins=com.intellij.java, org.jetbrains.kotlin, com.intellij.gradle, org.jetbrains.android, org.toml.lang
 platformPlugins=com.intellij.lang.jsgraphql:4.0.2
 
-# JVM language level used to build project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
-javaVersion=17
-
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
 # suppress inspection "UnusedProperty"