diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d554c9f..ea91871a 100644 --- 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 index b2f89148..1fd81a9e 100644 --- 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 index 217999b9..51ed820e 100644 --- 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 index 9eb9533c..db564864 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -25,6 +25,7 @@ +
  • 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).