User: rednesto
Date: 03 Feb 24 10:44
Revision: 181b30d36a8b952f7d5950fa73c85812a8caba2c
Summary:
Merge branch '2023.2' into 2023.3


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision fd610a4c72dbd84fc92fec6774acfc554328e86a)
+++ build.gradle.kts	(revision 181b30d36a8b952f7d5950fa73c85812a8caba2c)
@@ -34,7 +34,7 @@
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.16.0"
+    id("org.jetbrains.intellij") version "1.17.0"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
Index: gradle.properties
===================================================================
--- gradle.properties	(revision fd610a4c72dbd84fc92fec6774acfc554328e86a)
+++ gradle.properties	(revision 181b30d36a8b952f7d5950fa73c85812a8caba2c)
@@ -24,7 +24,7 @@
 ideaVersion = 2023.3
 ideaVersionName = 2023.3
 
-coreVersion = 1.7.0
+coreVersion = 1.7.1
 downloadIdeaSources = true
 
 pluginTomlVersion = 233.11799.172
Index: src/main/kotlin/facet/MinecraftFacet.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacet.kt	(revision fd610a4c72dbd84fc92fec6774acfc554328e86a)
+++ src/main/kotlin/facet/MinecraftFacet.kt	(revision 181b30d36a8b952f7d5950fa73c85812a8caba2c)
@@ -27,6 +27,7 @@
 import com.demonwav.mcdev.platform.PlatformType
 import com.demonwav.mcdev.util.SourceType
 import com.demonwav.mcdev.util.filterNotNull
+import com.demonwav.mcdev.util.invokeAndWait
 import com.demonwav.mcdev.util.mapFirstNotNull
 import com.google.common.collect.HashMultimap
 import com.intellij.facet.Facet
@@ -121,7 +122,11 @@
         ProjectView.getInstance(module.project).refresh()
     }
 
-    private fun updateRoots() {
+    private fun updateRoots() = invokeAndWait {
+        if (module.isDisposed) {
+            return@invokeAndWait
+        }
+
         roots.clear()
         val rootManager = ModuleRootManager.getInstance(module)