fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-19 16:09:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing semicolons (#1068)

Browse Source
This commit is contained in:
Zac Sweers
2020-01-14 15:26:40 -05:00
committed by GitHub
parent debb7d3160
commit e45d9e04bd
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/ProguardRules.kt
View File

@@ -56,10 +56,10 @@ internal data class ProguardConfig(
appendln("-keep class $adapterCanonicalName {") appendln("-keep class $adapterCanonicalName {")
// Keep the constructor for Moshi's reflective lookup // Keep the constructor for Moshi's reflective lookup
val constructorArgs = adapterConstructorParams.joinToString(",") val constructorArgs = adapterConstructorParams.joinToString(",")
appendln(" public <init>($constructorArgs)") appendln(" public <init>($constructorArgs);")
// Keep any qualifier properties // Keep any qualifier properties
for (qualifierProperty in qualifierProperties) { for (qualifierProperty in qualifierProperties) {
appendln(" private com.squareup.moshi.JsonAdapter ${qualifierProperty.name}") appendln(" private com.squareup.moshi.JsonAdapter ${qualifierProperty.name};")
} }
appendln("}") appendln("}")
@@ -91,7 +91,7 @@ internal data class ProguardConfig(
} }
allParams += "kotlin.jvm.internal.DefaultConstructorMarker" allParams += "kotlin.jvm.internal.DefaultConstructorMarker"
val params = allParams.joinToString(",") val params = allParams.joinToString(",")
appendln(" public synthetic <init>($params)") appendln(" public synthetic <init>($params);")
appendln("}") appendln("}")
} }
} }

26
kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt
View File

