User: rednesto
Date: 03 Feb 24 10:44
Revision: 0e680c63f2c6101afdc0085e16b39e5a79682913
Summary:
Merge branch '2023.3' into 2024.1


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 781e3c7cbde19f237cedbb36b4bbb5e60f95744e)
+++ build.gradle.kts	(revision 0e680c63f2c6101afdc0085e16b39e5a79682913)
@@ -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 781e3c7cbde19f237cedbb36b4bbb5e60f95744e)
+++ gradle.properties	(revision 0e680c63f2c6101afdc0085e16b39e5a79682913)
@@ -24,7 +24,7 @@
 ideaVersion = 241.10840-EAP-CANDIDATE-SNAPSHOT
 ideaVersionName = 2024.1
 
-coreVersion = 1.7.0
+coreVersion = 1.7.1
 downloadIdeaSources = true
 
 pluginTomlVersion = 241.10840.7
Index: src/main/kotlin/facet/MinecraftFacetDetector.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacetDetector.kt	(revision 781e3c7cbde19f237cedbb36b4bbb5e60f95744e)
+++ src/main/kotlin/facet/MinecraftFacetDetector.kt	(revision 0e680c63f2c6101afdc0085e16b39e5a79682913)
@@ -54,6 +54,7 @@
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.job
 import kotlinx.coroutines.launch
 import org.jetbrains.plugins.gradle.util.GradleUtil
 
@@ -68,8 +69,9 @@
 
     override suspend fun execute(project: Project) {
         val detectorService = project.service<FacetDetectorScopeProvider>()
-        detectorService.currentJob?.let { it.cancelAndJoin() }
+        detectorService.currentJob?.cancelAndJoin()
         withBackgroundProgress(project, "Detecting Minecraft Frameworks", cancellable = false) {
+            detectorService.currentJob = coroutineContext.job
             MinecraftModuleRootListener.doCheck(project)
         }
     }
@@ -88,8 +90,9 @@
             val project = event.source as? Project ?: return
             val detectorService = project.service<FacetDetectorScopeProvider>()
             detectorService.scope.launch {
-                detectorService.currentJob?.let { it.cancelAndJoin() }
+                detectorService.currentJob?.cancelAndJoin()
                 withBackgroundProgress(project, "Detecting Minecraft Frameworks", cancellable = false) {
+                    detectorService.currentJob = coroutineContext.job
                     doCheck(project)
                 }
             }