Update intellij plugin structure library

Fixes #674
JetBrains · Jul 12, 2021 · 41d576b · 41d576b
1 parent 673df0b
commit 41d576b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## 1.1.3, not published
 
+- Fixed dependency on `JavaScript` plugin [#674](../../issues/674)
 - Fixed `releaseType` resolving for Rider versions in `-EAP#-SNAPSHOT` format.
 - `runPluginVerifier`: verify required Java 11 environment for Plugin Verifier `1.260+`
 - `pluginVerifier` – remove support for old versions `< 1.255` hosted on Bintray

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,10 +24,10 @@ dependencies {
         exclude(group = "org.jetbrains.kotlin")
     }
     implementation("org.jetbrains:annotations:21.0.0")
-    implementation("org.jetbrains.intellij.plugins:structure-base:3.192") {
+    implementation("org.jetbrains.intellij.plugins:structure-base:3.194") {
         exclude(group = "org.jetbrains.kotlin")
     }
-    implementation("org.jetbrains.intellij.plugins:structure-intellij:3.192") {
+    implementation("org.jetbrains.intellij.plugins:structure-intellij:3.194") {
         exclude(group = "org.jetbrains.kotlin")
     }
     implementation("javax.xml.bind:jaxb-api:2.3.1")

diff --git a/src/main/kotlin/org/jetbrains/intellij/dependency/BuiltinPluginsRegistry.kt b/src/main/kotlin/org/jetbrains/intellij/dependency/BuiltinPluginsRegistry.kt
@@ -10,14 +10,15 @@ import java.io.File
 import java.io.Serializable
 
 class BuiltinPluginsRegistry(private val pluginsDirectory: File, private val context: String?) : Serializable {
-
     private val plugins = mutableMapOf<String, PluginsCachePlugin>()
     private val directoryNameMapping = mutableMapOf<String, String>()
 
     @Transient
     private val extractor = XmlExtractor<PluginsCache>()
 
     companion object {
+        const val version = 1
+
         fun fromDirectory(pluginsDirectory: File, context: String?) =
             BuiltinPluginsRegistry(pluginsDirectory, context).apply {
                 if (!fillFromCache()) {
@@ -62,7 +63,7 @@ class BuiltinPluginsRegistry(private val pluginsDirectory: File, private val con
         }
     }
 
-    private fun cacheFile() = File(pluginsDirectory, "builtinRegistry.xml")
+    private fun cacheFile() = File(pluginsDirectory, "builtinRegistry-$version.xml")
 
     fun findPlugin(name: String): File? {
         val plugin = plugins[name] ?: plugins[directoryNameMapping[name]] ?: return null