Skip to content

Commit

Permalink
Fix compilation errors from cherry-picks
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
  • Loading branch information
SUPERCILEX committed Jun 27, 2021
1 parent b03d9d1 commit 8ed9260
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ internal class PlayPublisherPlugin : Plugin<Project> {

@Suppress("UNCHECKED_CAST") // Needed for overload ambiguity
fun getArtifactDependenciesHack(
artifact: ArtifactType<*>,
artifact: SingleArtifact<*>,
): Provider<*> = extension.artifactDir.map<String> {
""
}.orElse(variant.artifacts.get(artifact) as Provider<String>)
Expand Down Expand Up @@ -263,7 +263,7 @@ internal class PlayPublisherPlugin : Plugin<Project> {
outputDirectory.set(project.layout.buildDirectory.dir(
"outputs/internal-sharing/apk/${variant.name}"))

dependsOn(getArtifactDependenciesHack(ArtifactType.APK))
dependsOn(getArtifactDependenciesHack(SingleArtifact.APK))
configure3pDeps(extension, taskVariantName)
}
publishInternalSharingApkAllTask { dependsOn(publishInternalSharingApkTask) }
Expand All @@ -281,7 +281,7 @@ internal class PlayPublisherPlugin : Plugin<Project> {
outputDirectory.set(project.layout.buildDirectory.dir(
"outputs/internal-sharing/bundle/${variant.name}"))

dependsOn(getArtifactDependenciesHack(ArtifactType.BUNDLE))
dependsOn(getArtifactDependenciesHack(SingleArtifact.BUNDLE))
configure3pDeps(extension, taskVariantName)
}
publishInternalSharingBundleAllTask { dependsOn(publishInternalSharingBundleTask) }
Expand Down Expand Up @@ -437,7 +437,7 @@ internal class PlayPublisherPlugin : Plugin<Project> {
files
}))

dependsOn(getArtifactDependenciesHack(ArtifactType.APK))
dependsOn(getArtifactDependenciesHack(SingleArtifact.APK))
finalizedBy(commitEditTask)
configure3pDeps(extension, taskVariantName)

Expand All @@ -461,7 +461,7 @@ internal class PlayPublisherPlugin : Plugin<Project> {
configureInputs()
bundles.from(findBundleFiles())

dependsOn(getArtifactDependenciesHack(ArtifactType.BUNDLE))
dependsOn(getArtifactDependenciesHack(SingleArtifact.BUNDLE))
finalizedBy(commitEditTask)
configure3pDeps(extension, taskVariantName)
}
Expand Down

0 comments on commit 8ed9260

Please sign in to comment.