User: joe
Date: 12 Nov 26 04:18
Revision: 43dd548ae820706ef124c874ef1d59a51beab290
Summary:
Easy internal/deprecation fixes


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10721&personal=false

Index: src/main/kotlin/creator/buildsystem/gradle-steps.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/gradle-steps.kt	(revision 6d15ccda2caf27aa9c928f91cfb66aae1d5fa4e4)
+++ src/main/kotlin/creator/buildsystem/gradle-steps.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
@@ -39,13 +39,13 @@
 import com.intellij.execution.RunManager
 import com.intellij.ide.ui.UISettings
 import com.intellij.ide.wizard.NewProjectWizardStep
+import com.intellij.ide.wizard.runAfterOpened
 import com.intellij.lang.properties.psi.PropertiesFile
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.fileEditor.impl.NonProjectFileWritingAccessProvider
 import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupManager
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
@@ -223,7 +223,7 @@
                 showProgress(project)
             }
 
-            StartupManager.getInstance(project).runAfterOpened {
+            runAfterOpened(project) {
                 latch.countDown()
             }
         }
Index: src/main/kotlin/creator/custom/types/PaperVersionCreatorProperty.kt
===================================================================
--- src/main/kotlin/creator/custom/types/PaperVersionCreatorProperty.kt	(revision 6d15ccda2caf27aa9c928f91cfb66aae1d5fa4e4)
+++ src/main/kotlin/creator/custom/types/PaperVersionCreatorProperty.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
@@ -57,7 +57,7 @@
             paperVersions?.let { return it }
 
             val client = HttpClient()
-            val response = client.get("https://fill.papermc.io/v3/projects/paper", block = {
+            val response = client.request("https://fill.papermc.io/v3/projects/paper", block = {
                 this.header("User-Agent", "minecraft-dev/${PluginUtil.pluginVersion} (https://github.com/minecraft-dev/MinecraftDev)")
             })
             if (response.status.isSuccess()) {
Index: src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt
===================================================================
--- src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt	(revision 6d15ccda2caf27aa9c928f91cfb66aae1d5fa4e4)
+++ src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
@@ -30,11 +30,11 @@
 import com.intellij.ide.starters.local.GeneratorTemplateFile
 import com.intellij.ide.wizard.AbstractNewProjectWizardStep
 import com.intellij.ide.wizard.NewProjectWizardStep
+import com.intellij.ide.wizard.runAfterOpened
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.WriteAction
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupManager
 import com.intellij.openapi.util.io.NioFiles
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
@@ -96,7 +96,7 @@
         if (ApplicationManager.getApplication().isUnitTestMode) {
             action()
         } else if (!project.isDisposed) {
-            StartupManager.getInstance(project).runAfterOpened {
+            runAfterOpened(project) {
                 WriteAction.runAndWait<Throwable>(action)
             }
         }
Index: src/main/kotlin/errorreporter/ErrorReporter.kt
===================================================================
--- src/main/kotlin/errorreporter/ErrorReporter.kt	(revision 6d15ccda2caf27aa9c928f91cfb66aae1d5fa4e4)
+++ src/main/kotlin/errorreporter/ErrorReporter.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
@@ -22,7 +22,6 @@
 
 import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.update.PluginUtil
-import com.intellij.diagnostic.LogMessage
 import com.intellij.ide.DataManager
 import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.idea.IdeaLogger
@@ -90,10 +89,7 @@
 
         event.message?.let { msg -> sentryEvent.message = Message().apply { message = msg} }
 
-        val data = event.data
-        if (data is LogMessage) {
-            sentryEvent.throwable = data.throwable
-        }
+        sentryEvent.throwable = event.throwable
 
         PluginManagerCore.getPlugin(PluginUtil.PLUGIN_ID)?.let { plugin ->
             val (ideaVersion, coreVersion) = plugin.version.split('-', limit = 2)
@@ -128,8 +124,8 @@
                 // only ever shows the global static API
                 val client = SentryClient(opts)
 
-                val hint = if (data is LogMessage && data.allAttachments.isNotEmpty()) {
-                    Hint.withAttachments(data.allAttachments.map { Attachment(it.bytes, it.name) })
+                val hint = if (event.attachments.isNotEmpty()) {
+                    Hint.withAttachments(event.attachments.map { Attachment(it.bytes, it.name) })
                 } else {
                     null
                 }
Index: src/main/kotlin/update/PluginUpdater.kt
===================================================================
--- src/main/kotlin/update/PluginUpdater.kt	(revision 6d15ccda2caf27aa9c928f91cfb66aae1d5fa4e4)
+++ src/main/kotlin/update/PluginUpdater.kt	(revision 43dd548ae820706ef124c874ef1d59a51beab290)
@@ -37,7 +37,6 @@
 import com.intellij.openapi.updateSettings.impl.PluginDownloader
 import com.intellij.openapi.util.JDOMUtil
 import com.intellij.openapi.util.SystemInfo
-import com.intellij.openapi.vfs.CharsetToolkit
 import com.intellij.util.io.HttpRequests
 import java.io.IOException
 import java.net.URLEncoder
@@ -67,7 +66,7 @@
     private fun checkUpdatesInMainRepo(): PluginUpdateStatus {
         val buildNumber = ApplicationInfo.getInstance().build.asString()
         val currentVersion = PluginUtil.pluginVersion
-        val os = URLEncoder.encode(SystemInfo.OS_NAME + " " + SystemInfo.OS_VERSION, CharsetToolkit.UTF8)
+        val os = URLEncoder.encode(SystemInfo.OS_NAME + " " + SystemInfo.OS_VERSION, Charsets.UTF_8)
         val url =
             "https://plugins.jetbrains.com/plugins/list?pluginId=8327&build=" +
                 "$buildNumber&pluginVersion=$currentVersion&os=$os"