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 index 4ec51d5..57f7d86 100644 --- 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 @@ -56,10 +56,10 @@ internal data class ProguardConfig( appendln("-keep class $adapterCanonicalName {") // Keep the constructor for Moshi's reflective lookup val constructorArgs = adapterConstructorParams.joinToString(",") - appendln(" public ($constructorArgs)") + appendln(" public ($constructorArgs);") // Keep any qualifier properties for (qualifierProperty in qualifierProperties) { - appendln(" private com.squareup.moshi.JsonAdapter ${qualifierProperty.name}") + appendln(" private com.squareup.moshi.JsonAdapter ${qualifierProperty.name};") } appendln("}") @@ -91,7 +91,7 @@ internal data class ProguardConfig( } allParams += "kotlin.jvm.internal.DefaultConstructorMarker" val params = allParams.joinToString(",") - appendln(" public synthetic ($params)") + appendln(" public synthetic ($params);") appendln("}") } } diff --git a/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt index 450ee96..0de2fea 100644 --- a/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt +++ b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt @@ -511,7 +511,7 @@ class JsonClassCodegenProcessorTest { -keepnames class testPackage.Aliases -if class testPackage.Aliases -keep class testPackage.AliasesJsonAdapter { - public (com.squareup.moshi.Moshi) + public (com.squareup.moshi.Moshi); } """.trimIndent()) @@ -520,7 +520,7 @@ class JsonClassCodegenProcessorTest { -keepnames class testPackage.Simple -if class testPackage.Simple -keep class testPackage.SimpleJsonAdapter { - public (com.squareup.moshi.Moshi) + public (com.squareup.moshi.Moshi); } """.trimIndent()) @@ -529,7 +529,7 @@ class JsonClassCodegenProcessorTest { -keepnames class testPackage.Generic -if class testPackage.Generic -keep class testPackage.GenericJsonAdapter { - public (com.squareup.moshi.Moshi,java.lang.reflect.Type[]) + public (com.squareup.moshi.Moshi,java.lang.reflect.Type[]); } """.trimIndent()) @@ -538,8 +538,8 @@ class JsonClassCodegenProcessorTest { -keepnames class testPackage.UsingQualifiers -if class testPackage.UsingQualifiers -keep class testPackage.UsingQualifiersJsonAdapter { - public (com.squareup.moshi.Moshi) - private com.squareup.moshi.JsonAdapter stringAtMyQualifierAdapter + public (com.squareup.moshi.Moshi); + private com.squareup.moshi.JsonAdapter stringAtMyQualifierAdapter; } -if class testPackage.UsingQualifiers -keep @interface testPackage.MyQualifier @@ -550,7 +550,7 @@ class JsonClassCodegenProcessorTest { -keepnames class testPackage.MixedTypes -if class testPackage.MixedTypes -keep class testPackage.MixedTypesJsonAdapter { - public (com.squareup.moshi.Moshi) + public (com.squareup.moshi.Moshi); } """.trimIndent()) @@ -559,13 +559,13 @@ class JsonClassCodegenProcessorTest { -keepnames class testPackage.DefaultParams -if class testPackage.DefaultParams -keep class testPackage.DefaultParamsJsonAdapter { - public (com.squareup.moshi.Moshi) + public (com.squareup.moshi.Moshi); } -if class testPackage.DefaultParams -keepnames class kotlin.jvm.internal.DefaultConstructorMarker -if class testPackage.DefaultParams -keepclassmembers class testPackage.DefaultParams { - public synthetic (java.lang.String,int,int,kotlin.jvm.internal.DefaultConstructorMarker) + public synthetic (java.lang.String,int,int,kotlin.jvm.internal.DefaultConstructorMarker); } """.trimIndent()) @@ -574,8 +574,8 @@ class JsonClassCodegenProcessorTest { -keepnames class testPackage.Complex -if class testPackage.Complex -keep class testPackage.ComplexJsonAdapter { - public (com.squareup.moshi.Moshi,java.lang.reflect.Type[]) - private com.squareup.moshi.JsonAdapter mutableListOfStringAtMyQualifierAdapter + public (com.squareup.moshi.Moshi,java.lang.reflect.Type[]); + private com.squareup.moshi.JsonAdapter mutableListOfStringAtMyQualifierAdapter; } -if class testPackage.Complex -keep @interface testPackage.MyQualifier @@ -583,7 +583,7 @@ class JsonClassCodegenProcessorTest { -keepnames class kotlin.jvm.internal.DefaultConstructorMarker -if class testPackage.Complex -keepclassmembers class testPackage.Complex { - public synthetic (java.lang.String,java.util.List,java.lang.Object,int,int,int,int,kotlin.jvm.internal.DefaultConstructorMarker) + public synthetic (java.lang.String,java.util.List,java.lang.Object,int,int,int,int,kotlin.jvm.internal.DefaultConstructorMarker); } """.trimIndent()) @@ -592,13 +592,13 @@ class JsonClassCodegenProcessorTest { -keepnames class testPackage.MultipleMasks -if class testPackage.MultipleMasks -keep class testPackage.MultipleMasksJsonAdapter { - public (com.squareup.moshi.Moshi) + public (com.squareup.moshi.Moshi); } -if class testPackage.MultipleMasks -keepnames class kotlin.jvm.internal.DefaultConstructorMarker -if class testPackage.MultipleMasks -keepclassmembers class testPackage.MultipleMasks { - public synthetic (long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,int,int,int,kotlin.jvm.internal.DefaultConstructorMarker) + public synthetic (long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,long,int,int,int,kotlin.jvm.internal.DefaultConstructorMarker); } """.trimIndent()) }