adapt gradle 6.0+

kezong · Dec 3, 2019 · 4a1b6cd · 4a1b6cd
1 parent bbf6190
commit 4a1b6cd
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/source/src/main/groovy/com/kezong/fataar/FlavorArtifact.groovy b/source/src/main/groovy/com/kezong/fataar/FlavorArtifact.groovy
@@ -9,6 +9,8 @@ import org.gradle.api.artifacts.component.ComponentArtifactIdentifier
 import org.gradle.api.artifacts.component.ComponentIdentifier
 import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
 import org.gradle.api.internal.artifacts.DefaultResolvedArtifact
+import org.gradle.api.internal.tasks.TaskDependencyContainer
+import org.gradle.api.internal.tasks.TaskDependencyResolveContext
 import org.gradle.api.tasks.TaskDependency
 import org.gradle.internal.Factory
 import org.gradle.internal.component.model.DefaultIvyArtifactName
@@ -32,10 +34,19 @@ class FlavorArtifact {
                 return artifactFile
             }
         }
-        TaskDependency taskDependency = createTaskDependency(artifactProject, variant)
         ComponentArtifactIdentifier artifactIdentifier = createComponentIdentifier(artifactFile)
-
-        return new DefaultResolvedArtifact(identifier, artifactName, artifactIdentifier, taskDependency, fileFactory)
+        if (Utils.compareVersion(project.gradle.gradleVersion, "6.0.0") >= 0) {
+            TaskDependencyContainer taskDependencyContainer = new TaskDependencyContainer() {
+                @Override
+                void visitDependencies(TaskDependencyResolveContext taskDependencyResolveContext) {
+                    taskDependencyResolveContext.add(createTaskDependency(artifactProject, variant))
+                }
+            }
+            return new DefaultResolvedArtifact(identifier, artifactName, artifactIdentifier, taskDependencyContainer, fileFactory)
+        } else {
+            TaskDependency taskDependency = createTaskDependency(artifactProject, variant)
+            return new DefaultResolvedArtifact(identifier, artifactName, artifactIdentifier, taskDependency, fileFactory)
+        }
     }
 
     private static ModuleVersionIdentifier createModuleVersionIdentifier(ResolvedDependency unResolvedArtifact) {

diff --git a/source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy b/source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy
@@ -8,7 +8,9 @@ import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.ResolvedArtifact
 import org.gradle.api.artifacts.ResolvedDependency
 import org.gradle.api.internal.artifacts.DefaultResolvedArtifact
+import org.gradle.api.internal.tasks.CachingTaskDependencyResolveContext
 import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.TaskDependency
 
 /**
  * Processor for variant
@@ -116,7 +118,18 @@ class VariantProcessor {
             } else if (FatLibraryPlugin.ARTIFACT_TYPE_AAR == artifact.type) {
                 AndroidArchiveLibrary archiveLibrary = new AndroidArchiveLibrary(mProject, artifact, mVariant.name)
                 addAndroidArchiveLibrary(archiveLibrary)
-                Set<Task> buildDependencies = artifact.buildDependencies.getDependencies()
+                Set<Task> dependencies
+                if (artifact.buildDependencies instanceof TaskDependency) {
+                    dependencies = artifact.buildDependencies.getDependencies()
+                } else {
+                    CachingTaskDependencyResolveContext context = new CachingTaskDependencyResolveContext()
+                    artifact.buildDependencies.visitDependencies(context)
+                    if (context.queue.size() == 0) {
+                        dependencies = new HashSet<>()
+                    } else {
+                        dependencies = context.queue.getFirst().getDependencies()
+                    }
+                }
                 archiveLibrary.getRootFolder().deleteDir()
                 final def zipFolder = archiveLibrary.getRootFolder()
                 zipFolder.mkdirs()
@@ -128,10 +141,10 @@ class VariantProcessor {
                     into zipFolder
                 }
 
-                if (buildDependencies.size() == 0) {
+                if (dependencies.size() == 0) {
                     explodeTask.dependsOn(prepareTask)
                 } else {
-                    explodeTask.dependsOn(buildDependencies.first())
+                    explodeTask.dependsOn(dependencies.first())
                 }
                 Task javacTask = mVersionAdapter.getJavaCompileTask()
                 javacTask.dependsOn(explodeTask)