Improvement for AGPInterface

Author: johnsonlee

booster-android-gradle-api/src/main/kotlin/com/didiglobal/booster/gradle/BaseVariant.kt

@@ -19,7 +19,7 @@ import java.io.File
  */
 @Suppress("DEPRECATION")
 val BaseVariant.project: Project
-    get() = globalScope.project
+    get() = AGP.run { globalScope }.project
 
 /**
  * The `android` extension associates with this variant

booster-android-gradle-api/src/main/kotlin/com/didiglobal/booster/gradle/Internal.kt

@@ -76,7 +76,7 @@ class ResolvedArtifactResults(private val variant: BaseVariant) : Collection<Res
     /**
      * Default output location: $buildDir/intermediates/dependencies/${variantDirName}/dependencies.txt
      */
-    private fun makeDependenciesOutput() = variant.globalScope.intermediatesDir.file(
+    private fun makeDependenciesOutput() = AGP.run { variant.globalScope }.intermediatesDir.file(
             "dependencies",
             variant.dirName.separatorsToSystem(),
             "dependencies.txt"

booster-android-gradle-api/src/main/kotlin/com/didiglobal/booster/gradle/ResolvedArtifactResults.kt

@@ -10,6 +10,7 @@ import com.android.build.gradle.api.BaseVariant
 import com.android.build.gradle.internal.pipeline.TransformManager
 import com.android.build.gradle.internal.pipeline.TransformTask
 import com.android.build.gradle.internal.publishing.AndroidArtifacts
+import com.android.build.gradle.internal.scope.GlobalScope
 import com.android.build.gradle.internal.scope.VariantScope
 import com.android.build.gradle.internal.variant.BaseVariantData
 import com.android.builder.core.VariantType
@@ -49,6 +50,8 @@ interface AGPInterface {
 
     val BaseVariant.variantScope: VariantScope
 
+    val BaseVariant.globalScope: GlobalScope
+
     val BaseVariant.originalApplicationId: String
 
     val BaseVariant.hasDynamicFeature: Boolean

booster-android-gradle-compat/src/main/kotlin/com/didiglobal/booster/gradle/AGPInterface.kt

@@ -121,6 +121,11 @@ abstract class V30IntegrationTest(val isLib: Boolean) {
     fun `test AGPInterface#variantScope`() {
     }
 
+    @Test
+    @Case(GlobalScopeTestCase::class)
+    fun `test AGPInterface#globalScope`() {
+    }
+
     @Test
     @Case(OriginalApplicationIdTestCase::class)
     fun `test AGPInterface#originalApplicationId`() {
@@ -285,14 +290,18 @@ class VariantDataTestCase : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.variantData })
     }
-
 }
 
 class VariantScopeTestCase : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.variantScope })
     }
+}
 
+class GlobalScopeTestCase : VariantTestCase() {
+    override fun apply(variant: BaseVariant) {
+        assertNotNull(AGP.run { variant.globalScope })
+    }
 }
 
 class OriginalApplicationIdTestCase : VariantTestCase() {

booster-android-gradle-v3_0/src/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v3_0/V30IntegrationTest.kt

@@ -79,6 +79,9 @@ object V30 : AGPInterface {
     override val BaseVariant.variantScope: VariantScope
         get() = variantData.scope
 
+    override val BaseVariant.globalScope: GlobalScope
+        get() = variantScope.globalScope
+
     override val BaseVariant.originalApplicationId: String
         get() = variantData.variantConfiguration.originalApplicationId
 

booster-android-gradle-v3_0/src/main/kotlin/com/didiglobal/booster/android/gradle/v3_0/V30.kt

@@ -121,6 +121,11 @@ abstract class V32IntegrationTest(val isLib: Boolean) {
     fun `test AGPInterface#variantScope`() {
     }
 
+    @Test
+    @Case(GlobalScopeTestCase::class)
+    fun `test AGPInterface#globalScope`() {
+    }
+
     @Test
     @Case(OriginalApplicationIdTestUnit::class)
     fun `test AGPInterface#originalApplicationId`() {
@@ -285,14 +290,18 @@ class VariantDataTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.variantData })
     }
-
 }
 
 class VariantScopeTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.variantScope })
     }
+}
 
