Skip to content

Commit 1e3b84d

Browse files
authored
Merge pull request #15 from plateaukao/issue_10_remove_keep_annotation
remove @keep annotation, and enhance proguard rules for release version
2 parents 5613828 + 0aadb53 commit 1e3b84d

File tree

7 files changed

+7
-17
lines changed

7 files changed

+7
-17
lines changed
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
-keep class com.linecorp.flutter_line_sdk.** { *; }
22
-keepattributes Signature
33
-keepattributes *Annotation*
4+
45
## gson
56
-dontwarn sun.misc.**
67
-keep class com.linecorp.flutter_line_sdk.model.** { *; }
8+
-keepclassmembers class com.linecorp.flutter_line_sdk.model.** { <fields>; }
9+
-keepclassmembers class com.linecorp.linesdk.** { <fields>; }
710
-keep class * implements com.google.gson.TypeAdapter
811
-keep class * implements com.google.gson.TypeAdapterFactory
912
-keep class * implements com.google.gson.JsonSerializer
1013
-keep class * implements com.google.gson.JsonDeserializer
1114

1215
# Prevent R8 from leaving Data object members always null
13-
-keepclassmembers,allowobfuscation class * {
16+
-keepclassmembers class * {
1417
@com.google.gson.annotations.SerializedName <fields>;
1518
}

android/src/main/kotlin/com/linecorp/flutter_line_sdk/model/AccessToken.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.linecorp.linesdk.unitywrapper.model
22

3-
import android.support.annotation.Keep
43
import com.google.gson.Gson
54
import com.google.gson.annotations.SerializedName
65
import com.linecorp.linesdk.auth.LineLoginResult
76

87

9-
@Keep
108
data class AccessToken(
119
@SerializedName("access_token")
1210
val accessToken: String,
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.linecorp.linesdk.unitywrapper.model
22

3-
import android.support.annotation.Keep
4-
5-
6-
@Keep
7-
data class BotFriendshipStatus(val friendFlag: Boolean)
3+
data class BotFriendshipStatus(
4+
val friendFlag: Boolean
5+
)

android/src/main/kotlin/com/linecorp/flutter_line_sdk/model/Error.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package com.linecorp.linesdk.unitywrapper.model
22

3-
import android.support.annotation.Keep
43

5-
6-
@Keep
74
data class Error(
85
val code: Int,
96
val message: String

android/src/main/kotlin/com/linecorp/flutter_line_sdk/model/LoginResultForFlutter.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package com.linecorp.linesdk.unitywrapper.model
22

3-
import android.support.annotation.Keep
43
import com.linecorp.flutter_line_sdk.model.UserProfile
54
import com.linecorp.linesdk.Scope
65
import com.linecorp.linesdk.auth.LineLoginResult
76

8-
@Keep
97
data class LoginResultForFlutter(
108
val accessToken: AccessToken,
119
val scope: String,

android/src/main/kotlin/com/linecorp/flutter_line_sdk/model/UserProfile.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.linecorp.flutter_line_sdk.model
22

3-
import android.support.annotation.Keep
43
import com.linecorp.linesdk.LineProfile
54

6-
@Keep
75
data class UserProfile(
86
val userId: String,
97
val displayName: String,

android/src/main/kotlin/com/linecorp/flutter_line_sdk/model/VerifyAccessTokenResult.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.linecorp.linesdk.unitywrapper.model
22

3-
import android.support.annotation.Keep
43
import com.google.gson.annotations.SerializedName
54

6-
@Keep
75
data class VerifyAccessTokenResult(
86
@SerializedName("client_id")
97
val channelId: String,

0 commit comments

Comments
 (0)