Fix double extension in ProguardRules

square · Sep 13, 2021 · 9616b4a · 9616b4a
1 parent 0bde806
commit 9616b4a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/ProguardRules.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/ProguardRules.kt
@@ -39,8 +39,8 @@ internal data class ProguardConfig(
   val targetConstructorParams: List<String>,
   val qualifierProperties: Set<QualifierAdapterProperty>
 ) {
-  fun outputFilePath(canonicalName: String): String {
-    return "META-INF/proguard/moshi-$canonicalName.pro"
+  fun outputFilePathWithoutExtension(canonicalName: String): String {
+    return "META-INF/proguard/moshi-$canonicalName"
   }
 
   fun writeTo(out: Appendable): Unit = out.run {

diff --git a/.../codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessor.kt b/.../codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessor.kt
@@ -171,7 +171,7 @@ public class JsonClassCodegenProcessor : AbstractProcessor() {
 
 /** Writes this config to a [filer]. */
 private fun ProguardConfig.writeTo(filer: Filer, vararg originatingElements: Element) {
-  filer.createResource(StandardLocation.CLASS_OUTPUT, "", outputFilePath(targetClass.canonicalName), *originatingElements)
+  filer.createResource(StandardLocation.CLASS_OUTPUT, "", "${outputFilePathWithoutExtension(targetClass.canonicalName)}.pro", *originatingElements)
     .openWriter()
     .use(::writeTo)
 }
diff --git a/...n/src/main/java/com/squareup/moshi/kotlin/codegen/ksp/JsonClassSymbolProcessorProvider.kt b/...n/src/main/java/com/squareup/moshi/kotlin/codegen/ksp/JsonClassSymbolProcessorProvider.kt
@@ -163,7 +163,7 @@ private fun ProguardConfig.writeTo(codeGenerator: CodeGenerator, originatingKSFi
   val file = codeGenerator.createNewFile(
     dependencies = Dependencies(aggregating = false, originatingKSFile),
     packageName = "",
-    fileName = outputFilePath(targetClass.canonicalName),
+    fileName = outputFilePathWithoutExtension(targetClass.canonicalName),
     extensionName = "pro"
   )
   // Don't use writeTo(file) because that tries to handle directories under the hood