Merge pull request #24 from tiobe/33495-bug_new_xml

Fixed issue with the XML not being parsed anymore due to added fields
tiobe · Jan 23, 2024 · 588854f · 588854f
2 parents 9dda386 + 737b1ed
commit 588854f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,9 @@ build/
 !**/src/main/**/build/
 !**/src/test/**/build/
 
+### TICS ###
+ticstmpdir
+
 ### IntelliJ IDEA ###
 .idea/modules.xml
 .idea/jarRepositories.xml

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,7 +18,7 @@ intellij {
     version.set("2022.2.4")
     type.set("IC") // Target IDE Platform
 
-    plugins.set(listOf(/* Plugin Dependencies */))
+    updateSinceUntilBuild.set(false)
 }
 
 tasks {
@@ -31,10 +31,7 @@ tasks {
         kotlinOptions.jvmTarget = "17"
     }
 
-    patchPluginXml {
-        sinceBuild.set("222")
-        untilBuild.set("232.*")
-    }
+    patchPluginXml { }
 
     signPlugin {
         certificateChain.set(System.getenv("CERTIFICATE_CHAIN"))

diff --git a/src/main/kotlin/com/tiobe/plugins/intellij/actions/InstallTicsAction.kt b/src/main/kotlin/com/tiobe/plugins/intellij/actions/InstallTicsAction.kt
@@ -5,7 +5,6 @@ import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.PlatformDataKeys
 import com.intellij.openapi.project.Project
-import com.tiobe.plugins.intellij.console.TicsConsole
 import com.tiobe.plugins.intellij.install.InstallTics
 
 

diff --git a/src/main/kotlin/com/tiobe/plugins/intellij/utilities/TicsXML.kt b/src/main/kotlin/com/tiobe/plugins/intellij/utilities/TicsXML.kt
@@ -1,15 +1,18 @@
 package com.tiobe.plugins.intellij.utilities
 
 import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 data class TicsXML @JsonCreator constructor(
     @JsonProperty("version") val version: String,
     @JsonProperty("format") val format: String,
     @JsonProperty("Violations") val violations: List<Violation>,
     @JsonProperty("SolvedViolations") val solvedViolations: List<Violation>
 )
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 data class Violation @JsonCreator constructor(
     @JsonProperty("File") val file: String,
     @JsonProperty("Line") val line: Int,

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,5 +1,8 @@
 <!-- Plugin Configuration File. Read more: https://plugins.jetbrains.com/docs/intellij/plugin-configuration-file.html -->
 <idea-plugin>
+    <!-- This plugin supports 2022.2 or later. -->
+    <idea-version since-build="222"/>
+
     <!-- Unique identifier of the plugin. It should be FQN. It cannot be changed between the plugin versions. -->
     <id>com.tiobe.plugins.intellij</id>