User: rednesto
Date: 14 Oct 23 08:31
Revision: ec2b1f37b9625ac40107ae15219c9ca7bc6cf7e0
Summary:
Fix compatibility issues with latest EAP


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8811&personal=false

Index: gradle.properties
===================================================================
--- gradle.properties	(revision 3b9a30b16812eec182619ddb24a213f6eceedb26)
+++ gradle.properties	(revision ec2b1f37b9625ac40107ae15219c9ca7bc6cf7e0)
@@ -21,13 +21,13 @@
 # suppress inspection "UnusedProperty" for whole file
 kotlin.code.style=official
 
-ideaVersion = 233-EAP-SNAPSHOT
+ideaVersion = 233.9802.14-EAP-SNAPSHOT
 ideaVersionName = 2023.3
 
 coreVersion = 1.6.10
 downloadIdeaSources = true
 
-pluginTomlVersion = 233.6745.297
+pluginTomlVersion = 233.9802.6
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision 3b9a30b16812eec182619ddb24a213f6eceedb26)
+++ gradle/libs.versions.toml	(revision ec2b1f37b9625ac40107ae15219c9ca7bc6cf7e0)
@@ -18,8 +18,8 @@
 grammarKit = "org.jetbrains.idea:grammar-kit:1.5.1"
 
 # Gradle Tooling
-gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:233-EAP-SNAPSHOT"
-annotations = "org.jetbrains:annotations:23.0.0"
+gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:233.9802.14-EAP-SNAPSHOT"
+annotations = "org.jetbrains:annotations:24.0.0"
 groovy = "org.codehaus.groovy:groovy-all:2.5.18"
 
 asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
Index: src/main/kotlin/facet/MinecraftFacetEditorTab.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacetEditorTab.kt	(revision 3b9a30b16812eec182619ddb24a213f6eceedb26)
+++ src/main/kotlin/facet/MinecraftFacetEditorTab.kt	(revision ec2b1f37b9625ac40107ae15219c9ca7bc6cf7e0)
@@ -24,7 +24,7 @@
 import com.demonwav.mcdev.asset.PlatformAssets
 import com.demonwav.mcdev.platform.PlatformType
 import com.intellij.facet.ui.FacetEditorTab
-import com.intellij.util.ui.StartupUiUtil
+import com.intellij.ui.JBColor
 import javax.swing.JCheckBox
 import javax.swing.JComponent
 import javax.swing.JLabel