@@ -511,7 +511,7 @@ class JsonClassCodegenProcessorTest {
-keepnames class testPackage.Aliases -keepnames class testPackage.Aliases
-if class testPackage.Aliases -if class testPackage.Aliases
-keep class testPackage.AliasesJsonAdapter { -keep class testPackage.AliasesJsonAdapter {
public <init>(com.squareup.moshi.Moshi) public <init>(com.squareup.moshi.Moshi);
} }
""".trimIndent()) """.trimIndent())
@@ -520,7 +520,7 @@ class JsonClassCodegenProcessorTest {
-keepnames class testPackage.Simple -keepnames class testPackage.Simple
-if class testPackage.Simple -if class testPackage.Simple
-keep class testPackage.SimpleJsonAdapter { -keep class testPackage.SimpleJsonAdapter {
public <init>(com.squareup.moshi.Moshi) public <init>(com.squareup.moshi.Moshi);
} }
""".trimIndent()) """.trimIndent())
@@ -529,7 +529,7 @@ class JsonClassCodegenProcessorTest {
-keepnames class testPackage.Generic -keepnames class testPackage.Generic
-if class testPackage.Generic -if class testPackage.Generic
-keep class testPackage.GenericJsonAdapter { -keep class testPackage.GenericJsonAdapter {
public <init>(com.squareup.moshi.Moshi,java.lang.reflect.Type[]) public <init>(com.squareup.moshi.Moshi,java.lang.reflect.Type[]);
} }
""".trimIndent()) """.trimIndent())
@@ -538,8 +538,8 @@ class JsonClassCodegenProcessorTest {
-keepnames class testPackage.UsingQualifiers -keepnames class testPackage.UsingQualifiers
-if class testPackage.UsingQualifiers -if class testPackage.UsingQualifiers
-keep class testPackage.UsingQualifiersJsonAdapter { -keep class testPackage.UsingQualifiersJsonAdapter {
public <init>(com.squareup.moshi.Moshi) public <init>(com.squareup.moshi.Moshi);
private com.squareup.moshi.JsonAdapter stringAtMyQualifierAdapter private com.squareup.moshi.JsonAdapter stringAtMyQualifierAdapter;
} }
-if class testPackage.UsingQualifiers -if class testPackage.UsingQualifiers
-keep @interface testPackage.MyQualifier -keep @interface testPackage.MyQualifier
@@ -550,7 +550,7 @@ class JsonClassCodegenProcessorTest {
-keepnames class testPackage.MixedTypes -keepnames class testPackage.MixedTypes
-if class testPackage.MixedTypes -if class testPackage.MixedTypes
-keep class testPackage.MixedTypesJsonAdapter { -keep class testPackage.MixedTypesJsonAdapter {
public <init>(com.squareup.moshi.Moshi) public <init>(com.squareup.moshi.Moshi);
} }
""".trimIndent()) """.trimIndent())
@@ -559,13 +559,13 @@ class JsonClassCodegenProcessorTest {
-keepnames class testPackage.DefaultParams -keepnames class testPackage.DefaultParams
-if class testPackage.DefaultParams -if class testPackage.DefaultParams
-keep class testPackage.DefaultParamsJsonAdapter { -keep class testPackage.DefaultParamsJsonAdapter {
public <init>(com.squareup.moshi.Moshi) public <init>(com.squareup.moshi.Moshi);
} }
-if class testPackage.DefaultParams -if class testPackage.DefaultParams
-keepnames class kotlin.jvm.internal.DefaultConstructorMarker -keepnames class kotlin.jvm.internal.DefaultConstructorMarker
-if class testPackage.DefaultParams -if class testPackage.DefaultParams
-keepclassmembers class testPackage.DefaultParams { -keepclassmembers class testPackage.DefaultParams {
public synthetic <init>(java.lang.String,int,int,kotlin.jvm.internal.DefaultConstructorMarker) public synthetic <init>(java.lang.String,int,int,kotlin.jvm.internal.DefaultConstructorMarker);
} }
""".trimIndent()) """.trimIndent())
@@ -574,8 +574,8 @@ class JsonClassCodegenProcessorTest {
-keepnames class testPackage.Complex -keepnames class testPackage.Complex
-if class testPackage.Complex -if class testPackage.Complex
-keep class testPackage.ComplexJsonAdapter { -keep class testPackage.ComplexJsonAdapter {
public <init>(com.squareup.moshi.Moshi,java.lang.reflect.Type[]) public <init>(com.squareup.moshi.Moshi,java.lang.reflect.Type[]);
private com.squareup.moshi.JsonAdapter mutableListOfStringAtMyQualifierAdapter private com.squareup.moshi.JsonAdapter mutableListOfStringAtMyQualifierAdapter;
} }
-if class testPackage.Complex -if class testPackage.Complex
-keep @interface testPackage.MyQualifier -keep @interface testPackage.MyQualifier
@@ -583,7 +583,7 @@ class JsonClassCodegenProcessorTest {
-keepnames class kotlin.jvm.internal.DefaultConstructorMarker -keepnames class kotlin.jvm.internal.DefaultConstructorMarker
-if class testPackage.Complex -if class testPackage.Complex
-keepclassmembers class testPackage.Complex { -keepclassmembers class testPackage.Complex {
public synthetic <init>(java.lang.String,java.util.List,java.lang.Object,int,int,int,int,kotlin.jvm.internal.DefaultConstructorMarker) public synthetic <init>(java.lang.String,java.util.List,java.lang.Object,int,int,int,int,kotlin.jvm.internal.DefaultConstructorMarker);
} }
""".trimIndent()) """.trimIndent())
@@ -592,13 +592,13 @@ class JsonClassCodegenProcessorTest {
-keepnames class testPackage.MultipleMasks -keepnames class testPackage.MultipleMasks
-if class testPackage.MultipleMasks -if class testPackage.MultipleMasks
-keep class testPackage.MultipleMasksJsonAdapter { -keep class testPackage.MultipleMasksJsonAdapter {
public <init>(com.squareup.moshi.Moshi) public <init>(com.squareup.moshi.Moshi);
} }
-if class testPackage.MultipleMasks -if class testPackage.MultipleMasks
-keepnames class kotlin.jvm.internal.DefaultConstructorMarker -keepnames class kotlin.jvm.internal.DefaultConstructorMarker
-if class testPackage.MultipleMasks -if class testPackage.MultipleMasks
-keepclassmembers class testPackage.MultipleMasks { -keepclassmembers class testPackage.MultipleMasks {
public synthetic <init>(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 <init>(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()) """.trimIndent())
} }