diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectApksTask.kt b/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectApksTask.kt index db36493f..efaf7ce1 100644 --- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectApksTask.kt +++ b/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectApksTask.kt @@ -1,7 +1,9 @@ package dev.msfjarvis.aps.gradle.artifacts import com.android.build.api.variant.BuiltArtifactsLoader +import java.io.File import java.nio.file.Files +import java.nio.file.Path import java.nio.file.Paths import java.nio.file.StandardCopyOption import org.gradle.api.DefaultTask @@ -36,6 +38,10 @@ abstract class CollectApksTask : DefaultTask() { @TaskAction fun run() { val outputDir = outputDirectory.asFile.get() + val outputDirStream = + Files.walk(outputDir.toPath()).sorted(Comparator.reverseOrder()).map(Path::toFile) + outputDirStream.forEach(File::delete) + outputDirStream.close() outputDir.mkdirs() val builtArtifacts = builtArtifactsLoader.get().load(apkFolder.get()) ?: error("Cannot load APKs") diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectBundleTask.kt b/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectBundleTask.kt index c9b99987..a771b818 100644 --- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectBundleTask.kt +++ b/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectBundleTask.kt @@ -1,6 +1,8 @@ package dev.msfjarvis.aps.gradle.artifacts +import java.io.File import java.nio.file.Files +import java.nio.file.Path import java.nio.file.StandardCopyOption import org.gradle.api.DefaultTask import org.gradle.api.file.DirectoryProperty @@ -25,6 +27,10 @@ abstract class CollectBundleTask : DefaultTask() { @TaskAction fun taskAction() { val outputDir = outputDirectory.asFile.get() + val outputDirStream = + Files.walk(outputDir.toPath()).sorted(Comparator.reverseOrder()).map(Path::toFile) + outputDirStream.forEach(File::delete) + outputDirStream.close() outputDir.mkdirs() Files.copy( bundleFile.get().asFile.toPath(),