From 2f2c9ab7f68f9e41c8cf5bafaef4ee6c4a534a52 Mon Sep 17 00:00:00 2001
From: Jamie Shiell <jamie@infernus.org>
Date: Sat, 24 Aug 2024 12:48:21 +0100
Subject: [PATCH] Prepare test release to verify dist channels

---
 CHANGELOG.md                                     |  1 +
 build.gradle.kts                                 |  6 +++++-
 .../CheckstyleClassLoaderContainer.java          | 16 +++++++++++++++-
 src/main/resources/META-INF/plugin.xml           |  1 +
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb793b5f..08598586 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 
 # CheckStyle-IDEA Changelog
 
+* **5.93.2** WiP: test release to verify distribution workflow (#646).
 * **5.93.1** Fixed: NPE when filtering tree results with no children.
 * **5.93.0** New: Files in results are now hidden when all of their children aren't visible in the current filtering state (#644).
 * **5.92.0** New: Added CheckStyle 10.17.0.
diff --git a/build.gradle.kts b/build.gradle.kts
index 23e9518b..b1434be2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
     id("org.infernus.idea.checkstyle.build")
 }
 
-version = "5.93.1"
+version = "5.93.2"
 
 repositories {
     mavenCentral()
@@ -35,6 +35,10 @@ intellijPlatform {
 
     publishing {
         token.set(System.getenv("JETBRAINS_PLUGIN_REPO_TOKEN"))
+
+        // Test release
+        channels.set(listOf("Testing"))
+        hidden.set(true)
     }
 }
 
diff --git a/src/main/java/org/infernus/idea/checkstyle/CheckstyleClassLoaderContainer.java b/src/main/java/org/infernus/idea/checkstyle/CheckstyleClassLoaderContainer.java
index a38a13d9..217999b9 100644
--- a/src/main/java/org/infernus/idea/checkstyle/CheckstyleClassLoaderContainer.java
+++ b/src/main/java/org/infernus/idea/checkstyle/CheckstyleClassLoaderContainer.java
@@ -121,8 +121,8 @@ private static List<URL> baseClasspathUrlsForPackagedPlugin(@NotNull final Strin
                                                                 @NotNull final String basePath) {
         try {
             final List<URL> urls = new ArrayList<>();
+            urls.add(getClassesDirectory(basePath).toURI().toURL());
 
-            urls.add(new File(basePath, "checkstyle/classes").toURI().toURL());
             for (String jar : splitClassPathFromProperties(classPathFromProps)) {
                 File jarLocation = new File(basePath, jar);
                 if (!jarLocation.exists()) {
@@ -138,6 +138,20 @@ private static List<URL> baseClasspathUrlsForPackagedPlugin(@NotNull final Strin
         }
     }
 
+    private static @NotNull File getClassesDirectory(@NotNull final String basePath) {
+        final File basePathFile = new File(basePath);
+        if (!new File(basePath).exists()) {
+            throw new CheckStylePluginException("Cannot find plugin directory: " + basePathFile.getAbsolutePath());
+        }
+
+        final File classesDirectory = new File(basePathFile, "checkstyle/classes");
+        if (!classesDirectory.exists()) {
+            throw new CheckStylePluginException("Cannot find Checkstyle classes directory: " + classesDirectory.getAbsolutePath());
+        }
+
+        return classesDirectory;
+    }
+
     private List<URL> baseClasspathUrlsForIDEAUnitTests(@NotNull final String classPathFromProps) {
         try {
             final List<URL> urls = new ArrayList<>();
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 7e0a0a15..72141be2 100644
--- 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.93.2: WiP: test release to verify distribution workflow (#646).</li>
     <li>5.93.1: Fixed: NPE when filtering tree results with no children.</li>
     <li>5.93.0: New: Files in results are now hidden when all of their children aren't visible in the current filtering state (#644).</li>
     <li>5.92.0: New: Added CheckStyle 10.17.0.</li>