Support AGP 7.4

didi · May 27, 2023 · bde009f · bde009f
1 parent ae09abf
commit bde009f
Show file tree

Hide file tree

Showing 43 changed files with 754 additions and 161 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -326,3 +326,25 @@ jobs:
           name: booster-android-gradle-v7_3
           path: booster-android-gradle-v7_3/build/reports/tests/integrationTest
 
+  integration-test-agp-v7_4:
+    name: AGP 7.4 Integration Test
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+          cache: 'gradle'
+      - uses: actions/cache@v3
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ github.run_number }}
+      - shell: bash
+        run: ./gradlew booster-android-gradle-v7_4:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: booster-android-gradle-v7_4
+          path: booster-android-gradle-v7_4/build/reports/tests/integrationTest
diff --git a/booster-android-gradle-api/build.gradle b/booster-android-gradle-api/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     implementation project(':booster-android-gradle-v7_1')
     implementation project(':booster-android-gradle-v7_2')
     implementation project(':booster-android-gradle-v7_3')
+    implementation project(':booster-android-gradle-v7_4')
     compileOnly 'com.android.tools.build:gradle:3.0.0'
     testCompileOnly 'com.android.tools.build:gradle:3.0.0'
 }
diff --git a/booster-android-gradle-api/src/main/kotlin/com/didiglobal/booster/gradle/Version.kt b/booster-android-gradle-api/src/main/kotlin/com/didiglobal/booster/gradle/Version.kt
@@ -13,5 +13,7 @@ val GTE_V4_2: Boolean by lazy { AGP.revision.major > 4 || (AGP.revision.major ==
 val GTE_V4_1: Boolean by lazy { AGP.revision.major > 4 || (AGP.revision.major == 4 && AGP.revision.minor >= 1) }
 
 val GTE_V7_X: Boolean by lazy { AGP.revision.major >= 7 }
+val GTE_V7_4: Boolean by lazy { AGP.revision.major > 7 || (AGP.revision.major == 7 && AGP.revision.minor >= 4) }
+val GTE_V7_3: Boolean by lazy { AGP.revision.major > 7 || (AGP.revision.major == 7 && AGP.revision.minor >= 3) }
 val GTE_V7_2: Boolean by lazy { AGP.revision.major > 7 || (AGP.revision.major == 7 && AGP.revision.minor >= 2) }
 val GTE_V7_1: Boolean by lazy { AGP.revision.major > 7 || (AGP.revision.major == 7 && AGP.revision.minor >= 1) }
diff --git a/booster-android-gradle-compat/src/main/kotlin/com/didiglobal/booster/gradle/AGPInterface.kt b/booster-android-gradle-compat/src/main/kotlin/com/didiglobal/booster/gradle/AGPInterface.kt
@@ -95,8 +95,6 @@ interface AGPInterface {
 
     val BaseVariant.variantData: BaseVariantData
 
-    val BaseVariant.variantScope: VariantScope
-
     @Deprecated(
             message = "Use BaseVariant.namespace instead",
             replaceWith = ReplaceWith(expression = "variant.namespace"),

diff --git a/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v3_3/V33IntegrationTest.kt b/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v3_3/V33IntegrationTest.kt
@@ -109,10 +109,6 @@ abstract class V33IntegrationTest(private val isLib: Boolean) {
     @Case(VariantDataTestUnit::class)
     fun `test AGPInterface#variantData`() = Unit
 
-    @Test
-    @Case(VariantScopeTestUnit::class)
-    fun `test AGPInterface#variantScope`() = Unit
-
     @Test
     @Case(OriginalApplicationIdTestUnit::class)
     fun `test AGPInterface#originalApplicationId`() = Unit
@@ -258,12 +254,6 @@ class VariantDataTestUnit : VariantTestCase() {
     }
 }
 
-class VariantScopeTestUnit : VariantTestCase() {
-    override fun apply(variant: BaseVariant) {
-        assertNotNull(AGP.run { variant.variantScope })
-    }
-}
-
 class OriginalApplicationIdTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.originalApplicationId })

diff --git a/...ter-android-gradle-v3_3/src/main/kotlin/com/didiglobal/booster/android/gradle/v3_3/V33.kt b/...ter-android-gradle-v3_3/src/main/kotlin/com/didiglobal/booster/android/gradle/v3_3/V33.kt
@@ -96,7 +96,7 @@ internal object V33 : AGPInterface {
             isAccessible = true
         }.invoke(this) as BaseVariantData
 
-    override val BaseVariant.variantScope: VariantScope
+    val BaseVariant.variantScope: VariantScope
         get() = variantData.scope
 
     private val BaseVariant.globalScope: GlobalScope

diff --git a/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v3_4/V34IntegrationTest.kt b/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v3_4/V34IntegrationTest.kt
@@ -109,10 +109,6 @@ abstract class V34IntegrationTest(private val isLib: Boolean) {
     @Case(VariantDataTestUnit::class)
     fun `test AGPInterface#variantData`() = Unit
 
-    @Test
-    @Case(VariantScopeTestUnit::class)
-    fun `test AGPInterface#variantScope`() = Unit
-
     @Test
     @Case(OriginalApplicationIdTestUnit::class)
     fun `test AGPInterface#originalApplicationId`() = Unit
@@ -258,12 +254,6 @@ class VariantDataTestUnit : VariantTestCase() {
     }
 }
 
-class VariantScopeTestUnit : VariantTestCase() {
-    override fun apply(variant: BaseVariant) {
-        assertNotNull(AGP.run { variant.variantScope })
-    }
-}
-
 class OriginalApplicationIdTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.originalApplicationId })

