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

Explicitly denote util public APIs in japicmp (#1511)

Browse Source
This commit is contained in:
Zac Sweers
2022-01-21 17:22:13 -05:00
committed by GitHub
parent c5e98e5be8
commit b2a67760d4
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
moshi/japicmp/build.gradle.kts
View File

@@ -26,16 +26,25 @@ val japicmp = tasks.register<JapicmpTask>("japicmp") {
isIgnoreMissingClasses = true isIgnoreMissingClasses = true
isIncludeSynthetic = true isIncludeSynthetic = true
classExcludes = listOf( classExcludes = listOf(
"com.squareup.moshi.internal.NonNullJsonAdapter", // Internal.
"com.squareup.moshi.internal.NullSafeJsonAdapter", // Internal.
"com.squareup.moshi.internal.Util", // Internal.
"com.squareup.moshi.StandardJsonAdapters", // Package-private
"com.squareup.moshi.RecordJsonAdapter\$ComponentBinding", // Package-private
"com.squareup.moshi.AdapterMethodsFactory", // Internal. "com.squareup.moshi.AdapterMethodsFactory", // Internal.
"com.squareup.moshi.ClassJsonAdapter", // Internal. "com.squareup.moshi.ClassJsonAdapter", // Internal.
"com.squareup.moshi.RecordJsonAdapter\$ComponentBinding", // Package-private
"com.squareup.moshi.StandardJsonAdapters", // Package-private
"com.squareup.moshi.internal.NonNullJsonAdapter", // Internal.
"com.squareup.moshi.internal.NullSafeJsonAdapter", // Internal.
"com.squareup.moshi.internal.Util\$GenericArrayTypeImpl", // Internal.
"com.squareup.moshi.internal.Util\$ParameterizedTypeImpl", // Internal.
"com.squareup.moshi.internal.Util\$WildcardTypeImpl", // Internal.
) )
methodExcludes = listOf( methodExcludes = listOf(
"com.squareup.moshi.JsonAdapter#indent(java.lang.String)", // Was unintentionally open before "com.squareup.moshi.JsonAdapter#indent(java.lang.String)", // Was unintentionally open before
"com.squareup.moshi.internal.Util#hasNullable(java.lang.annotation.Annotation[])",
"com.squareup.moshi.internal.Util#jsonAnnotations(java.lang.annotation.Annotation[])",
"com.squareup.moshi.internal.Util#jsonAnnotations(java.lang.reflect.AnnotatedElement)",
"com.squareup.moshi.internal.Util#jsonName(java.lang.String, com.squareup.moshi.Json)",
"com.squareup.moshi.internal.Util#jsonName(java.lang.String, java.lang.reflect.AnnotatedElement)",
"com.squareup.moshi.internal.Util#resolve(java.lang.reflect.Type, java.lang.Class, java.lang.reflect.Type)",
"com.squareup.moshi.internal.Util#typeAnnotatedWithAnnotations(java.lang.reflect.Type, java.util.Set)",
) )
fieldExcludes = listOf( fieldExcludes = listOf(
"com.squareup.moshi.CollectionJsonAdapter#FACTORY", // False-positive, class is not public anyway "com.squareup.moshi.CollectionJsonAdapter#FACTORY", // False-positive, class is not public anyway

1
moshi/src/main/java/com/squareup/moshi/internal/Util.kt
View File

@@ -60,6 +60,7 @@ private val METADATA: Class<out Annotation>? = try {
// We look up the constructor marker separately because Metadata might be (justifiably) // We look up the constructor marker separately because Metadata might be (justifiably)
// stripped by R8/Proguard but the DefaultConstructorMarker is still present. // stripped by R8/Proguard but the DefaultConstructorMarker is still present.
@JvmField
public val DEFAULT_CONSTRUCTOR_MARKER: Class<*>? = try { public val DEFAULT_CONSTRUCTOR_MARKER: Class<*>? = try {
Class.forName("kotlin.jvm.internal.DefaultConstructorMarker") Class.forName("kotlin.jvm.internal.DefaultConstructorMarker")
} catch (ignored: ClassNotFoundException) { } catch (ignored: ClassNotFoundException) {