User: rednesto
Date: 03 Jun 24 17:00
Revision: 5e2ef33df213f57e0118f26b70d5fb9f03ed42bd
Summary:
Fix deprecation/internal usages


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

Index: gradle.properties
===================================================================
--- gradle.properties	(revision 40e5528e15c9cde85db028dfc13c1ec293b7327f)
+++ gradle.properties	(revision 5e2ef33df213f57e0118f26b70d5fb9f03ed42bd)
@@ -21,7 +21,7 @@
 # suppress inspection "UnusedProperty" for whole file
 kotlin.code.style=official
 
-ideaVersion = 242-EAP-SNAPSHOT
+ideaVersion = 242.14146.16-EAP-SNAPSHOT
 ideaVersionName = 2024.2
 
 coreVersion = 1.7.5
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision 40e5528e15c9cde85db028dfc13c1ec293b7327f)
+++ gradle/libs.versions.toml	(revision 5e2ef33df213f57e0118f26b70d5fb9f03ed42bd)
@@ -18,7 +18,7 @@
 grammarKit = "org.jetbrains.idea:grammar-kit:1.5.1"
 
 # Gradle Tooling
-gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:242.10180.25-EAP-SNAPSHOT"
+gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:242.14146.16-EAP-SNAPSHOT"
 annotations = "org.jetbrains:annotations:24.0.0"
 groovy = "org.codehaus.groovy:groovy:3.0.19"
 
Index: src/main/kotlin/creator/PlatformVersion.kt
===================================================================
--- src/main/kotlin/creator/PlatformVersion.kt	(revision 40e5528e15c9cde85db028dfc13c1ec293b7327f)
+++ src/main/kotlin/creator/PlatformVersion.kt	(revision 5e2ef33df213f57e0118f26b70d5fb9f03ed42bd)
@@ -31,7 +31,7 @@
 import com.google.gson.Gson
 import com.intellij.openapi.diagnostic.Attachment
 import com.intellij.openapi.diagnostic.logger
-import com.intellij.util.proxy.CommonProxy
+import com.intellij.util.net.JdkProxyProvider
 import java.io.IOException
 import java.net.Proxy
 import java.net.URI
@@ -103,7 +103,7 @@
     val uri = URI(urlText)
     val url = uri.toURL()
 
-    val proxies = CommonProxy.getInstance().select(uri)
+    val proxies = JdkProxyProvider.getInstance().proxySelector.select(uri)
     for (proxy in proxies) {
         try {
             url.openConnection(proxy)
Index: src/main/kotlin/nbt/lang/format/NbttLanguageCodeStyleSettingsProvider.kt
===================================================================
--- src/main/kotlin/nbt/lang/format/NbttLanguageCodeStyleSettingsProvider.kt	(revision 40e5528e15c9cde85db028dfc13c1ec293b7327f)
+++ src/main/kotlin/nbt/lang/format/NbttLanguageCodeStyleSettingsProvider.kt	(revision 5e2ef33df213f57e0118f26b70d5fb9f03ed42bd)
@@ -22,9 +22,9 @@
 
 import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.nbt.lang.NbttLanguage
-import com.intellij.CodeStyleBundle
 import com.intellij.application.options.IndentOptionsEditor
 import com.intellij.application.options.SmartIndentOptionsEditor
+import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable
 import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizableOptions
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings
@@ -44,9 +44,9 @@
                     "Wrap list items",
                     CodeStyleSettingsCustomizableOptions.getInstance().WRAPPING_BRACES,
                     arrayOf(
-                        CodeStyleBundle.message("wrapping.do.not.wrap"),
-                        CodeStyleBundle.message("wrapping.wrap.if.long"),
-                        CodeStyleBundle.message("wrapping.wrap.always"),
+                        CodeStyleSettings.WrapStyle.DO_NOT_WRAP.presentableText,
+                        CodeStyleSettings.WrapStyle.WRAP_AS_NEEDED.presentableText,
+                        CodeStyleSettings.WrapStyle.WRAP_ALWAYS.presentableText,
                     ),
                     intArrayOf(
                         CommonCodeStyleSettings.DO_NOT_WRAP,
@@ -60,9 +60,9 @@
                     "Wrap array items",
                     CodeStyleSettingsCustomizableOptions.getInstance().WRAPPING_BRACES,
                     arrayOf(
-                        CodeStyleBundle.message("wrapping.do.not.wrap"),
-                        CodeStyleBundle.message("wrapping.wrap.if.long"),
-                        CodeStyleBundle.message("wrapping.wrap.always"),
+                        CodeStyleSettings.WrapStyle.DO_NOT_WRAP.presentableText,
+                        CodeStyleSettings.WrapStyle.WRAP_AS_NEEDED.presentableText,
+                        CodeStyleSettings.WrapStyle.WRAP_ALWAYS.presentableText,
                     ),
                     intArrayOf(
                         CommonCodeStyleSettings.DO_NOT_WRAP,
Index: src/main/kotlin/util/HttpConnectionFactory.kt
===================================================================
--- src/main/kotlin/util/HttpConnectionFactory.kt	(revision 40e5528e15c9cde85db028dfc13c1ec293b7327f)
+++ src/main/kotlin/util/HttpConnectionFactory.kt	(revision 5e2ef33df213f57e0118f26b70d5fb9f03ed42bd)
@@ -20,7 +20,7 @@
 
 package com.demonwav.mcdev.util
 
-import com.intellij.util.net.HttpConfigurable
+import com.intellij.util.net.HttpConnectionUtils
 import java.net.HttpURLConnection
 import java.net.URL
 
@@ -29,5 +29,5 @@
 }
 
 object ProxyHttpConnectionFactory : HttpConnectionFactory() {
-    override fun openHttpConnection(url: String) = HttpConfigurable.getInstance().openHttpConnection(url)
+    override fun openHttpConnection(url: String) = HttpConnectionUtils.openHttpConnection(url)
 }