| commit | b27396cc13f096e96ff7f80ee78a782763e1586c | [log] [tgz] |
|---|---|---|
| author | Ting-Yuan Huang <laszio@google.com> | Tue Oct 22 12:25:49 2024 -0700 |
| committer | KSP Auto Pick <kotlin-symbol-processing@google.com> | Tue Oct 22 20:26:32 2024 +0000 |
| tree | 98c2252382e16d45b55cab5fd4d99bf2ec200009 | |
| parent | 36252beddf3f5ed0e516989be61a22483574a0c9 [diff] |
Refine error message (cherry picked from commit 1ca8ca1793afdea491d9afebd12a27388c500874)
diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspAATask.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspAATask.kt index be5e8c4..1d3684b 100644 --- a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspAATask.kt +++ b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspAATask.kt
@@ -218,7 +218,7 @@ provider.asArguments().forEach { argument -> val kv = Regex("(\\S+)=(\\S+)").matchEntire(argument)?.groupValues require(kv != null && kv.size == 3) { - "KSP apoption does not match (\\S+)=(\\S+): $argument" + "Processor arguments not in the format \\S+=\\S+: $argument" } put(kv[1], kv[2]) }
diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt index 67112c2..ebdfbe3 100644 --- a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt +++ b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt
@@ -194,7 +194,7 @@ providers.flatMap { provider -> provider.asArguments().map { argument -> require(argument.matches(Regex("\\S+=\\S+"))) { - "KSP apoption does not match \\S+=\\S+: $argument" + "Processor arguments not in the format \\S+=\\S+: $argument" } InternalSubpluginOption("apoption", argument) }
diff --git a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/GradleCompilationTest.kt b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/GradleCompilationTest.kt index 63d63b9..27ccd4c 100644 --- a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/GradleCompilationTest.kt +++ b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/GradleCompilationTest.kt
@@ -306,7 +306,7 @@ ) val result = testRule.runner().withArguments(":app:assemble").buildAndFail() - assertThat(result.output).contains("KSP apoption does not match \\S+=\\S+: invalid") + assertThat(result.output).contains("Processor arguments not in the format \\S+=\\S+: invalid") } @Test