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

Prepare project for Kotlin migration (#1257)

Browse Source
This commit is contained in:
Zac Sweers
2021-02-02 13:11:38 -05:00
committed by GitHub
parent 8518f47f52
commit 6e5bb3a29b
17 changed files with 162 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kotlin/reflect/src/main/java/com/squareup/moshi/KotlinJsonAdapter.kt
View File

@@ -21,5 +21,5 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
message = "this moved to avoid a package name conflict in the Java Platform Module System.",
replaceWith = ReplaceWith("com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory")
)
class KotlinJsonAdapterFactory :
public class KotlinJsonAdapterFactory :
JsonAdapter.Factory by KotlinJsonAdapterFactory()

2
kotlin/reflect/src/main/java/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapter.kt
View File

@@ -179,7 +179,7 @@ internal class KotlinJsonAdapter<T>(
}
}
class KotlinJsonAdapterFactory : JsonAdapter.Factory {
public class KotlinJsonAdapterFactory : JsonAdapter.Factory {
override fun create(type: Type, annotations: MutableSet<out Annotation>, moshi: Moshi):
JsonAdapter<*>? {
if (annotations.isNotEmpty()) return null