From 5756136a727a8317a23bb9bbd013d888dad50606 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Thu, 9 Sep 2021 22:14:29 -0400 Subject: [PATCH] Move apt-specific classes to apt package (#1392) --- .../com/squareup/moshi/kotlin/codegen/{ => apt}/AppliedType.kt | 2 +- .../moshi/kotlin/codegen/{ => apt}/JsonClassCodegenProcessor.kt | 2 +- .../moshi/kotlin/codegen/{ => apt}/MoshiCachedClassInspector.kt | 2 +- .../com/squareup/moshi/kotlin/codegen/{ => apt}/metadata.kt | 2 +- .../java/com/squareup/moshi/kotlin/codegen/JavaSuperclass.java | 2 ++ .../kotlin/codegen/{ => apt}/JsonClassCodegenProcessorTest.kt | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) rename kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/{ => apt}/AppliedType.kt (97%) rename kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/{ => apt}/JsonClassCodegenProcessor.kt (99%) rename kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/{ => apt}/MoshiCachedClassInspector.kt (97%) rename kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/{ => apt}/metadata.kt (99%) rename kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/{ => apt}/JsonClassCodegenProcessorTest.kt (99%) diff --git a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AppliedType.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/AppliedType.kt similarity index 97% rename from kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AppliedType.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/AppliedType.kt index bc6ba93..2d09ff5 100644 --- a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AppliedType.kt +++ b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/AppliedType.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.squareup.moshi.kotlin.codegen +package com.squareup.moshi.kotlin.codegen.apt import javax.lang.model.element.TypeElement import javax.lang.model.type.DeclaredType diff --git a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessor.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessor.kt similarity index 99% rename from kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessor.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessor.kt index 2236762..e2bb823 100644 --- a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessor.kt +++ b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessor.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.squareup.moshi.kotlin.codegen +package com.squareup.moshi.kotlin.codegen.apt import com.google.auto.service.AutoService import com.squareup.kotlinpoet.AnnotationSpec diff --git a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/MoshiCachedClassInspector.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/MoshiCachedClassInspector.kt similarity index 97% rename from kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/MoshiCachedClassInspector.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/MoshiCachedClassInspector.kt index be841f0..756c4e4 100644 --- a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/MoshiCachedClassInspector.kt +++ b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/MoshiCachedClassInspector.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.squareup.moshi.kotlin.codegen +package com.squareup.moshi.kotlin.codegen.apt import com.squareup.kotlinpoet.TypeSpec import com.squareup.kotlinpoet.metadata.ImmutableKmClass diff --git a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/metadata.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/metadata.kt similarity index 99% rename from kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/metadata.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/metadata.kt index 2734fdf..67015c4 100644 --- a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/metadata.kt +++ b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/apt/metadata.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.squareup.moshi.kotlin.codegen +package com.squareup.moshi.kotlin.codegen.apt import com.squareup.kotlinpoet.AnnotationSpec import com.squareup.kotlinpoet.ClassName diff --git a/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JavaSuperclass.java b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JavaSuperclass.java index 1485402..ba97416 100644 --- a/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JavaSuperclass.java +++ b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JavaSuperclass.java @@ -15,6 +15,8 @@ */ package com.squareup.moshi.kotlin.codegen; +import com.squareup.moshi.kotlin.codegen.apt.JsonClassCodegenProcessorTest; + /** For {@link JsonClassCodegenProcessorTest#extendJavaType}. */ public class JavaSuperclass { public int a = 1; diff --git a/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessorTest.kt similarity index 99% rename from kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt rename to kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessorTest.kt index 96d29c6..abf4119 100644 --- a/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt +++ b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessorTest.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.squareup.moshi.kotlin.codegen +package com.squareup.moshi.kotlin.codegen.apt import com.google.common.truth.Truth.assertThat import com.squareup.moshi.JsonAdapter