fix ResourceSet not found in AGP3.1

bytedance · Jul 27, 2020 · 31ceff8 · 31ceff8
1 parent 28a94be
commit 31ceff8
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/GradleToolKit/src/main/kotlin/com/ss/android/ugc/bytex/gradletoolkit/MergeResources.kt b/GradleToolKit/src/main/kotlin/com/ss/android/ugc/bytex/gradletoolkit/MergeResources.kt
@@ -5,34 +5,34 @@ package com.ss.android.ugc.bytex.gradletoolkit
  */
 
 import com.android.build.gradle.tasks.MergeResources
-import com.android.ide.common.resources.ResourceSet
 import java.io.File
 
+//todo fix reflection
 fun MergeResources.resourceSetList(): List<File> {
     val resourceSets = try {
         resourceSetList1()
     } catch (e: Exception) {
         resourceSetList2()
     }
-    return resourceSets.flatMap { it.sourceFiles }.toSet().toList()
+    return resourceSets.flatMap { it!!.javaClass.getMethod("getSourceFiles").invoke(it) as List<File> }.toSet().toList()
 }
 
 
-fun MergeResources.resourceSetList1(): Iterable<ResourceSet> {
+private fun MergeResources.resourceSetList1(): Iterable<*> {
 
     val computeResourceSetListMethod = MergeResources::class.java.declaredMethods
             .find { it.name == "computeResourceSetList" && it.parameterCount == 0 }!!
 
     val oldIsAccessible = computeResourceSetListMethod.isAccessible
     try {
         computeResourceSetListMethod.isAccessible = true
-        return computeResourceSetListMethod.invoke(this) as Iterable<ResourceSet>
+        return computeResourceSetListMethod.invoke(this) as Iterable<*>
     } finally {
         computeResourceSetListMethod.isAccessible = oldIsAccessible
     }
 }
 
-fun MergeResources.resourceSetList2(): Iterable<ResourceSet> {
+private fun MergeResources.resourceSetList2(): Iterable<*> {
     val getConfiguredResourceSets = MergeResources::class.java.declaredMethods
             .find { it.name == "getConfiguredResourceSets" && it.parameterCount == 1 }!!
 
@@ -44,7 +44,7 @@ fun MergeResources.resourceSetList2(): Iterable<ResourceSet> {
     try {
         getConfiguredResourceSets.isAccessible = true
         getPreprocessor.isAccessible = true
-        return getConfiguredResourceSets.invoke(this, getPreprocessor.invoke(this)) as Iterable<ResourceSet>
+        return getConfiguredResourceSets.invoke(this, getPreprocessor.invoke(this)) as Iterable<*>
     } finally {
         getConfiguredResourceSets.isAccessible = getConfiguredResourceSetsAccess
         getPreprocessor.isAccessible = getPreprocessorAccess