Update all sample project to use moshi-kotlin-codegen and remove not needed kotlin-android-moshi-codegen

Author: macisamuele

README.md

@@ -76,11 +76,9 @@ We're looking forward to more platforms to support in the future. Contributions
 
 You can find some **examples** in this repository to help you set up your generator environment.
 
-* [samples/groovy-android](/samples/groovy-android)<sup>*</sup> Contains an example of an Android Library configured with a `build.gradle` file, using the classical Gradle/Groovy as scripting language.
+* [samples/groovy-android](/samples/groovy-android) Contains an example of an Android Library configured with a `build.gradle` file, using the classical Gradle/Groovy as scripting language.
 
-* [samples/kotlin-android](/samples/kotlin-android)<sup>*</sup> Contains an example of an Android Library configured with a `build.gradle.kts` file, using Kotlin as scripting language.
-
-* [samples/kotlin-android-moshi-codegen](/samples/kotlin-android-moshi-codegen) Based on samples/kotlin-android but the configuration is using [`moshi-codegen`](https://github.com/square/moshi#codegen) for improved parsing performances and it defines proguard rules.
+* [samples/kotlin-android](/samples/kotlin-android) Contains an example of an Android Library configured with a `build.gradle.kts` file, using Kotlin as scripting language.
 
 * [samples/kotlin-coroutines](/samples/kotlin-coroutines)<sup>*</sup> Contains an example of an Android Library configured to output Kotlin Coroutines capable code.
 

samples/groovy-android/build.gradle

@@ -2,6 +2,7 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
     id("com.yelp.codegen.plugin")
+    id("kotlin-kapt")
 }
 
 android {
@@ -17,16 +18,15 @@ android {
 dependencies {
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.70"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.70"
 
     // Moshi + OkHttp + Retrofit
     implementation "com.squareup.moshi:moshi:1.9.2"
     implementation "com.squareup.moshi:moshi-adapters:1.9.2"
-    implementation "com.squareup.moshi:moshi-kotlin:1.9.2"
     implementation "com.squareup.okhttp3:okhttp:3.12.3"
     implementation "com.squareup.retrofit2:retrofit:2.7.1"
     implementation "com.squareup.retrofit2:converter-moshi:2.7.1"
     implementation "com.squareup.retrofit2:adapter-rxjava2:2.7.1"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2"
 
     // Date Support
     implementation "com.jakewharton.threetenabp:threetenabp:1.2.2"

samples/junit-tests/build.gradle

@@ -19,12 +19,10 @@ android {
 dependencies {
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.70"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.70"
 
     // Moshi + OkHttp + Retrofit
     implementation "com.squareup.moshi:moshi:1.9.2"
     implementation "com.squareup.moshi:moshi-adapters:1.9.2"
-    implementation "com.squareup.moshi:moshi-kotlin:1.9.2"
     implementation "com.squareup.okhttp3:okhttp:3.12.3"
     implementation "com.squareup.retrofit2:retrofit:2.7.1"
     implementation "com.squareup.retrofit2:converter-moshi:2.7.1"

samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/tools/GeneratedCodeConverters.kt

@@ -1,14 +1,12 @@
 package com.yelp.codegen.generatecodesamples.tools
 
 import com.squareup.moshi.Moshi
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import retrofit2.Converter
 import retrofit2.converter.moshi.MoshiConverterFactory
 
 object GeneratedCodeConverters {
     private val moshi = Moshi.Builder()
             .add(XNullableAdapterFactory())
-            .add(KotlinJsonAdapterFactory())
             .add(TypesAdapterFactory())
             .build()
 

samples/kotlin-android-moshi-codegen/.gitignore

@@ -17,12 +17,10 @@ android {
 dependencies {
     // Kotlin
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.70")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.70")
 
     // Moshi + OkHttp + Retrofit
     implementation("com.squareup.moshi:moshi:1.9.2")
     implementation("com.squareup.moshi:moshi-adapters:1.9.2")
-    implementation("com.squareup.moshi:moshi-kotlin:1.9.2")
     implementation("com.squareup.okhttp3:okhttp:3.12.3")
     implementation("com.squareup.retrofit2:retrofit:2.7.1")
     implementation("com.squareup.retrofit2:converter-moshi:2.7.1")

samples/kotlin-android-moshi-codegen/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
     id("com.yelp.codegen.plugin")
+    id("kotlin-kapt")
 }
 
 android {
@@ -17,15 +18,14 @@ android {
 dependencies {
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.70"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.70"
 
     // Moshi + OkHttp + Retrofit
     implementation "com.squareup.moshi:moshi:1.9.2"
     implementation "com.squareup.moshi:moshi-adapters:1.9.2"
-    implementation "com.squareup.moshi:moshi-kotlin:1.9.2"
     implementation "com.squareup.okhttp3:okhttp:3.12.3"
     implementation "com.squareup.retrofit2:retrofit:2.7.1"
     implementation "com.squareup.retrofit2:converter-moshi:2.7.1"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2"
 
     // Date Support
     implementation "com.jakewharton.threetenabp:threetenabp:1.2.2"