diff --git a/...ter-android-gradle-v3_4/src/main/kotlin/com/didiglobal/booster/android/gradle/v3_4/V34.kt b/...ter-android-gradle-v3_4/src/main/kotlin/com/didiglobal/booster/android/gradle/v3_4/V34.kt
@@ -100,7 +100,7 @@ internal object V34 : AGPInterface {
             isAccessible = true
         }.invoke(this) as BaseVariantData
 
-    override val BaseVariant.variantScope: VariantScope
+    val BaseVariant.variantScope: VariantScope
         get() = variantData.scope
 
     private val BaseVariant.globalScope: GlobalScope

diff --git a/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v3_5/V35IntegrationTest.kt b/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v3_5/V35IntegrationTest.kt
@@ -109,10 +109,6 @@ abstract class V35IntegrationTest(private val isLib: Boolean) {
     @Case(VariantDataTestUnit::class)
     fun `test AGPInterface#variantData`() = Unit
 
-    @Test
-    @Case(VariantScopeTestUnit::class)
-    fun `test AGPInterface#variantScope`() = Unit
-
     @Test
     @Case(OriginalApplicationIdTestUnit::class)
     fun `test AGPInterface#originalApplicationId`() = Unit
@@ -258,12 +254,6 @@ class VariantDataTestUnit : VariantTestCase() {
     }
 }
 
-class VariantScopeTestUnit : VariantTestCase() {
-    override fun apply(variant: BaseVariant) {
-        assertNotNull(AGP.run { variant.variantScope })
-    }
-}
-
 class OriginalApplicationIdTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.originalApplicationId })

diff --git a/...ter-android-gradle-v3_5/src/main/kotlin/com/didiglobal/booster/android/gradle/v3_5/V35.kt b/...ter-android-gradle-v3_5/src/main/kotlin/com/didiglobal/booster/android/gradle/v3_5/V35.kt
@@ -97,7 +97,7 @@ internal object V35 : AGPInterface {
             isAccessible = true
         }.invoke(this) as BaseVariantData
 
-    override val BaseVariant.variantScope: VariantScope
+    val BaseVariant.variantScope: VariantScope
         get() = variantData.scope
 
     private val BaseVariant.globalScope: GlobalScope

diff --git a/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v3_6/V36IntegrationTest.kt b/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v3_6/V36IntegrationTest.kt
@@ -109,10 +109,6 @@ abstract class V36IntegrationTest(private val isLib: Boolean) {
     @Case(VariantDataTestUnit::class)
     fun `test AGPInterface#variantData`() = Unit
 
-    @Test
-    @Case(VariantScopeTestUnit::class)
-    fun `test AGPInterface#variantScope`() = Unit
-
     @Test
     @Case(OriginalApplicationIdTestUnit::class)
     fun `test AGPInterface#originalApplicationId`() = Unit
@@ -258,12 +254,6 @@ class VariantDataTestUnit : VariantTestCase() {
     }
 }
 
-class VariantScopeTestUnit : VariantTestCase() {
-    override fun apply(variant: BaseVariant) {
-        assertNotNull(AGP.run { variant.variantScope })
-    }
-}
-
 class OriginalApplicationIdTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.originalApplicationId })

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
@@ -109,7 +109,7 @@ object V36 : AGPInterface {
             isAccessible = true
         }.invoke(this) as BaseVariantData
 