+class GlobalScopeTestCase : VariantTestCase() {
+    override fun apply(variant: BaseVariant) {
+        assertNotNull(AGP.run { variant.globalScope })
+    }
 }
 
 class OriginalApplicationIdTestUnit : VariantTestCase() {

booster-android-gradle-v3_2/src/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v3_2/V32IntegrationTest.kt

@@ -93,6 +93,9 @@ object V32 : AGPInterface {
     override val BaseVariant.variantScope: VariantScope
         get() = variantData.scope
 
+    override val BaseVariant.globalScope: GlobalScope
+        get() = variantScope.globalScope
+
     override val BaseVariant.originalApplicationId: String
         get() = variantData.variantConfiguration.originalApplicationId
 

booster-android-gradle-v3_2/src/main/kotlin/com/didiglobal/booster/android/gradle/v3_2/V32.kt

@@ -65,175 +65,151 @@ abstract class V33IntegrationTest(val isLib: Boolean) {
     @Test
     @Case(ScopeFullWithFeaturesTest::class)
     fun `test AGPInterface#scopeFullWithFeatures`() {
-
     }
 
     @Test
     @Case(ScopeFullLibraryWithFeaturesTest::class)
     fun `test AGPInterface#scopeFullLibraryWithFeatures`() {
-
     }
 
     @Test
     @Case(ProjectTest::class)
     fun `test AGPInterface#project`() {
-
     }
 
     @Test
     @Case(JavaCompilerTaskTestUnit::class)
     fun `test AGPInterface#javaCompilerTask`() {
-
     }
 
     @Test
     @Case(PreBuildTaskTestUnit::class)
     fun `test AGPInterface#preBuildTask`() {
-
     }
 
     @Test
     @Case(AssembleTaskTestUnit::class)
     fun `test AGPInterface#assembleTask`() {
-
     }
 
     @Test
     @Case(MergeAssetsTaskTestUnit::class)
     fun `test AGPInterface#mergeAssetsTask`() {
-
     }
 
     @Test
     @Case(MergeResourcesTaskTestUnit::class)
     fun `test AGPInterface#mergeResources`() {
-
     }
 
     @Test
     @Case(GetTaskNameTestUnit::class)
     fun `test AGPInterface#getTaskName(String)`() {
-
     }
 
     @Test
     @Case(GetTaskName2TestUnit::class)
     fun `test AGPInterface#getTaskName(String, String)`() {
-
     }
 
     @Test
     @Case(VariantDataTestUnit::class)
     fun `test AGPInterface#variantData`() {
-
     }
 
     @Test
     @Case(VariantScopeTestUnit::class)
     fun `test AGPInterface#variantScope`() {
+    }
 
+    @Test
+    @Case(GlobalScopeTestCase::class)
+    fun `test AGPInterface#globalScope`() {
     }
 
     @Test
     @Case(OriginalApplicationIdTestUnit::class)
     fun `test AGPInterface#originalApplicationId`() {
-
     }
 
     @Test
     @Case(HasDynamicFeatureTestUnit::class)
     fun `test AGPInterface#hasDynamicFeature`() {
-
     }
 
     @Test
     @Case(RawAndroidResourcesTestUnit::class)
     fun `test AGPInterface#rawAndroidResources`() {
-
     }
 
     @Test
     @Case(AllArtifactsTestUnit::class)
     fun `test AGPInterface#allArtifacts`() {
-
     }
 
     @Test
     @Case(MinSdkVersionTestUnit::class)
     fun `test AGPInterface#minSdkVersion`() {
-
     }
 
     @Test
     @Case(TargetSdkVersionTestUnit::class)
     fun `test AGPInterface#targetSdkVersion`() {
-
     }
 
     @Test
     @Case(VariantTypeTestUnit::class)
     fun `test AGPInterface#variantType`() {
-
     }
 
     @Test
     @Case(AarTestUnit::class)
     fun `test AGPInterface#aar`() {
-
     }
 
     @Test
     @Case(ApkTestUnit::class)
     fun `test AGPInterface#apk`() {
-
     }
 
     @Test
     @Case(MergedManifestsTestUnit::class)
     fun `test AGPInterface#mergedManifests`() {
-
     }
 
     @Test
     @Case(MergedResourcesTestUnit::class)
     fun `test AGPInterface#mergedRes`() {
-
     }
 
     @Test
     @Case(MergedAssetsTestUnit::class)
     fun `test AGPInterface#mergedAssets`() {
-
     }
 
     @Test
     @Case(ProcessedResTestUnit::class)
     fun `test AGPInterface#processedRes`() {
-
     }
 
     @Test
     @Case(SymbolListTestUnit::class)
     fun `test AGPInterface#symbolList`() {
-
     }
 
     @Test
     @Case(SymbolListWithPackageNameTestUnit::class)
     fun `test AGPInterface#symbolListWithPackageName`() {
-
     }
 
     @Test
     @Case(AllClassesTestUnit::class)
     fun `test AGPInterface#allClasses`() {
-
     }
 
     @Test
     @Case(BuildToolsTestUnit::class)
     fun `test AGPInterface#buildTools`() {
-
     }
 
 }
@@ -315,14 +291,18 @@ class VariantDataTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.variantData })
     }
-
 }
 
 class VariantScopeTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.variantScope })
     }
+}
 
+class GlobalScopeTestCase : VariantTestCase() {
+    override fun apply(variant: BaseVariant) {
+        assertNotNull(AGP.run { variant.globalScope })
+    }
 }
 
 class OriginalApplicationIdTestUnit : VariantTestCase() {

booster-android-gradle-v3_3/src/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v3_3/V33IntegrationTest.kt

@@ -89,6 +89,9 @@ object V33 : AGPInterface {
     override val BaseVariant.variantScope: VariantScope
         get() = variantData.scope
 
+    override val BaseVariant.globalScope: GlobalScope
+        get() = variantScope.globalScope
+
     override val BaseVariant.originalApplicationId: String
         get() = variantData.variantConfiguration.originalApplicationId