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

Update to kotlin-metadata 1.4 and use shaded compiler

Browse Source 
Per https://github.com/Takhion/kotlin-metadata/releases/tag/v1.4.0

Now the compiler is shaded and not prone to breaking on kotlin updates, making it more robust until Jetbrains releases an official API for reading metadata.
This commit is contained in:
Zac Sweers
2018-04-28 20:30:30 -07:00
parent b96397f6eb
commit d195203865
7 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kotlin-codegen/compiler/pom.xml
View File

@@ -64,6 +64,7 @@
<dependency>
<groupId>me.eugeniomarletti.kotlin.metadata</groupId>
<artifactId>kotlin-metadata</artifactId>
<version>1.4.0</version>
</dependency>
<!--
Though we don't use compile-testing, including it is a convenient way to get tools.jar on the

2
kotlin-codegen/compiler/src/main/java/com/squareup/moshi/AdapterGenerator.kt
View File

@@ -31,8 +31,8 @@ import com.squareup.kotlinpoet.TypeVariableName
import com.squareup.kotlinpoet.asClassName
import com.squareup.kotlinpoet.asTypeName
import me.eugeniomarletti.kotlin.metadata.isDataClass
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Visibility
import me.eugeniomarletti.kotlin.metadata.visibility
import org.jetbrains.kotlin.serialization.ProtoBuf.Visibility
import java.lang.reflect.Type
import javax.lang.model.element.TypeElement

4
kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetConstructor.kt
View File

@@ -18,7 +18,7 @@ package com.squareup.moshi
import me.eugeniomarletti.kotlin.metadata.KotlinClassMetadata
import me.eugeniomarletti.kotlin.metadata.isPrimary
import me.eugeniomarletti.kotlin.metadata.jvm.getJvmConstructorSignature
import org.jetbrains.kotlin.serialization.ProtoBuf.Constructor
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Constructor
import javax.lang.model.element.ElementKind
import javax.lang.model.element.ExecutableElement
import javax.lang.model.util.Elements
@@ -60,4 +60,4 @@ internal data class TargetConstructor(
return TargetConstructor(element, proto, parameters)
}
}
}
}

4
kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetParameter.kt
View File

@@ -15,7 +15,7 @@
*/
package com.squareup.moshi
import org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.ValueParameter
import javax.lang.model.element.VariableElement
/** A parameter in user code that should be populated by generated code. */
@@ -24,4 +24,4 @@ internal data class TargetParameter(
val proto: ValueParameter,
val index: Int,
val element: VariableElement
)
)

10
kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetProperty.kt
View File

@@ -19,11 +19,11 @@ import com.google.auto.common.AnnotationMirrors
import com.squareup.kotlinpoet.TypeName
import me.eugeniomarletti.kotlin.metadata.declaresDefaultValue
import me.eugeniomarletti.kotlin.metadata.hasSetter
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Property
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Visibility.INTERNAL
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Visibility.PROTECTED
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Visibility.PUBLIC
import me.eugeniomarletti.kotlin.metadata.visibility
import org.jetbrains.kotlin.serialization.ProtoBuf.Property
import org.jetbrains.kotlin.serialization.ProtoBuf.Visibility.INTERNAL
import org.jetbrains.kotlin.serialization.ProtoBuf.Visibility.PROTECTED
import org.jetbrains.kotlin.serialization.ProtoBuf.Visibility.PUBLIC
import javax.annotation.processing.Messager
import javax.lang.model.element.AnnotationMirror
import javax.lang.model.element.Element
@@ -130,4 +130,4 @@ internal data class TargetProperty(
}
override fun toString() = name
}
}

12
kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetType.kt
View File

@@ -28,13 +28,13 @@ import me.eugeniomarletti.kotlin.metadata.getPropertyOrNull
import me.eugeniomarletti.kotlin.metadata.isInnerClass
import me.eugeniomarletti.kotlin.metadata.kotlinMetadata
import me.eugeniomarletti.kotlin.metadata.modality
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Class
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Modality.ABSTRACT
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.TypeParameter
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Visibility.LOCAL
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.NameResolver
import me.eugeniomarletti.kotlin.metadata.shadow.util.capitalizeDecapitalize.decapitalizeAsciiOnly
import me.eugeniomarletti.kotlin.metadata.visibility
import org.jetbrains.kotlin.serialization.ProtoBuf.Class
import org.jetbrains.kotlin.serialization.ProtoBuf.Modality.ABSTRACT
import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter
import org.jetbrains.kotlin.serialization.ProtoBuf.Visibility.LOCAL
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import org.jetbrains.kotlin.util.capitalizeDecapitalize.decapitalizeAsciiOnly
import javax.annotation.processing.Messager
import javax.lang.model.element.Element
import javax.lang.model.element.ElementKind

10
kotlin-codegen/compiler/src/main/java/com/squareup/moshi/metadata.kt
View File

@@ -22,10 +22,10 @@ import com.squareup.kotlinpoet.ParameterizedTypeName
import com.squareup.kotlinpoet.TypeName
import com.squareup.kotlinpoet.TypeVariableName
import com.squareup.kotlinpoet.WildcardTypeName
import org.jetbrains.kotlin.serialization.ProtoBuf.Type
import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter
import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Type
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.TypeParameter
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.TypeParameter.Variance
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.NameResolver
internal fun TypeParameter.asTypeName(
nameResolver: NameResolver,
@@ -129,4 +129,4 @@ internal fun Type.asTypeName(
}
return typeName
}
}