feat: Prepare 1.3.3 release

Author: fabianishere

README.md

@@ -22,7 +22,7 @@ To use the plugin, just apply the plugin in your `build.gradle`:
 
 ```groovy
 plugins {
-    id 'nl.fabianm.kotlin.plugin.generated' version '1.3.2'
+    id 'nl.fabianm.kotlin.plugin.generated' version '1.3.3'
 }
 ```
 
@@ -31,8 +31,8 @@ version you are using:
 
 | **Kotlin** | **Plugin** |
 |:----------:|:----------:|
-|    1.2.*   |     1.0    |
-|    1.3.*   |    1.3.2   |
+|    1.2.*  |     1.0    |
+|    1.3.*  |    1.3.3   |
 
 You can optionally configure the plugin as shown below:
 

build.gradle.kts

@@ -16,13 +16,13 @@
 
 plugins {
     kotlin("jvm") version "1.3.31" apply false
-    id("org.jlleitschuh.gradle.ktlint") version "7.4.0" apply false
+    id("org.jlleitschuh.gradle.ktlint") version "8.2.0" apply false
     id("com.github.johnrengelman.shadow") version "5.0.0" apply false
 }
 
 allprojects {
     group = "nl.fabianm.kotlin.plugin.generated"
-    version = "1.3.2"
+    version = "1.3.3"
 
     extra["junitJupiterVersion"] = "5.4.2"
     extra["junitPlatformVersion"] = "1.4.2"

plugin-gradle/src/main/kotlin/nl/fabianm/kotlin/plugin/generated/gradle/GeneratedSubplugin.kt

@@ -50,7 +50,7 @@ class GeneratedKotlinGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
     companion object {
         private const val GENERATED_ARTIFACT_NAME = "plugin-gradle"
         private const val GENERATED_GROUP_ID = "nl.fabianm.kotlin.plugin.generated"
-        private const val GENERATED_VERSION = "1.3.2"
+        private const val GENERATED_VERSION = "1.3.3"
         private const val GENERATED_COMPILER_PLUGIN_ID = "nl.fabianm.kotlin.plugin.generated"
         private val ANNOTATION_ARG_NAME = "annotation"
         private val VISIBLE_ARG_NAME = "visible"

plugin-idea/src/main/kotlin/nl/fabianm/kotlin/plugin/generated/idea/GeneratedGradleImportHandler.kt

@@ -24,12 +24,19 @@ import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
 
 class GeneratedGradleImportHandler : GradleProjectImportHandler {
     override fun importBySourceSet(facet: KotlinFacet, sourceSetNode: DataNode<GradleSourceSetData>) {
-        GeneratedImportHandler.modifyCompilerArguments(facet, PLUGIN_GRADLE_JAR)
+        GeneratedImportHandler.modifyCompilerArguments(facet, PLUGIN_GRADLE_JAR, PLUGIN_GRADLE_TITLE)
     }
 
     override fun importByModule(facet: KotlinFacet, moduleNode: DataNode<ModuleData>) {
-        GeneratedImportHandler.modifyCompilerArguments(facet, PLUGIN_GRADLE_JAR)
+        GeneratedImportHandler.modifyCompilerArguments(facet, PLUGIN_GRADLE_JAR, PLUGIN_GRADLE_TITLE)
     }
 
-    private val PLUGIN_GRADLE_JAR = "plugin-gradle"
+    companion object {
+        private val PLUGIN_GRADLE_JAR = "plugin-gradle"
+
+        /**
+         * The implementation title to search for.
+         */
+        private val PLUGIN_GRADLE_TITLE = "nl.fabianm.kotlin.plugin.generated.gradle"
+    }
 }

plugin-idea/src/main/kotlin/nl/fabianm/kotlin/plugin/generated/idea/GeneratedImportHandler.kt

@@ -32,11 +32,6 @@ internal object GeneratedImportHandler {
     private val PLUGIN_JPS_JAR: String?
         get() = PathManager.getJarPathForClass(GeneratedCommandLineProcessor::class.java)
 
-    /**
-     * The implementation title to search for.
-     */
-    private val PLUGIN_IMPLEMENTATION_TITLE = "nl.fabianm.kotlin.plugin.generated"
-
     /**
      * The [Logger] instance for this class.
      */
@@ -48,19 +43,20 @@ internal object GeneratedImportHandler {
      *
      * @param facet The facet to modify.
      * @param buildSystemPluginJar The name of the jar file to remove rom the classpath.
+     * @param implementationTitle The implementation title to validate.
      */
-    fun modifyCompilerArguments(facet: KotlinFacet, buildSystemPluginJar: String) {
+    fun modifyCompilerArguments(facet: KotlinFacet, buildSystemPluginJar: String, implementationTitle: String) {
         logger.info("Probing for Gradle plugin")
 
         val facetSettings = facet.configuration.settings
         val commonArguments = facetSettings.compilerArguments ?: CommonCompilerArguments.DummyImpl()
-        val regex = ".*\\${File.separator}?$buildSystemPluginJar-.*\\.jar".toRegex()
+        val regex = "(.*\\${File.separator})?$buildSystemPluginJar-.*\\.jar".toRegex()
 
         // Remove the incompatible compiler plugin from the classpath if found
         var isEnabled = false
         val oldPluginClasspaths = (commonArguments.pluginClasspaths ?: emptyArray()).filterTo(mutableListOf()) {
-            val match = regex.matches(it) && validateJar(it)
-            logger.debug("$it [$match]")
+            val match = regex.matches(it) && validateJar(it, implementationTitle)
+            logger.info("$it [match=$match]")
             if (match) {
                 isEnabled = true
             }
@@ -83,12 +79,12 @@ internal object GeneratedImportHandler {
      * We need to perform this rather ugly check, because the artifact id of the Gradle plugin is not unique and rather
      * general (`plugin-gradle`). We therefore check whether the manifest contains references to this project.
      */
-    private fun validateJar(path: String): Boolean {
+    private fun validateJar(path: String, implementationTitle: String): Boolean {
         return try {
             val jar = JarInputStream(FileInputStream(path))
             val manifest = jar.manifest
-            manifest.mainAttributes.getValue("Implementation-Title").trim().equals(PLUGIN_IMPLEMENTATION_TITLE, ignoreCase = true)
-        } catch (_: Exception) {
+            manifest.mainAttributes.getValue("Implementation-Title").trim().equals(implementationTitle, ignoreCase = true)
+        } catch (e: Exception) {
             false
         }
     }