Fix mergeResources task

didi · Mar 6, 2022 · 5a00741 · 5a00741
1 parent ff7f84c
commit 5a00741
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 11 deletions.
diff --git a/...ter-android-gradle-v3_6/src/main/kotlin/com/didiglobal/booster/android/gradle/v3_6/V36.kt b/...ter-android-gradle-v3_6/src/main/kotlin/com/didiglobal/booster/android/gradle/v3_6/V36.kt
@@ -73,7 +73,11 @@ object V36 : AGPInterface {
  get() = mergeAssetsProvider
 
  override val BaseVariant.mergeResourcesTaskProvider: TaskProvider<out Task>
- get() = mergeResourcesProvider
+ get() = try {
+ project.tasks.named(getTaskName("merge", "Resources"))
+ } catch (e: Throwable) {
+ mergeResourcesProvider
+ }
 
  override val BaseVariant.processJavaResourcesTaskProvider: TaskProvider<out Task>
  get() = processJavaResourcesProvider

diff --git a/...ter-android-gradle-v4_0/src/main/kotlin/com/didiglobal/booster/android/gradle/v4_0/V40.kt b/...ter-android-gradle-v4_0/src/main/kotlin/com/didiglobal/booster/android/gradle/v4_0/V40.kt
@@ -70,7 +70,11 @@ internal object V40 : AGPInterface {
  get() = mergeAssetsProvider
 
  override val BaseVariant.mergeResourcesTaskProvider: TaskProvider<out Task>
- get() = mergeResourcesProvider
+ get() = try {
+ project.tasks.named(getTaskName("merge", "Resources"))
+ } catch (e: Throwable) {
+ mergeResourcesProvider
+ }
 
  override val BaseVariant.processJavaResourcesTaskProvider: TaskProvider<out Task>
  get() = processJavaResourcesProvider

diff --git a/...ter-android-gradle-v4_1/src/main/kotlin/com/didiglobal/booster/android/gradle/v4_1/V41.kt b/...ter-android-gradle-v4_1/src/main/kotlin/com/didiglobal/booster/android/gradle/v4_1/V41.kt
@@ -83,7 +83,11 @@ internal object V41 : AGPInterface {
  get() = mergeAssetsProvider
 
  override val BaseVariant.mergeResourcesTaskProvider: TaskProvider<out Task>
- get() = mergeResourcesProvider
+ get() = try {
+ project.tasks.named(getTaskName("merge", "Resources"))
+ } catch (e: Throwable) {
+ mergeResourcesProvider
+ }
 
  override val BaseVariant.processJavaResourcesTaskProvider: TaskProvider<out Task>
  get() = processJavaResourcesProvider

diff --git a/...ter-android-gradle-v4_2/src/main/kotlin/com/didiglobal/booster/android/gradle/v4_2/V42.kt b/...ter-android-gradle-v4_2/src/main/kotlin/com/didiglobal/booster/android/gradle/v4_2/V42.kt
@@ -83,7 +83,11 @@ internal object V42 : AGPInterface {
  get() = mergeAssetsProvider
 
  override val BaseVariant.mergeResourcesTaskProvider: TaskProvider<out Task>
- get() = mergeResourcesProvider
+ get() = try {
+ project.tasks.named(getTaskName("merge", "Resources"))
+ } catch (e: Throwable) {
+ mergeResourcesProvider
+ }
 
  override val BaseVariant.processJavaResourcesTaskProvider: TaskProvider<out Task>
  get() = processJavaResourcesProvider

diff --git a/...ter-android-gradle-v7_0/src/main/kotlin/com/didiglobal/booster/android/gradle/v7_0/V70.kt b/...ter-android-gradle-v7_0/src/main/kotlin/com/didiglobal/booster/android/gradle/v7_0/V70.kt
@@ -91,7 +91,11 @@ internal object V70 : AGPInterface {
  get() = mergeAssetsProvider
 
  override val BaseVariant.mergeResourcesTaskProvider: TaskProvider<out Task>
- get() = mergeResourcesProvider
+ get() = try {
+ project.tasks.named(getTaskName("merge", "Resources"))
+ } catch (e: Throwable) {
+ mergeResourcesProvider
+ }
 
  override val BaseVariant.processJavaResourcesTaskProvider: TaskProvider<out Task>
  get() = processJavaResourcesProvider

diff --git a/...ession/src/main/kotlin/com/didiglobal/booster/compression/SimpleCompressionTaskCreator.kt b/...ession/src/main/kotlin/com/didiglobal/booster/compression/SimpleCompressionTaskCreator.kt
@@ -1,27 +1,21 @@
 package com.didiglobal.booster.compression
 
 import com.android.build.gradle.api.BaseVariant
-import com.android.build.gradle.internal.publishing.AndroidArtifacts
 import com.android.build.gradle.internal.tasks.factory.dependsOn
 import com.didiglobal.booster.command.CommandInstaller
 import com.didiglobal.booster.compression.task.CompressImages
 import com.didiglobal.booster.compression.task.MATCH_ALL_RESOURCES
 import com.didiglobal.booster.compression.task.excludes
-import com.didiglobal.booster.gradle.aapt2Enabled
 import com.didiglobal.booster.gradle.bundleResourcesTaskProvider
-import com.didiglobal.booster.gradle.getArtifactFileCollection
 import com.didiglobal.booster.gradle.isAapt2Enabled
-import com.didiglobal.booster.gradle.mergeResourcesTask
 import com.didiglobal.booster.gradle.mergeResourcesTaskProvider
 import com.didiglobal.booster.gradle.preBuildTaskProvider
 import com.didiglobal.booster.gradle.processResTaskProvider
 import com.didiglobal.booster.gradle.project
 import com.didiglobal.booster.kotlinx.Wildcard
-import com.didiglobal.booster.kotlinx.search
 import org.gradle.api.Task
 import org.gradle.api.UnknownTaskException
 import org.gradle.api.tasks.TaskProvider
-import org.gradle.internal.concurrent.GradleThread
 import java.io.File
 import kotlin.reflect.KClass