@@ -102,7 +102,7 @@
     }
 
     override fun createComponent(): JComponent {
-        if (StartupUiUtil.isDarkTheme) {
+        if (!JBColor.isBright()) {
             spongeIcon.icon = PlatformAssets.SPONGE_ICON_2X_DARK
             mcpIcon.icon = PlatformAssets.MCP_ICON_2X_DARK
             mixinIcon.icon = PlatformAssets.MIXIN_ICON_2X_DARK
Index: src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt	(revision 3b9a30b16812eec182619ddb24a213f6eceedb26)
+++ src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt	(revision ec2b1f37b9625ac40107ae15219c9ca7bc6cf7e0)
@@ -27,12 +27,12 @@
 import com.intellij.openapi.observable.properties.GraphProperty
 import com.intellij.openapi.observable.properties.PropertyGraph
 import com.intellij.openapi.observable.util.not
+import com.intellij.ui.JBColor
 import com.intellij.ui.dsl.builder.Panel
 import com.intellij.ui.dsl.builder.Row
 import com.intellij.ui.dsl.builder.RowLayout
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.panel
-import com.intellij.util.ui.StartupUiUtil
 import javax.swing.Icon
 import javax.swing.JComponent
 import javax.swing.JLabel
@@ -84,7 +84,7 @@
                 { afterChange { _ -> all(this, bukkit.auto, spigot.auto)(bukkit, spigot, paper) } },
             )
 
-            val isDarkMode = StartupUiUtil.isDarkTheme
+            val isDarkMode = !JBColor.isBright()
             val spongeIcon = if (isDarkMode) PlatformAssets.SPONGE_ICON_2X_DARK else PlatformAssets.SPONGE_ICON_2X
             createRow(sponge, "Sponge", spongeIcon)
 
Index: src/main/kotlin/insight/generation/ui/EventListenerWizard.kt
===================================================================
--- src/main/kotlin/insight/generation/ui/EventListenerWizard.kt	(revision 3b9a30b16812eec182619ddb24a213f6eceedb26)
+++ src/main/kotlin/insight/generation/ui/EventListenerWizard.kt	(revision ec2b1f37b9625ac40107ae15219c9ca7bc6cf7e0)
@@ -23,8 +23,8 @@
 import com.intellij.ide.highlighter.JavaHighlightingColors
 import com.intellij.openapi.editor.ex.util.EditorUtil
 import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy
+import com.intellij.ui.JBColor
 import com.intellij.uiDesigner.core.GridConstraints
-import com.intellij.util.ui.StartupUiUtil
 import javax.swing.JLabel
 import javax.swing.JPanel
 import javax.swing.JSeparator
@@ -42,7 +42,7 @@
         classNameTextField.font = EditorUtil.getEditorFont()
         listenerNameTextField.font = EditorUtil.getEditorFont()
         publicVoidLabel.font = EditorUtil.getEditorFont()
-        if (StartupUiUtil.isDarkTheme) {
+        if (!JBColor.isBright()) {
             publicVoidLabel.foreground = JavaHighlightingColors.KEYWORD.defaultAttributes.foregroundColor
         } else {
             publicVoidLabel.foreground =
Index: src/main/kotlin/platform/AbstractModuleType.kt
===================================================================
--- src/main/kotlin/platform/AbstractModuleType.kt	(revision 3b9a30b16812eec182619ddb24a213f6eceedb26)
+++ src/main/kotlin/platform/AbstractModuleType.kt	(revision ec2b1f37b9625ac40107ae15219c9ca7bc6cf7e0)
@@ -32,7 +32,7 @@
 import com.intellij.psi.PsiFile
 import java.awt.Color
 import javax.swing.Icon
-import org.apache.commons.lang.builder.ToStringBuilder
+import org.apache.commons.lang3.builder.ToStringBuilder
 
 abstract class AbstractModuleType<out T : AbstractModule>(val groupId: String, val artifactId: String) {
 
@@ -61,7 +61,7 @@
             return
         }
         val manager = EntryPointsManager.getInstance(project)
-        val annotations = (manager as? EntryPointsManagerBase)?.ADDITIONAL_ANNOTATIONS as? MutableList<String> ?: return
+        val annotations = (manager as? EntryPointsManagerBase)?.customAdditionalAnnotations ?: return
         ignoredAnnotations.asSequence()
             .filter { annotation -> !annotations.contains(annotation) }
             .forEach { annotations.add(it) }
Index: src/main/kotlin/platform/mcp/actions/SrgActionBase.kt
===================================================================
--- src/main/kotlin/platform/mcp/actions/SrgActionBase.kt	(revision 3b9a30b16812eec182619ddb24a213f6eceedb26)
+++ src/main/kotlin/platform/mcp/actions/SrgActionBase.kt	(revision ec2b1f37b9625ac40107ae15219c9ca7bc6cf7e0)
@@ -41,7 +41,7 @@
 import com.intellij.ui.awt.RelativePoint
 import java.awt.Point
 import javax.swing.JComponent
-import org.apache.commons.lang.StringEscapeUtils
+import org.apache.commons.text.StringEscapeUtils
 
 abstract class SrgActionBase : AnAction() {
 
@@ -119,7 +119,7 @@
         }
 
         fun showSuccessBalloon(editor: Editor, element: PsiElement, text: String) {
-            val escapedText = StringEscapeUtils.escapeHtml(text)
+            val escapedText = StringEscapeUtils.escapeHtml4(text)
             val balloon = JBPopupFactory.getInstance()
                 .createHtmlTextBalloonBuilder(escapedText, null, LightColors.SLIGHTLY_GREEN, null)
                 .setHideOnAction(true)