diff options
Diffstat (limited to 'build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt')
| -rw-r--r-- | build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt index 934f94bbc4..374132d0d4 100644 --- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt +++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt @@ -34,6 +34,7 @@ import com.android.build.gradle.internal.component.ApplicationCreationConfig import com.android.build.gradle.internal.component.ComponentCreationConfig import com.android.build.gradle.internal.component.ConsumableCreationConfig import com.android.build.gradle.internal.component.InstrumentedTestCreationConfig +import com.android.build.gradle.internal.component.KmpComponentCreationConfig import com.android.build.gradle.internal.component.TestComponentCreationConfig import com.android.build.gradle.internal.component.TestCreationConfig import com.android.build.gradle.internal.component.VariantCreationConfig @@ -301,6 +302,14 @@ abstract class TaskManager( ) ) + creationConfig + .artifacts + .forScope(InternalScopedArtifacts.InternalScope.LOCAL_DEPS) + .setInitialContent( + ScopedArtifact.CLASSES, + creationConfig.computeLocalPackagedJars() + ) + // Add stream of external java resources if EXTERNAL_LIBRARIES isn't in the set of java res // merging scopes. if (!javaResMergingScopes.contains(InternalScopedArtifacts.InternalScope.EXTERNAL_LIBS)) { @@ -1087,7 +1096,9 @@ abstract class TaskManager( * like proguard and jacoco */ protected fun createPostCompilationTasks(creationConfig: ApkCreationConfig) { - Preconditions.checkNotNull(creationConfig.taskContainer.javacTask) + if (creationConfig !is KmpComponentCreationConfig) { + Preconditions.checkNotNull(creationConfig.taskContainer.javacTask) + } taskFactory.register(MergeGeneratedProguardFilesCreationAction(creationConfig)) // Merge Java Resources. @@ -1531,7 +1542,9 @@ abstract class TaskManager( null, object : TaskConfigAction<PackageApplication> { override fun configure(task: PackageApplication) { - task.dependsOn(taskContainer.javacTask) + if (creationConfig !is KmpComponentCreationConfig) { + task.dependsOn(taskContainer.javacTask) + } if (taskContainer.packageSplitResourcesTask != null) { task.dependsOn(taskContainer.packageSplitResourcesTask) } |