Fix error on case-senstive FSs due to change in plugin directory name…

… with new build plugin (#650).
jshiell · Aug 26, 2024 · 8a8b35e · 8a8b35e
1 parent 8ca0a4f
commit 8a8b35e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 
 # CheckStyle-IDEA Changelog
 
+* **5.94.1** Fixed: Error on case-sensitive FSs due to change in plugin directory name with new build plugin (#650).
 * **5.94.0** New: Added CheckStyle 10.18.0.
 * **5.93.5** Fixed: Improve fallback when the serialised Checkstyle version to use is absent (#648).
 * **5.93.4** Fixed: resolved case-sensitivity problem that was breaking builds on case-sensitive FSs (in particular, CI) (#646).

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
     id("org.infernus.idea.checkstyle.build")
 }
 
-version = "5.94.0"
+version = "5.94.1"
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/org/infernus/idea/checkstyle/CheckstyleClassLoaderContainer.java b/src/main/java/org/infernus/idea/checkstyle/CheckstyleClassLoaderContainer.java
@@ -263,7 +263,7 @@ private String guessBuildPathFromClasspath() {
     @Nullable
     private String getPluginPath() {
         try {
-            File pluginDir = new File(PathManager.getPluginsPath(), CheckStylePlugin.ID_PLUGIN);
+            File pluginDir = new File(PathManager.getPluginsPath(), pluginDirectory());
             if (pluginDir.exists()) {
                 return pluginDir.getAbsolutePath();
             }
@@ -273,10 +273,15 @@ private String getPluginPath() {
         return null;
     }
 
+    @NotNull
+    private static String pluginDirectory() {
+        return CheckStylePlugin.ID_PLUGIN.toLowerCase();
+    }
+
     @Nullable
     private String getPreinstalledPluginPath() {
         try {
-            File preInstalledPluginDir = new File(PathManager.getPreInstalledPluginsPath(), CheckStylePlugin.ID_PLUGIN);
+            File preInstalledPluginDir = new File(PathManager.getPreInstalledPluginsPath(), pluginDirectory());
             if (preInstalledPluginDir.exists()) {
                 return preInstalledPluginDir.getAbsolutePath();
             }

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -25,6 +25,7 @@
     <change-notes>
         <![CDATA[
 <ul>
+    <li>5.94.1: Fixed: Error on case-sensitive FSs due to change in plugin directory name with new build plugin (#650).</li>
     <li>5.94.0: New: Added Checkstyle 10.18.0.</li>
     <li>5.93.5: Fixed: Improve fallback when the serialised Checkstyle version to use is absent (#648).</li>
     <li>5.93.4: Fixed: resolved case-sensitivity problem that was breaking builds on case-sensitive FSs (in particular, CI) (#646).</li>