Merge pull request #484 from vimeo/fixing-parcelable-generation

Making sure parcelable and serializable are both generated

Author: anthonycr

example/build.gradle

@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         applicationId "com.vimeo.example"
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
@@ -26,9 +26,8 @@ android {
 }
 
 dependencies {
-    implementation project(':auth')
-    implementation project(':request')
-    implementation project(':models')
+    implementation project(':models-parcelable')
+    implementation project(':vimeo-networking')
 
     implementation "androidx.appcompat:appcompat:1.2.0"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

model-generator/plugin/src/main/java/com/vimeo/modelgenerator/GenerateModelsPlugin.kt

@@ -11,32 +11,29 @@ class GenerateModelsPlugin : Plugin<Project> {
         val extension =
             project.extensions.create(EXTENSION_NAME, GenerateModelsExtension::class.java, project)
 
-        // Android projects can also have the JVM plugin applied, so we ensure to only register the task once.
-        if (project.plugins.findPlugin(KOTLIN_ANDROID) != null) {
-            // Sets up task on Android based projects.
-            project.plugins.withId(KOTLIN_ANDROID) {
-                registerTask(project, extension)
-                project.tasks.findByName(PRE_BUILD)?.dependsOn(GENERATE_MODELS)
+        project.pluginManager.withPlugin(KOTLIN_ANDROID) {
+            registerTask(project, extension)
+            project.afterEvaluate {
+                project.tasks.findByName(PRE_BUILD)?.dependsOn(project.tasks.findByName(GENERATE_MODELS))
             }
-        } else {
-            // Sets up tasks on JVM based projects.
-            project.plugins.withId(KOTLIN_JVM) {
-                registerTask(project, extension)
-
-                // kaptGenerateStubsKotlin is used as the set up task instead of build
-                // because kapt code generation happens before build is called and
-                // we need to generate the models prior to kapt so the Moshi adapters
-                // can also be generated.
-                val kaptTask: Task? = project.tasks.findByName(KAPT_GENERATE_STUBS)
-
-                // When generating to a module that doesn't use kapt this task will be null
-                // in that case compileKotlin is the earliest task run when the module is being
-                // built so we can attach generateModels to that instead.
-                if (kaptTask != null) {
-                    kaptTask.dependsOn(GENERATE_MODELS)
-                } else {
-                    project.tasks.findByName(COMPILE_KOTLIN)?.dependsOn(GENERATE_MODELS)
-                }
+        }
+
+        project.pluginManager.withPlugin(KOTLIN_JVM) {
+            registerTask(project, extension)
+
+            // kaptGenerateStubsKotlin is used as the set up task instead of build
+            // because kapt code generation happens before build is called and
+            // we need to generate the models prior to kapt so the Moshi adapters
+            // can also be generated.
+            val kaptTask: Task? = project.tasks.findByName(KAPT_GENERATE_STUBS)
+
+            // When generating to a module that doesn't use kapt this task will be null
+            // in that case compileKotlin is the earliest task run when the module is being
+            // built so we can attach generateModels to that instead.
+            if (kaptTask != null) {
+                kaptTask.dependsOn(GENERATE_MODELS)
+            } else {
+                project.tasks.findByName(COMPILE_KOTLIN)?.dependsOn(GENERATE_MODELS)
             }
         }
     }

models-parcelable/src/test/java/com/vimeo/networking2/ModelTest.kt

@@ -25,6 +25,11 @@ class ModelTest {
             .getClassesImplementing(PARCELABLE)
             .loadClasses()
 
+    @Test
+    fun `models exist`() {
+        assertThat(models).isNotEmpty
+    }
+
     @Test
     fun `models are Parcelable`() {
         models
@@ -64,4 +69,4 @@ class ModelTest {
         private const val PACKAGE = "com.vimeo.networking2"
         private const val PARCELABLE = "android.os.Parcelable"
     }
-}
+}

models-serializable/src/test/java/com/vimeo/networking2/ModelTest.kt

@@ -21,6 +21,11 @@ class ModelTest {
             .getClassesImplementing(SERIALIZABLE)
             .loadClasses()
 
+    @Test
+    fun `models exist`() {
+        assertThat(models).isNotEmpty
+    }
+
     @Test
     fun `models are Serializable`() {
         models
@@ -59,4 +64,4 @@ class ModelTest {
         private const val PACKAGE = "com.vimeo.networking2"
         private const val SERIALIZABLE = "java.io.Serializable"
     }
-}
+}