From d19520386530f1250bb4f84674a4f0dc41c81068 Mon Sep 17 00:00:00 2001
From: Zac Sweers <pandanomic@gmail.com>
Date: Sat, 28 Apr 2018 20:30:30 -0700
Subject: [PATCH] Update to kotlin-metadata 1.4 and use shaded compiler

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.
---
 kotlin-codegen/compiler/pom.xml                      |  1 +
 .../main/java/com/squareup/moshi/AdapterGenerator.kt |  2 +-
 .../java/com/squareup/moshi/TargetConstructor.kt     |  4 ++--
 .../main/java/com/squareup/moshi/TargetParameter.kt  |  4 ++--
 .../main/java/com/squareup/moshi/TargetProperty.kt   | 10 +++++-----
 .../src/main/java/com/squareup/moshi/TargetType.kt   | 12 ++++++------
 .../src/main/java/com/squareup/moshi/metadata.kt     | 10 +++++-----
 7 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/kotlin-codegen/compiler/pom.xml b/kotlin-codegen/compiler/pom.xml
index a06b1dc..9e869eb 100644
--- a/kotlin-codegen/compiler/pom.xml
+++ b/kotlin-codegen/compiler/pom.xml
@@ -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
diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/AdapterGenerator.kt b/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/AdapterGenerator.kt
index 2e408ac..b5061c3 100644
--- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/AdapterGenerator.kt
+++ b/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/AdapterGenerator.kt
@@ -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
 
diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetConstructor.kt b/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetConstructor.kt
index 9512f8d..dd8abb8 100644
--- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetConstructor.kt
+++ b/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetConstructor.kt
@@ -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)
     }
   }
-}
\ No newline at end of file
+}
diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetParameter.kt b/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetParameter.kt
index fe15fbd..c656792 100644
--- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetParameter.kt
+++ b/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetParameter.kt
@@ -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
-)
\ No newline at end of file
+)
diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetProperty.kt b/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetProperty.kt
index 2fad964..b8a174e 100644
--- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetProperty.kt
+++ b/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetProperty.kt
@@ -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
-}
\ No newline at end of file
+}
diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetType.kt b/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetType.kt
index e81db9a..343355c 100644
--- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetType.kt
+++ b/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetType.kt
@@ -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
diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/metadata.kt b/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/metadata.kt
index b170212..03c2b1e 100644
--- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/metadata.kt
+++ b/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/metadata.kt
@@ -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
-}
\ No newline at end of file
+}