-    override val BaseVariant.variantScope: VariantScope
+    val BaseVariant.variantScope: VariantScope
         get() = variantData.scope
 
     private val BaseVariant.globalScope: GlobalScope

diff --git a/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v4_0/V40IntegrationTest.kt b/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v4_0/V40IntegrationTest.kt
@@ -109,10 +109,6 @@ abstract class V40IntegrationTest(private val isLib: Boolean) {
     @Case(VariantDataTestUnit::class)
     fun `test AGPInterface#variantData`() = Unit
 
-    @Test
-    @Case(VariantScopeTestUnit::class)
-    fun `test AGPInterface#variantScope`() = Unit
-
     @Test
     @Case(OriginalApplicationIdTestUnit::class)
     fun `test AGPInterface#originalApplicationId`() = Unit
@@ -258,12 +254,6 @@ class VariantDataTestUnit : VariantTestCase() {
     }
 }
 
-class VariantScopeTestUnit : VariantTestCase() {
-    override fun apply(variant: BaseVariant) {
-        assertNotNull(AGP.run { variant.variantScope })
-    }
-}
-
 class OriginalApplicationIdTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.originalApplicationId })

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
@@ -124,7 +124,7 @@ internal object V40 : AGPInterface {
             isAccessible = true
         }.invoke(this) as BaseVariantData
 
-    override val BaseVariant.variantScope: VariantScope
+    val BaseVariant.variantScope: VariantScope
         get() = variantData.scope
 
     private val BaseVariant.globalScope: GlobalScope

diff --git a/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v4_1/V41IntegrationTest.kt b/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v4_1/V41IntegrationTest.kt
@@ -109,10 +109,6 @@ abstract class V41IntegrationTest(val isLib: Boolean) {
     @Case(VariantDataTestUnit::class)
     fun `test AGPInterface#variantData`() = Unit
 
-    @Test
-    @Case(VariantScopeTestUnit::class)
-    fun `test AGPInterface#variantScope`() = Unit
-
     @Test
     @Case(OriginalApplicationIdTestUnit::class)
     fun `test AGPInterface#originalApplicationId`() = Unit
@@ -258,12 +254,6 @@ class VariantDataTestUnit : VariantTestCase() {
     }
 }
 
-class VariantScopeTestUnit : VariantTestCase() {
-    override fun apply(variant: BaseVariant) {
-        assertNotNull(AGP.run { variant.variantScope })
-    }
-}
-
 class OriginalApplicationIdTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.originalApplicationId })

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
@@ -141,7 +141,7 @@ internal object V41 : AGPInterface {
             isAccessible = true
         }.invoke(this) as BaseVariantData
 
-    override val BaseVariant.variantScope: VariantScope
+    val BaseVariant.variantScope: VariantScope
         get() = componentProperties.variantScope
 
     private val BaseVariant.globalScope: GlobalScope

diff --git a/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v4_2/V42IntegrationTest.kt b/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v4_2/V42IntegrationTest.kt
@@ -109,10 +109,6 @@ abstract class V42IntegrationTest(val isLib: Boolean) {
     @Case(VariantDataTestUnit::class)
     fun `test AGPInterface#variantData`() = Unit
 
-    @Test
-    @Case(VariantScopeTestUnit::class)
-    fun `test AGPInterface#variantScope`() = Unit
-
     @Test
     @Case(OriginalApplicationIdTestUnit::class)
     fun `test AGPInterface#originalApplicationId`() = Unit
@@ -258,12 +254,6 @@ class VariantDataTestUnit : VariantTestCase() {
     }
 }
 
-class VariantScopeTestUnit : VariantTestCase() {
-    override fun apply(variant: BaseVariant) {
-        assertNotNull(AGP.run { variant.variantScope })
-    }
-}
-
 class OriginalApplicationIdTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.originalApplicationId })

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
@@ -141,7 +141,7 @@ internal object V42 : AGPInterface {
             isAccessible = true
         }.invoke(this) as BaseVariantData
 
-    override val BaseVariant.variantScope: VariantScope
+    val BaseVariant.variantScope: VariantScope
         get() = component.variantScope
 
     @Suppress("DEPRECATION")

