fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-12-14 00:31:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modernize build a bit (#1383)

Browse Source
This commit is contained in:
Zac Sweers
2021-08-23 17:09:59 -04:00
committed by GitHub
parent 95250b0359
commit 6947ab00d0
18 changed files with 113 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt
View File

@@ -85,7 +85,10 @@ internal class AdapterGenerator(
// KotlinPoet always generates explicit public modifiers for public members.
"RedundantVisibilityModifier",
// For LambdaTypeNames we have to import kotlin.functions.* types
"PLATFORM_CLASS_MAPPED_TO_KOTLIN"
"PLATFORM_CLASS_MAPPED_TO_KOTLIN",
// Cover for calling fromJson() on a Nothing property type. Theoretically nonsensical but we
// support it
"IMPLICIT_NOTHING_TYPE_ARGUMENT_IN_RETURN_POSITION"
).let { suppressions ->
AnnotationSpec.builder(Suppress::class)
.useSiteTarget(FILE)

2
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/kotlintypes.kt
View File

@@ -23,6 +23,7 @@ import com.squareup.kotlinpoet.CHAR
import com.squareup.kotlinpoet.ClassName
import com.squareup.kotlinpoet.CodeBlock
import com.squareup.kotlinpoet.DOUBLE
import com.squareup.kotlinpoet.DelicateKotlinPoetApi
import com.squareup.kotlinpoet.FLOAT
import com.squareup.kotlinpoet.INT
import com.squareup.kotlinpoet.KModifier
@@ -79,6 +80,7 @@ internal fun TypeName.defaultPrimitiveValue(): CodeBlock =
else -> CodeBlock.of("null")
}
@OptIn(DelicateKotlinPoetApi::class)
internal fun TypeName.asTypeBlock(): CodeBlock {
if (annotations.isNotEmpty()) {
return copy(annotations = emptyList()).asTypeBlock()

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

@@ -17,6 +17,7 @@ package com.squareup.moshi.kotlin.codegen
import com.squareup.kotlinpoet.AnnotationSpec
import com.squareup.kotlinpoet.ClassName
import com.squareup.kotlinpoet.DelicateKotlinPoetApi
import com.squareup.kotlinpoet.KModifier
import com.squareup.kotlinpoet.LambdaTypeName
import com.squareup.kotlinpoet.ParameterizedTypeName
@@ -117,6 +118,7 @@ internal fun primaryConstructor(
}
/** Returns a target type for `element`, or null if it cannot be used with code gen. */
@OptIn(DelicateKotlinPoetApi::class)
@KotlinPoetMetadataPreview
internal fun targetType(
messager: Messager,
@@ -233,7 +235,6 @@ internal fun targetType(
val resolvedTypes = mutableListOf<ResolvedTypeMapping>()
val superTypes = appliedType.supertypes(types)
.filterNot { supertype ->
@Suppress("DEPRECATION") // Appropriate in this case
supertype.element.asClassName() == OBJECT_CLASS || // Don't load properties for java.lang.Object.
supertype.element.kind != ElementKind.CLASS // Don't load properties for interface types.
}
@@ -273,7 +274,6 @@ internal fun targetType(
val superSuperClass = supertype.element.superclass as DeclaredType
// Convert to an element and back to wipe the typed generics off of this
@Suppress("DEPRECATION") // Appropriate in this case
val untyped = superSuperClass.asElement().asType().asTypeName() as ParameterizedTypeName
resolvedTypes += ResolvedTypeMapping(
target = untyped.rawType,
@@ -289,7 +289,6 @@ internal fun targetType(
}
for ((localAppliedType, supertypeApi) in superTypes.entries) {
@Suppress("DEPRECATION") // Appropriate in this case
val appliedClassName = localAppliedType.element.asClassName()
val supertypeProperties = declaredProperties(
constructor = constructor,
@@ -317,7 +316,6 @@ internal fun targetType(
if (forceInternal) KModifier.INTERNAL else visibility
}
@Suppress("DEPRECATION") // Appropriate in this case
return TargetType(
typeName = element.asType().asTypeName(),
constructor = constructor,