User: rednesto Date: 02 Feb 24 21:38 Revision: b7178f4fb9724b557c5ecf3045615e4f3dda4391 Summary: Fix for latest EAP breaking change TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=9077&personal=false Index: gradle.properties =================================================================== --- gradle.properties (revision 91cf8576cbfe6566233757778b262a12a3fc6a7b) +++ gradle.properties (revision b7178f4fb9724b557c5ecf3045615e4f3dda4391) @@ -27,7 +27,7 @@ coreVersion = 1.7.0 downloadIdeaSources = true -pluginTomlVersion = 241.8102.131 +pluginTomlVersion = 241.10840.7 # Silences a build-time warning because we are bundling our own kotlin library kotlin.stdlib.default.dependency = false Index: src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt =================================================================== --- src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt (revision 91cf8576cbfe6566233757778b262a12a3fc6a7b) +++ src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt (revision b7178f4fb9724b557c5ecf3045615e4f3dda4391) @@ -39,13 +39,12 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFileManager +import com.intellij.platform.backend.workspace.WorkspaceModel import com.intellij.platform.backend.workspace.toVirtualFileUrl import com.intellij.platform.workspace.jps.entities.LibraryRoot import com.intellij.platform.workspace.jps.entities.LibraryRootTypeId import com.intellij.platform.workspace.jps.entities.modifyEntity import com.intellij.platform.workspace.storage.MutableEntityStorage -import com.intellij.platform.workspace.storage.url.VirtualFileUrlManager -import com.intellij.workspaceModel.ide.getInstance import com.intellij.workspaceModel.ide.impl.legacyBridge.library.LibraryBridge import com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryTableBridgeImpl.Companion.findLibraryEntity import org.jetbrains.concurrency.AsyncPromise @@ -85,7 +84,7 @@ val annotationsPath = findAnnotationsPath(false) ?: findAnnotationsPath(true) ?: return false val libraryEntity = diff.findLibraryEntity(library) ?: return true - val vfUrlManager = VirtualFileUrlManager.getInstance(project) + val vfUrlManager = WorkspaceModel.getInstance(project).getVirtualFileUrlManager() val newUrl = annotationsPath.toVirtualFileUrl(vfUrlManager) val annotationsRootType = LibraryRootTypeId(AnnotationOrderRootType.ANNOTATIONS_ID)