diff --git a/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v7_0/V70IntegrationTest.kt b/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v7_0/V70IntegrationTest.kt
@@ -108,10 +108,6 @@ abstract class V70IntegrationTest(private val isLib: Boolean) {
     @Case(VariantDataTestUnit::class)
     fun `test AGPInterface#variantData`() = Unit
 
-    @Test
-    @Case(VariantScopeTestUnit::class)
-    fun `test AGPInterface#variantScope`() = Unit
-
     @Test
     @Case(OriginalApplicationIdTestUnit::class)
     fun `test AGPInterface#originalApplicationId`() = Unit
@@ -262,12 +258,6 @@ class VariantDataTestUnit : VariantTestCase() {
     }
 }
 
-class VariantScopeTestUnit : VariantTestCase() {
-    override fun apply(variant: BaseVariant) {
-        assertNotNull(AGP.run { variant.variantScope })
-    }
-}
-
 class OriginalApplicationIdTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.originalApplicationId })

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
@@ -149,7 +149,7 @@ internal object V70 : AGPInterface {
             isAccessible = true
         }.invoke(this) as BaseVariantData
 
-    override val BaseVariant.variantScope: VariantScope
+    val BaseVariant.variantScope: VariantScope
         get() = component.variantScope
 
     @Suppress("DEPRECATION")

diff --git a/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v7_1/V71IntegrationTest.kt b/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v7_1/V71IntegrationTest.kt
@@ -108,10 +108,6 @@ abstract class V71IntegrationTest(private val isLib: Boolean) {
     @Case(VariantDataTestUnit::class)
     fun `test AGPInterface#variantData`() = Unit
 
-    @Test
-    @Case(VariantScopeTestUnit::class)
-    fun `test AGPInterface#variantScope`() = Unit
-
     @Test
     @Case(OriginalApplicationIdTestUnit::class)
     fun `test AGPInterface#originalApplicationId`() = Unit
@@ -262,12 +258,6 @@ class VariantDataTestUnit : VariantTestCase() {
     }
 }
 
-class VariantScopeTestUnit : VariantTestCase() {
-    override fun apply(variant: BaseVariant) {
-        assertNotNull(AGP.run { variant.variantScope })
-    }
-}
-
 class OriginalApplicationIdTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.originalApplicationId })

diff --git a/...ter-android-gradle-v7_1/src/main/kotlin/com/didiglobal/booster/android/gradle/v7_1/V71.kt b/...ter-android-gradle-v7_1/src/main/kotlin/com/didiglobal/booster/android/gradle/v7_1/V71.kt
@@ -145,7 +145,7 @@ internal object V71 : AGPInterface {
             isAccessible = true
         }.invoke(this) as BaseVariantData
 
-    override val BaseVariant.variantScope: VariantScope
+    val BaseVariant.variantScope: VariantScope
         get() = component.variantScope
 
     @Suppress("DEPRECATION")

diff --git a/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v7_2/V72IntegrationTest.kt b/...c/integrationTest/kotlin/com/didiglobal/booster/android/gradle/v7_2/V72IntegrationTest.kt
@@ -108,10 +108,6 @@ abstract class V72IntegrationTest(private val isLib: Boolean) {
     @Case(VariantDataTestUnit::class)
     fun `test AGPInterface#variantData`() = Unit
 
-    @Test
-    @Case(VariantScopeTestUnit::class)
-    fun `test AGPInterface#variantScope`() = Unit
-
     @Test
     @Case(OriginalApplicationIdTestUnit::class)
     fun `test AGPInterface#originalApplicationId`() = Unit
@@ -267,12 +263,6 @@ class VariantDataTestUnit : VariantTestCase() {
     }
 }
 
-class VariantScopeTestUnit : VariantTestCase() {
-    override fun apply(variant: BaseVariant) {
-        assertNotNull(AGP.run { variant.variantScope })
-    }
-}
-
 class OriginalApplicationIdTestUnit : VariantTestCase() {
     override fun apply(variant: BaseVariant) {
         assertNotNull(AGP.run { variant.originalApplicationId })

diff --git a/...ter-android-gradle-v7_2/src/main/kotlin/com/didiglobal/booster/android/gradle/v7_2/V72.kt b/...ter-android-gradle-v7_2/src/main/kotlin/com/didiglobal/booster/android/gradle/v7_2/V72.kt
@@ -155,7 +155,7 @@ internal object V72 : AGPInterface {
             isAccessible = true
         }.invoke(this) as BaseVariantData
 
-    override val BaseVariant.variantScope: VariantScope
+    val BaseVariant.variantScope: VariantScope
         get() = component.variantScope
 
     @Suppress("DEPRECATION")