Merge pull request #229 from jsonschema2dataclass/agp7

Return AGP 7 support in the same way as AGP 3

Author: eirnym

src/main/kotlin/org/jsonschema2dataclass/js2p/Js2pPlugin.kt

@@ -5,11 +5,10 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.ProjectConfigurationException
 import org.gradle.api.Task
-import org.gradle.api.file.Directory
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.FileCollection
 import org.gradle.api.plugins.JavaLibraryPlugin
 import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.util.GradleVersion
 import org.jsonschema2dataclass.js2p.support.applyInternalAndroid
@@ -34,6 +33,7 @@ class Js2pPlugin : Plugin<Project> {
         project.extensions.create("jsonSchema2Pojo", Js2pExtension::class.java)
         val pluginExtension = project.extensions.getByType(Js2pExtension::class.java)
         pluginExtension.targetDirectoryPrefix.convention(project.layout.buildDirectory.dir(TARGET_FOLDER_BASE))
+
         if (javaPlugins.any { project.plugins.hasPlugin(it) }) {
             project.afterEvaluate {
                 applyInternalJava(pluginExtension, project)
@@ -78,7 +78,7 @@ internal fun createJS2DTask(
     targetDirectorySuffix: String,
     postConfigure: (
         task: TaskProvider<out Js2pGenerationTask>,
-        Provider<Directory>
+        DirectoryProperty
     ) -> Unit,
 ): TaskProvider<Task> {
 
@@ -88,7 +88,8 @@ internal fun createJS2DTask(
     }
 
     extension.executions.forEachIndexed { configurationId, configuration ->
-        val targetPath = extension.targetDirectoryPrefix.dir("${configuration.name}$targetDirectorySuffix")
+        val targetPath = project.objects.directoryProperty()
+        targetPath.set(extension.targetDirectoryPrefix.dir("${configuration.name}$targetDirectorySuffix"))
         val taskProvider = createJS2DTaskExecution(
             project,
             configurationId,
@@ -113,7 +114,7 @@ private fun createJS2DTaskExecution(
     taskNameSuffix: String,
     configurationName: String,
     source: FileCollection,
-    targetPath: Provider<Directory>,
+    targetPath: DirectoryProperty,
 ): TaskProvider<out Js2pGenerationTask> {
     val taskName = "${TASK_NAME}${configurationId}$taskNameSuffix"
     return project.tasks.register(taskName, Js2pGenerationTask::class.java) { task ->

src/main/kotlin/org/jsonschema2dataclass/js2p/support/AndroidSupport.kt

@@ -19,10 +19,14 @@ internal fun applyInternalAndroid(extension: Js2pExtension, project: Project) {
         getAndroidJsonPath(project),
         JavaVersion.current() >= JavaVersion.VERSION_1_9
     )
-
+    val experimental = project.properties["org.jsonschema2dataclass.agp7.experimental"]?.toString().toBoolean()
     when (com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.split(".")[0].toInt()) {
         3, 4 -> applyInternalAndroidAgp3(extension, project)
-        7 -> applyInternalAndroidAgp7(extension, project)
+        7 -> if (experimental) {
+            applyInternalAndroidAgp7(extension, project)
+        } else {
+            applyInternalAndroidAgp3(extension, project)
+        }
         else -> throw ProjectConfigurationException("$TASK_NAME: Plugin supports AGP 3.x, 4.x or 7.x", listOf())
     }
 }

src/main/kotlin/org/jsonschema2dataclass/js2p/support/JavaSupport.kt

@@ -36,7 +36,6 @@ internal fun applyInternalJava(extension: Js2pExtension, project: Project) {
         @Suppress("UnstableApiUsage")
         project.tasks.withType(ProcessResources::class.java) {
             generationTaskProvider.configure { generationTask ->
-
                 generationTask.dependsOn(it)
             }
         }

src/main/kotlin/org/jsonschema2dataclass/js2p/support/android/Agp7.kt

@@ -4,6 +4,8 @@ import com.android.build.api.artifact.Artifact
 import com.android.build.api.artifact.ArtifactKind
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.api.variant.Variant
+import com.android.build.gradle.internal.res.LinkApplicationAndroidResourcesTask
+import com.android.build.gradle.tasks.JavaPreCompileTask
 import org.gradle.api.Project
 import org.gradle.api.file.Directory
 import org.gradle.api.file.FileSystemLocation
@@ -20,15 +22,24 @@ internal fun applyInternalAndroidAgp7(extension: Js2pExtension, project: Project
 
 private fun createTasksForVariant7(project: Project, extension: Js2pExtension, variant: Variant) {
     val capitalizedName = variant.name.capitalization()
-    KotlinVersion.CURRENT
     createJS2DTask(
         project,
         extension,
         "For$capitalizedName",
         "${variant.flavorName}/${variant.buildType}/"
-    ) { genTask, _ ->
-        variant.artifacts.use(genTask).wiredWith { it.targetDirectory }
+    ) { genTask, targetDirectory ->
+        variant.artifacts.use(genTask).wiredWith { targetDirectory }
             .toCreate(ArtifactType7.SINGLE_DIRECTORY_ARTIFACT)
+
+        project.tasks.withType(JavaPreCompileTask::class.java) {
+            it.dependsOn(genTask)
+        }
+
+        project.tasks.withType(LinkApplicationAndroidResourcesTask::class.java) {
+            genTask.configure { task ->
+                task.dependsOn(it)
+            }
+        }
     }
 }