Fix options handling

CHANGELOG.md

@@ -4,6 +4,7 @@
 --------------
 
 - **Fix:** Don't cache symbols between processing rounds. This better supports KSP2.
+- **Fix:** Workaround Kotlin plugin option parsing limitations. Contributing annotations should now be colon-delimited, and the underlying KSP argument is changed to a more consistent `anvil-ksp-extraContributingAnnotations`.
 
 0.2.0
 -----

FORK.md

@@ -147,9 +147,9 @@ too.
 
 For simple cases where a custom annotation is processed by a custom generator, you can simply indicate these annotations to Anvil KSP. These can be provided in three different ways, whichever is most convenient.
 
-1. A comma-separated Gradle property whose values are the canonical class names of your custom annotations.
+1. A colon-delimited Gradle property whose values are the canonical class names of your custom annotations.
    ```properties
-   com.squareup.anvil.kspContributingAnnotations=com.example.CustomAnnotation,com.example.InjectWith
+   com.squareup.anvil.kspContributingAnnotations=com.example.CustomAnnotation:com.example.InjectWith
    ```
 2. Setting via the `AnvilExtension` in Gradle. Note this property defaults to the above Gradle property.
    ```kotlin
@@ -164,8 +164,8 @@ For simple cases where a custom annotation is processed by a custom generator, y
    ```kotlin
    ksp {
      arg(
-       "anvil.ksp.extraContributingAnnotations",
-       "com.example.CustomAnnotation,com.example.InjectWith"
+       "anvil-ksp-extraContributingAnnotations",
+       "com.example.CustomAnnotation:com.example.InjectWith"
      )
    }
    ```

compiler/src/main/java/com/squareup/anvil/compiler/KspContributionMerger.kt

@@ -131,7 +131,7 @@ internal class KspContributionMerger(
     add(contributesMultibindingFqName.asString())
     env.options[OPTION_EXTRA_CONTRIBUTING_ANNOTATIONS]?.let {
       if (it.isNotBlank()) {
-        addAll(it.splitToSequence(',').filterNot { it.isBlank() })
+        addAll(it.splitToSequence(':').filterNot(String::isBlank))
       }
     }
     // contributesSubcomponentFqName is handled uniquely

compiler/src/main/java/com/squareup/anvil/compiler/Utils.kt

@@ -110,9 +110,9 @@ public const val OPTION_GENERATE_SHIMS: String = "anvil.ksp.generateShims"
  * KSP option to specify custom extra contributing annotations. Useful for situations where you
  * can't or don't want to implement an `AnvilKspExtension` implementation to provide them.
  *
- * Value should be a comma-separated list of fully qualified canonical class names.
+ * Value should be a colon-delimited list of fully qualified canonical class names.
  */
-public const val OPTION_EXTRA_CONTRIBUTING_ANNOTATIONS: String = "anvil.ksp.extraContributingAnnotations"
+public const val OPTION_EXTRA_CONTRIBUTING_ANNOTATIONS: String = "anvil-ksp-extraContributingAnnotations"
 
 /**
  * Returns the single element matching the given [predicate], or `null` if element was not found.

gradle-plugin/src/main/java/com/squareup/anvil/plugin/AnvilExtension.kt

@@ -159,14 +159,14 @@ public abstract class AnvilExtension @Inject constructor(
    * merging. Values should be the canonical class name of extra contributing annotations.
    *
    * Can be set via `com.squareup.anvil.kspContributingAnnotations` gradle property with
-   * comma-separated values.
+   * colon-delimited values.
    */
   public val kspContributingAnnotations: SetProperty<String> = objects.setProperty(
     String::class.java,
   )
     .convention(
       providers.gradleProperty("com.squareup.anvil.kspContributingAnnotations")
-        .map { it.splitToSequence(",").filterNot { it.isBlank() }.toSet() }
+        .map { it.splitToSequence(":").filterNot { it.isBlank() }.toSet() }
         .orElse(emptySet()),
     )
 
@@ -238,8 +238,8 @@ public abstract class AnvilExtension @Inject constructor(
           "generate-dagger-factories" to generateDaggerFactories,
           "generate-dagger-factories-only" to generateDaggerFactoriesOnly,
           "disable-component-merging" to disableComponentMerging,
-          "anvil.ksp.extraContributingAnnotations" to kspContributingAnnotations.map {
-            it.sorted().joinToString(",")
+          "anvil-ksp-extraContributingAnnotations" to kspContributingAnnotations.map {
+            it.sorted().joinToString(":")
           },
           "will-have-dagger-factories" to willHaveDaggerFactories,
           "merging-backend" to useKspComponentMergingBackend