diff options
| author | Yuriy Solodkyy <solodkyy@google.com> | 2022-06-29 17:41:45 +0100 |
|---|---|---|
| committer | Yuriy Solodkyy <solodkyy@google.com> | 2022-06-30 14:31:36 +0000 |
| commit | c63aa73a0a6f789ff607ae7f61fb3f00d644a84c (patch) | |
| tree | 99181af6fa73dc3b68521d515f77c08d99f2cd47 | |
| parent | 94dd7aaf2a94421ad6639ba3a00a437c3b88ba2b (diff) | |
| download | idea-c63aa73a0a6f789ff607ae7f61fb3f00d644a84c.tar.gz | |
Fetch applicationIds for all variants
Bug: 231946504
Test: snapshots updated
Change-Id: I50045db68f97c405def34f5ecac6705f945109f9
161 files changed, 1008 insertions, 29 deletions
diff --git a/android-test-framework/testSrc/com/android/tools/idea/testing/AndroidGradleTestUtils.kt b/android-test-framework/testSrc/com/android/tools/idea/testing/AndroidGradleTestUtils.kt index ee8c428676c..07a097dc81f 100644 --- a/android-test-framework/testSrc/com/android/tools/idea/testing/AndroidGradleTestUtils.kt +++ b/android-test-framework/testSrc/com/android/tools/idea/testing/AndroidGradleTestUtils.kt @@ -1023,7 +1023,13 @@ fun AndroidProjectStubBuilder.buildAndroidProjectStub(): IdeAndroidProjectImpl { defaultConfig = defaultConfig, buildTypes = buildTypes, productFlavors = this.flavorDimensions.orEmpty().flatMap { this.productFlavorContainers(it) }, - basicVariants = this.variants.map { IdeBasicVariantImpl(name = it.name) }, + basicVariants = this.variants.map { + IdeBasicVariantImpl( + name = it.name, + it.mainArtifact.applicationId, + it.androidTestArtifact?.applicationId + ) + }, flavorDimensions = this.flavorDimensions.orEmpty(), compileTarget = getLatestAndroidPlatform(), bootClasspath = listOf(), diff --git a/android/testData/snapshots/IdeModels_AllVariantsSync/allVariantSyncWithV1.txt b/android/testData/snapshots/IdeModels_AllVariantsSync/allVariantSyncWithV1.txt index 061be069ebd..0aab49f64e0 100644 --- a/android/testData/snapshots/IdeModels_AllVariantsSync/allVariantSyncWithV1.txt +++ b/android/testData/snapshots/IdeModels_AllVariantsSync/allVariantSyncWithV1.txt @@ -41,17 +41,33 @@ AgpFlags UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : basicOtherBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : paidBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : paidOtherBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : basicBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix.suffix - basicVariant: : basicOtherBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.suffix - basicVariant: : paidBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix.suffix - basicVariant: : paidOtherBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.suffix - basicVariant: : basicBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix - basicVariant: : basicOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix - basicVariant: : paidBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix - basicVariant: : paidOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix FlavorDimensions : foo FlavorDimensions : bar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/IdeModels_AllVariantsSync/allVariantSyncWithV2.txt b/android/testData/snapshots/IdeModels_AllVariantsSync/allVariantSyncWithV2.txt index 0736c10bbfa..b9ec341a9e5 100644 --- a/android/testData/snapshots/IdeModels_AllVariantsSync/allVariantSyncWithV2.txt +++ b/android/testData/snapshots/IdeModels_AllVariantsSync/allVariantSyncWithV2.txt @@ -41,17 +41,33 @@ AgpFlags UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : basicOtherBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : paidBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : paidOtherBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : basicBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix.suffix - basicVariant: : basicOtherBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.suffix - basicVariant: : paidBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix.suffix - basicVariant: : paidOtherBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.suffix - basicVariant: : basicBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix - basicVariant: : basicOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix - basicVariant: : paidBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix - basicVariant: : paidOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix FlavorDimensions : foo FlavorDimensions : bar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/basicCmakeApp_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/basicCmakeApp_Agp_4_1_Gradle_6_5_V1.txt index cd5aaeddbdf..96632b934b5 100644 --- a/android/testData/snapshots/ideModels/basicCmakeApp_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/basicCmakeApp_Agp_4_1_Gradle_6_5_V1.txt @@ -219,7 +219,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long + testApplicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long.test - basicVariant: : release + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basicCmakeApp_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/basicCmakeApp_Agp_4_2_Gradle_6_7_1_V1.txt index 97d1a0007d6..a20004d188e 100644 --- a/android/testData/snapshots/ideModels/basicCmakeApp_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/basicCmakeApp_Agp_4_2_Gradle_6_7_1_V1.txt @@ -219,7 +219,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long + testApplicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long.test - basicVariant: : release + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_0_Gradle_7_0_2_V1.txt index 7f120869301..f4a54a0d48b 100644 --- a/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_0_Gradle_7_0_2_V1.txt @@ -190,7 +190,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long + testApplicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long.test - basicVariant: : release + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_1_Gradle_7_2_V1.txt index 7903678db14..509bcb033f3 100644 --- a/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_1_Gradle_7_2_V1.txt @@ -207,7 +207,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long + testApplicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long.test - basicVariant: : release + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_2_Gradle_7_3_3_V1.txt index 51e8707a989..18a82d55dbf 100644 --- a/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_2_Gradle_7_3_3_V1.txt @@ -207,7 +207,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long + testApplicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long.test - basicVariant: : release + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_2_Gradle_7_3_3_V2.txt index 57df5c3f0e6..32380f1e60b 100644 --- a/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/basicCmakeApp_Agp_7_2_Gradle_7_3_3_V2.txt @@ -207,7 +207,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long + testApplicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long.test - basicVariant: : release + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basicCmakeApp_NewAgp_V1.txt b/android/testData/snapshots/ideModels/basicCmakeApp_NewAgp_V1.txt index c731df8e730..48fcc8d1d0b 100644 --- a/android/testData/snapshots/ideModels/basicCmakeApp_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/basicCmakeApp_NewAgp_V1.txt @@ -207,7 +207,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long + testApplicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long.test - basicVariant: : release + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basicCmakeApp_V2.txt b/android/testData/snapshots/ideModels/basicCmakeApp_V2.txt index 404dd2c0f7d..e09e9746b7d 100644 --- a/android/testData/snapshots/ideModels/basicCmakeApp_V2.txt +++ b/android/testData/snapshots/ideModels/basicCmakeApp_V2.txt @@ -207,7 +207,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long + testApplicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long.test - basicVariant: : release + applicationId : com.example.basiccmakeapp.whose.name.is.at.least.seventy.characters.long BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basic_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/basic_Agp_4_1_Gradle_6_5_V1.txt index ccf1477d7f8..6c40db551cb 100644 --- a/android/testData/snapshots/ideModels/basic_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/basic_Agp_4_1_Gradle_6_5_V1.txt @@ -86,7 +86,10 @@ MODULE : project UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.tests.basic.debug + testApplicationId : com.android.tests.basic.debug.test - basicVariant: : release + applicationId : com.android.tests.basic BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basic_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/basic_Agp_4_2_Gradle_6_7_1_V1.txt index 332623c2673..688cc838423 100644 --- a/android/testData/snapshots/ideModels/basic_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/basic_Agp_4_2_Gradle_6_7_1_V1.txt @@ -87,7 +87,10 @@ MODULE : project UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.tests.basic.debug + testApplicationId : com.android.tests.basic.debug.test - basicVariant: : release + applicationId : com.android.tests.basic BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basic_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/basic_Agp_7_0_Gradle_7_0_2_V1.txt index 7b9566b7bc3..416761fca70 100644 --- a/android/testData/snapshots/ideModels/basic_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/basic_Agp_7_0_Gradle_7_0_2_V1.txt @@ -89,7 +89,10 @@ MODULE : project UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.tests.basic.debug + testApplicationId : com.android.tests.basic.debug.test - basicVariant: : release + applicationId : com.android.tests.basic BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basic_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/basic_Agp_7_1_Gradle_7_2_V1.txt index 3cb8474fff9..077cbf5fcb1 100644 --- a/android/testData/snapshots/ideModels/basic_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/basic_Agp_7_1_Gradle_7_2_V1.txt @@ -89,7 +89,10 @@ MODULE : project UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.tests.basic.debug + testApplicationId : com.android.tests.basic.debug.test - basicVariant: : release + applicationId : com.android.tests.basic BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basic_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/basic_Agp_7_2_Gradle_7_3_3_V1.txt index 5008231b7d4..082bf962422 100644 --- a/android/testData/snapshots/ideModels/basic_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/basic_Agp_7_2_Gradle_7_3_3_V1.txt @@ -90,7 +90,10 @@ MODULE : project UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.tests.basic.debug + testApplicationId : com.android.tests.basic.debug.test - basicVariant: : release + applicationId : com.android.tests.basic BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basic_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/basic_Agp_7_2_Gradle_7_3_3_V2.txt index bc2837e987e..a3989ebbfcd 100644 --- a/android/testData/snapshots/ideModels/basic_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/basic_Agp_7_2_Gradle_7_3_3_V2.txt @@ -90,7 +90,10 @@ MODULE : project UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.tests.basic.debug + testApplicationId : com.android.tests.basic.debug.test - basicVariant: : release + applicationId : com.android.tests.basic BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basic_NewAgp_V1.txt b/android/testData/snapshots/ideModels/basic_NewAgp_V1.txt index c842fbf1141..628d7d260e1 100644 --- a/android/testData/snapshots/ideModels/basic_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/basic_NewAgp_V1.txt @@ -90,7 +90,10 @@ MODULE : project UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.tests.basic.debug + testApplicationId : com.android.tests.basic.debug.test - basicVariant: : release + applicationId : com.android.tests.basic BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/basic_V2.txt b/android/testData/snapshots/ideModels/basic_V2.txt index 48ca862cc74..4da272935c2 100644 --- a/android/testData/snapshots/ideModels/basic_V2.txt +++ b/android/testData/snapshots/ideModels/basic_V2.txt @@ -90,7 +90,10 @@ MODULE : project UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.tests.basic.debug + testApplicationId : com.android.tests.basic.debug.test - basicVariant: : release + applicationId : com.android.tests.basic BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/compositeBuild_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/compositeBuild_Agp_7_0_Gradle_7_0_2_V1.txt index eaa168cf1a1..a5cb381d491 100644 --- a/android/testData/snapshots/ideModels/compositeBuild_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/compositeBuild_Agp_7_0_Gradle_7_0_2_V1.txt @@ -486,7 +486,10 @@ MODULE : TestCompositeLib1.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.composite1 + testApplicationId : com.test.composite1.test - basicVariant: : release + applicationId : com.test.composite1 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2057,6 +2060,7 @@ MODULE : TestCompositeLib1.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -3402,7 +3406,10 @@ MODULE : TestCompositeLib3.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.composite3 + testApplicationId : com.test.composite3.test - basicVariant: : release + applicationId : com.test.composite3 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -4453,6 +4460,7 @@ MODULE : TestCompositeLib3.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite3.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5965,7 +5973,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.compositeapp + testApplicationId : com.test.compositeapp.test - basicVariant: : release + applicationId : com.test.compositeapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -7054,6 +7065,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite0.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/compositeBuild_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/compositeBuild_Agp_7_1_Gradle_7_2_V1.txt index 16b876613a4..5b426e26e2e 100644 --- a/android/testData/snapshots/ideModels/compositeBuild_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/compositeBuild_Agp_7_1_Gradle_7_2_V1.txt @@ -550,7 +550,10 @@ MODULE : TestCompositeLib1.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.composite1 + testApplicationId : com.test.composite1.test - basicVariant: : release + applicationId : com.test.composite1 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2121,6 +2124,7 @@ MODULE : TestCompositeLib1.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -3515,7 +3519,10 @@ MODULE : TestCompositeLib3.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.composite3 + testApplicationId : com.test.composite3.test - basicVariant: : release + applicationId : com.test.composite3 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -4566,6 +4573,7 @@ MODULE : TestCompositeLib3.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite3.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6142,7 +6150,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.compositeapp + testApplicationId : com.test.compositeapp.test - basicVariant: : release + applicationId : com.test.compositeapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -7231,6 +7242,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite0.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/compositeBuild_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/compositeBuild_Agp_7_2_Gradle_7_3_3_V1.txt index cfcdf7e20a9..f8185153ed9 100644 --- a/android/testData/snapshots/ideModels/compositeBuild_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/compositeBuild_Agp_7_2_Gradle_7_3_3_V1.txt @@ -550,7 +550,10 @@ MODULE : TestCompositeLib1.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.composite1 + testApplicationId : com.test.composite1.test - basicVariant: : release + applicationId : com.test.composite1 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2107,6 +2110,7 @@ MODULE : TestCompositeLib1.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -3487,7 +3491,10 @@ MODULE : TestCompositeLib3.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.composite3 + testApplicationId : com.test.composite3.test - basicVariant: : release + applicationId : com.test.composite3 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -4524,6 +4531,7 @@ MODULE : TestCompositeLib3.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite3.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6094,7 +6102,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.compositeapp + testApplicationId : com.test.compositeapp.test - basicVariant: : release + applicationId : com.test.compositeapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -7169,6 +7180,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite0.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/compositeBuild_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/compositeBuild_Agp_7_2_Gradle_7_3_3_V2.txt index 26e6c919368..0a43413d64f 100644 --- a/android/testData/snapshots/ideModels/compositeBuild_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/compositeBuild_Agp_7_2_Gradle_7_3_3_V2.txt @@ -550,7 +550,10 @@ MODULE : TestCompositeLib1.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.composite1 + testApplicationId : com.test.composite1.test - basicVariant: : release + applicationId : com.test.composite1 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2071,6 +2074,7 @@ MODULE : TestCompositeLib1.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -3454,7 +3458,10 @@ MODULE : TestCompositeLib3.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.composite3 + testApplicationId : com.test.composite3.test - basicVariant: : release + applicationId : com.test.composite3 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -4486,6 +4493,7 @@ MODULE : TestCompositeLib3.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite3.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6059,7 +6067,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.compositeapp + testApplicationId : com.test.compositeapp.test - basicVariant: : release + applicationId : com.test.compositeapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -7123,6 +7134,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite0.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/compositeBuild_NewAgp_V1.txt b/android/testData/snapshots/ideModels/compositeBuild_NewAgp_V1.txt index 941f17742a4..3ed7b7933c9 100644 --- a/android/testData/snapshots/ideModels/compositeBuild_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/compositeBuild_NewAgp_V1.txt @@ -550,7 +550,10 @@ MODULE : TestCompositeLib1.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.composite1 + testApplicationId : com.test.composite1.test - basicVariant: : release + applicationId : com.test.composite1 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2107,6 +2110,7 @@ MODULE : TestCompositeLib1.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -3487,7 +3491,10 @@ MODULE : TestCompositeLib3.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.composite3 + testApplicationId : com.test.composite3.test - basicVariant: : release + applicationId : com.test.composite3 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -4524,6 +4531,7 @@ MODULE : TestCompositeLib3.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite3.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6106,7 +6114,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.compositeapp + testApplicationId : com.test.compositeapp.test - basicVariant: : release + applicationId : com.test.compositeapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -7181,6 +7192,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite0.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/compositeBuild_V2.txt b/android/testData/snapshots/ideModels/compositeBuild_V2.txt index 1628d0f6fe2..f79c684f58d 100644 --- a/android/testData/snapshots/ideModels/compositeBuild_V2.txt +++ b/android/testData/snapshots/ideModels/compositeBuild_V2.txt @@ -550,7 +550,10 @@ MODULE : TestCompositeLib1.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.composite1 + testApplicationId : com.test.composite1.test - basicVariant: : release + applicationId : com.test.composite1 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2071,6 +2074,7 @@ MODULE : TestCompositeLib1.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -3454,7 +3458,10 @@ MODULE : TestCompositeLib3.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.composite3 + testApplicationId : com.test.composite3.test - basicVariant: : release + applicationId : com.test.composite3 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -4486,6 +4493,7 @@ MODULE : TestCompositeLib3.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite3.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6071,7 +6079,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.test.compositeapp + testApplicationId : com.test.compositeapp.test - basicVariant: : release + applicationId : com.test.compositeapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -7135,6 +7146,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.test.composite0.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/fixtures_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/fixtures_Agp_7_2_Gradle_7_3_3_V2.txt index effe6f69c2c..8fa89894aea 100644 --- a/android/testData/snapshots/ideModels/fixtures_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/fixtures_Agp_7_2_Gradle_7_3_3_V2.txt @@ -350,7 +350,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions @@ -1823,6 +1826,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/fixtures_NewAgp_V1.txt b/android/testData/snapshots/ideModels/fixtures_NewAgp_V1.txt index ed5bf6660a8..222b98a2d1a 100644 --- a/android/testData/snapshots/ideModels/fixtures_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/fixtures_NewAgp_V1.txt @@ -350,7 +350,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions @@ -1849,6 +1852,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/fixtures_V2.txt b/android/testData/snapshots/ideModels/fixtures_V2.txt index 4a7fa8086b9..c9dad21db00 100644 --- a/android/testData/snapshots/ideModels/fixtures_V2.txt +++ b/android/testData/snapshots/ideModels/fixtures_V2.txt @@ -350,7 +350,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions @@ -1823,6 +1826,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/includeFromLib_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/includeFromLib_Agp_4_1_Gradle_6_5_V1.txt index 1b7d4379f3c..61b16d3dd56 100644 --- a/android/testData/snapshots/ideModels/includeFromLib_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/includeFromLib_Agp_4_1_Gradle_6_5_V1.txt @@ -359,7 +359,10 @@ MODULE : navgraph.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.navgraph + testApplicationId : com.example.navgraph.test - basicVariant: : release + applicationId : com.example.navgraph BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2158,6 +2161,7 @@ MODULE : navgraph.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/includeFromLib_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/includeFromLib_Agp_4_2_Gradle_6_7_1_V1.txt index 68f16fda904..0e835e34647 100644 --- a/android/testData/snapshots/ideModels/includeFromLib_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/includeFromLib_Agp_4_2_Gradle_6_7_1_V1.txt @@ -358,7 +358,10 @@ MODULE : navgraph.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.navgraph + testApplicationId : com.example.navgraph.test - basicVariant: : release + applicationId : com.example.navgraph BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2158,6 +2161,7 @@ MODULE : navgraph.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/includeFromLib_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/includeFromLib_Agp_7_0_Gradle_7_0_2_V1.txt index faec0f5397d..718e9fa438a 100644 --- a/android/testData/snapshots/ideModels/includeFromLib_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/includeFromLib_Agp_7_0_Gradle_7_0_2_V1.txt @@ -298,7 +298,10 @@ MODULE : navgraph.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.navgraph + testApplicationId : com.example.navgraph.test - basicVariant: : release + applicationId : com.example.navgraph BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2113,6 +2116,7 @@ MODULE : navgraph.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/includeFromLib_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/includeFromLib_Agp_7_1_Gradle_7_2_V1.txt index b714765c578..5e72aaf2e77 100644 --- a/android/testData/snapshots/ideModels/includeFromLib_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/includeFromLib_Agp_7_1_Gradle_7_2_V1.txt @@ -332,7 +332,10 @@ MODULE : navgraph.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.navgraph + testApplicationId : com.example.navgraph.test - basicVariant: : release + applicationId : com.example.navgraph BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2147,6 +2150,7 @@ MODULE : navgraph.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/includeFromLib_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/includeFromLib_Agp_7_2_Gradle_7_3_3_V1.txt index adeed6f4b1b..b969fc3e24f 100644 --- a/android/testData/snapshots/ideModels/includeFromLib_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/includeFromLib_Agp_7_2_Gradle_7_3_3_V1.txt @@ -332,7 +332,10 @@ MODULE : navgraph.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.navgraph + testApplicationId : com.example.navgraph.test - basicVariant: : release + applicationId : com.example.navgraph BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2133,6 +2136,7 @@ MODULE : navgraph.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/includeFromLib_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/includeFromLib_Agp_7_2_Gradle_7_3_3_V2.txt index 2894fde6e83..62e10127080 100644 --- a/android/testData/snapshots/ideModels/includeFromLib_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/includeFromLib_Agp_7_2_Gradle_7_3_3_V2.txt @@ -332,7 +332,10 @@ MODULE : navgraph.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.navgraph + testApplicationId : com.example.navgraph.test - basicVariant: : release + applicationId : com.example.navgraph BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2090,6 +2093,7 @@ MODULE : navgraph.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/includeFromLib_NewAgp_V1.txt b/android/testData/snapshots/ideModels/includeFromLib_NewAgp_V1.txt index ea6d726ff55..ba3fd1a2cea 100644 --- a/android/testData/snapshots/ideModels/includeFromLib_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/includeFromLib_NewAgp_V1.txt @@ -332,7 +332,10 @@ MODULE : navgraph.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.navgraph + testApplicationId : com.example.navgraph.test - basicVariant: : release + applicationId : com.example.navgraph BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2133,6 +2136,7 @@ MODULE : navgraph.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/includeFromLib_V2.txt b/android/testData/snapshots/ideModels/includeFromLib_V2.txt index 4c4211bbec3..00cc501680e 100644 --- a/android/testData/snapshots/ideModels/includeFromLib_V2.txt +++ b/android/testData/snapshots/ideModels/includeFromLib_V2.txt @@ -332,7 +332,10 @@ MODULE : navgraph.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.navgraph + testApplicationId : com.example.navgraph.test - basicVariant: : release + applicationId : com.example.navgraph BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2090,6 +2093,7 @@ MODULE : navgraph.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinKapt_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/kotlinKapt_Agp_4_1_Gradle_6_5_V1.txt index edae15d5256..3a4b08a06e6 100644 --- a/android/testData/snapshots/ideModels/kotlinKapt_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/kotlinKapt_Agp_4_1_Gradle_6_5_V1.txt @@ -1029,9 +1029,15 @@ MODULE : MainActivity.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : localDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : remoteDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : localRelease + applicationId : com.example.mainactivity - basicVariant: : remoteRelease + applicationId : com.example.mainactivity FlavorDimensions : type BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2344,6 +2350,7 @@ MODULE : MainActivity.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinKapt_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/kotlinKapt_Agp_4_2_Gradle_6_7_1_V1.txt index 3788827569c..654f046fe87 100644 --- a/android/testData/snapshots/ideModels/kotlinKapt_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/kotlinKapt_Agp_4_2_Gradle_6_7_1_V1.txt @@ -1029,9 +1029,15 @@ MODULE : MainActivity.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : localDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : remoteDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : localRelease + applicationId : com.example.mainactivity - basicVariant: : remoteRelease + applicationId : com.example.mainactivity FlavorDimensions : type BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2349,6 +2355,7 @@ MODULE : MainActivity.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_0_Gradle_7_0_2_V1.txt index f7a6de52065..6ae5af2ce3a 100644 --- a/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_0_Gradle_7_0_2_V1.txt @@ -939,9 +939,15 @@ MODULE : MainActivity.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : localDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : remoteDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : localRelease + applicationId : com.example.mainactivity - basicVariant: : remoteRelease + applicationId : com.example.mainactivity FlavorDimensions : type BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2297,6 +2303,7 @@ MODULE : MainActivity.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_1_Gradle_7_2_V1.txt index 4f192d80330..3fc651c435d 100644 --- a/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_1_Gradle_7_2_V1.txt @@ -1030,9 +1030,15 @@ MODULE : MainActivity.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : localDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : remoteDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : localRelease + applicationId : com.example.mainactivity - basicVariant: : remoteRelease + applicationId : com.example.mainactivity FlavorDimensions : type BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2388,6 +2394,7 @@ MODULE : MainActivity.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_2_Gradle_7_3_3_V1.txt index 82a02ee84e7..16b682aaf75 100644 --- a/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_2_Gradle_7_3_3_V1.txt @@ -1030,9 +1030,15 @@ MODULE : MainActivity.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : localDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : remoteDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : localRelease + applicationId : com.example.mainactivity - basicVariant: : remoteRelease + applicationId : com.example.mainactivity FlavorDimensions : type BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2379,6 +2385,7 @@ MODULE : MainActivity.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_2_Gradle_7_3_3_V2.txt index 7016575be25..9b433c7f939 100644 --- a/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/kotlinKapt_Agp_7_2_Gradle_7_3_3_V2.txt @@ -1030,9 +1030,15 @@ MODULE : MainActivity.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : localDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : remoteDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : localRelease + applicationId : com.example.mainactivity - basicVariant: : remoteRelease + applicationId : com.example.mainactivity FlavorDimensions : type BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2368,6 +2374,7 @@ MODULE : MainActivity.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinKapt_NewAgp_V1.txt b/android/testData/snapshots/ideModels/kotlinKapt_NewAgp_V1.txt index a2d7723f801..b296d2bbaf7 100644 --- a/android/testData/snapshots/ideModels/kotlinKapt_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/kotlinKapt_NewAgp_V1.txt @@ -1034,9 +1034,15 @@ MODULE : MainActivity.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : localDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : remoteDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : localRelease + applicationId : com.example.mainactivity - basicVariant: : remoteRelease + applicationId : com.example.mainactivity FlavorDimensions : type BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2383,6 +2389,7 @@ MODULE : MainActivity.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinKapt_V2.txt b/android/testData/snapshots/ideModels/kotlinKapt_V2.txt index 085bee606a5..e71e3c425de 100644 --- a/android/testData/snapshots/ideModels/kotlinKapt_V2.txt +++ b/android/testData/snapshots/ideModels/kotlinKapt_V2.txt @@ -1034,9 +1034,15 @@ MODULE : MainActivity.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : localDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : remoteDebug + applicationId : com.example.mainactivity + testApplicationId : com.example.mainactivity.test - basicVariant: : localRelease + applicationId : com.example.mainactivity - basicVariant: : remoteRelease + applicationId : com.example.mainactivity FlavorDimensions : type BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2372,6 +2378,7 @@ MODULE : MainActivity.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_0_Gradle_7_0_2_V1.txt index 4d8df87c49d..9b5448f3b59 100644 --- a/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_0_Gradle_7_0_2_V1.txt @@ -545,7 +545,10 @@ MODULE : kotlinMultiPlatform.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.kotlin + testApplicationId : com.example.android.kotlin.test - basicVariant: : release + applicationId : com.example.android.kotlin BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2163,6 +2166,7 @@ MODULE : kotlinMultiPlatform.module2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.test.multiproject.module2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_1_Gradle_7_2_V1.txt index 94f76510008..0bd9ea97366 100644 --- a/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_1_Gradle_7_2_V1.txt @@ -633,7 +633,10 @@ MODULE : kotlinMultiPlatform.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.kotlin + testApplicationId : com.example.android.kotlin.test - basicVariant: : release + applicationId : com.example.android.kotlin BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2251,6 +2254,7 @@ MODULE : kotlinMultiPlatform.module2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.test.multiproject.module2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_2_Gradle_7_3_3_V1.txt index 8ceac4cf970..d110a74677c 100644 --- a/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_2_Gradle_7_3_3_V1.txt @@ -633,7 +633,10 @@ MODULE : kotlinMultiPlatform.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.kotlin + testApplicationId : com.example.android.kotlin.test - basicVariant: : release + applicationId : com.example.android.kotlin BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2235,6 +2238,7 @@ MODULE : kotlinMultiPlatform.module2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.test.multiproject.module2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_2_Gradle_7_3_3_V2.txt index 8e32e6fa110..ffb33cb5c5b 100644 --- a/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/kotlinMultiplatform_Agp_7_2_Gradle_7_3_3_V2.txt @@ -633,7 +633,10 @@ MODULE : kotlinMultiPlatform.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.kotlin + testApplicationId : com.example.android.kotlin.test - basicVariant: : release + applicationId : com.example.android.kotlin BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2203,6 +2206,7 @@ MODULE : kotlinMultiPlatform.module2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.test.multiproject.module2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinMultiplatform_NewAgp_V1.txt b/android/testData/snapshots/ideModels/kotlinMultiplatform_NewAgp_V1.txt index 802eb4c7643..6e471d78a87 100644 --- a/android/testData/snapshots/ideModels/kotlinMultiplatform_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/kotlinMultiplatform_NewAgp_V1.txt @@ -633,7 +633,10 @@ MODULE : kotlinMultiPlatform.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.kotlin + testApplicationId : com.example.android.kotlin.test - basicVariant: : release + applicationId : com.example.android.kotlin BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2235,6 +2238,7 @@ MODULE : kotlinMultiPlatform.module2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.test.multiproject.module2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinMultiplatform_V2.txt b/android/testData/snapshots/ideModels/kotlinMultiplatform_V2.txt index bcc8103a586..67a444d1f3d 100644 --- a/android/testData/snapshots/ideModels/kotlinMultiplatform_V2.txt +++ b/android/testData/snapshots/ideModels/kotlinMultiplatform_V2.txt @@ -633,7 +633,10 @@ MODULE : kotlinMultiPlatform.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.kotlin + testApplicationId : com.example.android.kotlin.test - basicVariant: : release + applicationId : com.example.android.kotlin BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2203,6 +2206,7 @@ MODULE : kotlinMultiPlatform.module2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.test.multiproject.module2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinMultiplatform___hierarchical_V2.txt b/android/testData/snapshots/ideModels/kotlinMultiplatform___hierarchical_V2.txt index 5b5252f830b..05afa028f2b 100644 --- a/android/testData/snapshots/ideModels/kotlinMultiplatform___hierarchical_V2.txt +++ b/android/testData/snapshots/ideModels/kotlinMultiplatform___hierarchical_V2.txt @@ -633,7 +633,10 @@ MODULE : kotlinMultiPlatform.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.kotlin + testApplicationId : com.example.android.kotlin.test - basicVariant: : release + applicationId : com.example.android.kotlin BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2187,6 +2190,7 @@ MODULE : kotlinMultiPlatform.module2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.test.multiproject.module2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinMultiplatform___jvm_V2.txt b/android/testData/snapshots/ideModels/kotlinMultiplatform___jvm_V2.txt index a6aa5210ecf..dc7476864f0 100644 --- a/android/testData/snapshots/ideModels/kotlinMultiplatform___jvm_V2.txt +++ b/android/testData/snapshots/ideModels/kotlinMultiplatform___jvm_V2.txt @@ -676,7 +676,10 @@ MODULE : kotlinMultiPlatform.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.kotlin + testApplicationId : com.example.android.kotlin.test - basicVariant: : release + applicationId : com.example.android.kotlin BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2246,6 +2249,7 @@ MODULE : kotlinMultiPlatform.module2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.test.multiproject.module2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/kotlinMultiplatform___jvm_hierarchical_V2.txt b/android/testData/snapshots/ideModels/kotlinMultiplatform___jvm_hierarchical_V2.txt index 4e408e74930..6ba4cdc942d 100644 --- a/android/testData/snapshots/ideModels/kotlinMultiplatform___jvm_hierarchical_V2.txt +++ b/android/testData/snapshots/ideModels/kotlinMultiplatform___jvm_hierarchical_V2.txt @@ -676,7 +676,10 @@ MODULE : kotlinMultiPlatform.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.kotlin + testApplicationId : com.example.android.kotlin.test - basicVariant: : release + applicationId : com.example.android.kotlin BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2246,6 +2249,7 @@ MODULE : kotlinMultiPlatform.module2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.test.multiproject.module2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/linked_firstapp_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/linked_firstapp_Agp_4_1_Gradle_6_5_V1.txt index c10ca007367..d6fce61cb1a 100644 --- a/android/testData/snapshots/ideModels/linked_firstapp_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/linked_firstapp_Agp_4_1_Gradle_6_5_V1.txt @@ -534,7 +534,10 @@ MODULE : My_First_App.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.firstapp + testApplicationId : com.example.firstapp.test - basicVariant: : release + applicationId : com.example.firstapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2036,6 +2039,7 @@ MODULE : My_First_App.app.mysharedlibrary UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.mysharedlibrary.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/linked_firstapp_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/linked_firstapp_Agp_4_2_Gradle_6_7_1_V1.txt index a23d63b03f2..e23daa8598f 100644 --- a/android/testData/snapshots/ideModels/linked_firstapp_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/linked_firstapp_Agp_4_2_Gradle_6_7_1_V1.txt @@ -533,7 +533,10 @@ MODULE : My_First_App.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.firstapp + testApplicationId : com.example.firstapp.test - basicVariant: : release + applicationId : com.example.firstapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2039,6 +2042,7 @@ MODULE : My_First_App.app.mysharedlibrary UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.mysharedlibrary.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_0_Gradle_7_0_2_V1.txt index 23a5df033e2..ab260bda433 100644 --- a/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_0_Gradle_7_0_2_V1.txt @@ -485,7 +485,10 @@ MODULE : My_First_App.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.firstapp + testApplicationId : com.example.firstapp.test - basicVariant: : release + applicationId : com.example.firstapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2006,6 +2009,7 @@ MODULE : My_First_App.app.mysharedlibrary UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.mysharedlibrary.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_1_Gradle_7_2_V1.txt index 3b44ab8f579..67dce86ecef 100644 --- a/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_1_Gradle_7_2_V1.txt @@ -549,7 +549,10 @@ MODULE : My_First_App.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.firstapp + testApplicationId : com.example.firstapp.test - basicVariant: : release + applicationId : com.example.firstapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2070,6 +2073,7 @@ MODULE : My_First_App.app.mysharedlibrary UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.mysharedlibrary.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_2_Gradle_7_3_3_V1.txt index 0dc6c948911..d5c708a521d 100644 --- a/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_2_Gradle_7_3_3_V1.txt @@ -549,7 +549,10 @@ MODULE : My_First_App.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.firstapp + testApplicationId : com.example.firstapp.test - basicVariant: : release + applicationId : com.example.firstapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2056,6 +2059,7 @@ MODULE : My_First_App.app.mysharedlibrary UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.mysharedlibrary.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_2_Gradle_7_3_3_V2.txt index cadcf850820..f1088d3a221 100644 --- a/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/linked_firstapp_Agp_7_2_Gradle_7_3_3_V2.txt @@ -549,7 +549,10 @@ MODULE : My_First_App.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.firstapp + testApplicationId : com.example.firstapp.test - basicVariant: : release + applicationId : com.example.firstapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2028,6 +2031,7 @@ MODULE : My_First_App.app.mysharedlibrary UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.mysharedlibrary.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/linked_firstapp_NewAgp_V1.txt b/android/testData/snapshots/ideModels/linked_firstapp_NewAgp_V1.txt index 12a17e529aa..cb6660e0f0a 100644 --- a/android/testData/snapshots/ideModels/linked_firstapp_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/linked_firstapp_NewAgp_V1.txt @@ -549,7 +549,10 @@ MODULE : My_First_App.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.firstapp + testApplicationId : com.example.firstapp.test - basicVariant: : release + applicationId : com.example.firstapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2056,6 +2059,7 @@ MODULE : My_First_App.app.mysharedlibrary UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.mysharedlibrary.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/linked_firstapp_V2.txt b/android/testData/snapshots/ideModels/linked_firstapp_V2.txt index 97e8402e648..987118e74d0 100644 --- a/android/testData/snapshots/ideModels/linked_firstapp_V2.txt +++ b/android/testData/snapshots/ideModels/linked_firstapp_V2.txt @@ -549,7 +549,10 @@ MODULE : My_First_App.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.firstapp + testApplicationId : com.example.firstapp.test - basicVariant: : release + applicationId : com.example.firstapp BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2028,6 +2031,7 @@ MODULE : My_First_App.app.mysharedlibrary UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.mysharedlibrary.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/lintCustomChecks_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/lintCustomChecks_Agp_7_1_Gradle_7_2_V1.txt index fed433340bc..b2707836a51 100644 --- a/android/testData/snapshots/ideModels/lintCustomChecks_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/lintCustomChecks_Agp_7_1_Gradle_7_2_V1.txt @@ -802,7 +802,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.app + testApplicationId : com.example.app.test - basicVariant: : release + applicationId : com.example.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1185,6 +1188,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1525,6 +1529,7 @@ MODULE : project.library-remote UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/lintCustomChecks_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/lintCustomChecks_Agp_7_2_Gradle_7_3_3_V1.txt index 6aa61a725c7..471b3f16d43 100644 --- a/android/testData/snapshots/ideModels/lintCustomChecks_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/lintCustomChecks_Agp_7_2_Gradle_7_3_3_V1.txt @@ -802,7 +802,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.app + testApplicationId : com.example.app.test - basicVariant: : release + applicationId : com.example.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1169,6 +1172,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1493,6 +1497,7 @@ MODULE : project.library-remote UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/lintCustomChecks_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/lintCustomChecks_Agp_7_2_Gradle_7_3_3_V2.txt index 9e78b8b85f6..0d2cf945434 100644 --- a/android/testData/snapshots/ideModels/lintCustomChecks_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/lintCustomChecks_Agp_7_2_Gradle_7_3_3_V2.txt @@ -802,7 +802,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.app + testApplicationId : com.example.app.test - basicVariant: : release + applicationId : com.example.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1168,6 +1171,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1495,6 +1499,7 @@ MODULE : project.library-remote UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/lintCustomChecks_NewAgp_V1.txt b/android/testData/snapshots/ideModels/lintCustomChecks_NewAgp_V1.txt index 7ce3182b872..99a69649bff 100644 --- a/android/testData/snapshots/ideModels/lintCustomChecks_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/lintCustomChecks_NewAgp_V1.txt @@ -824,7 +824,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.app + testApplicationId : com.example.app.test - basicVariant: : release + applicationId : com.example.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1191,6 +1194,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1515,6 +1519,7 @@ MODULE : project.library-remote UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/lintCustomChecks_V2.txt b/android/testData/snapshots/ideModels/lintCustomChecks_V2.txt index f1fc064d7d2..975f93947ee 100644 --- a/android/testData/snapshots/ideModels/lintCustomChecks_V2.txt +++ b/android/testData/snapshots/ideModels/lintCustomChecks_V2.txt @@ -824,7 +824,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.app + testApplicationId : com.example.app.test - basicVariant: : release + applicationId : com.example.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1190,6 +1193,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1517,6 +1521,7 @@ MODULE : project.library-remote UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/localAarsAsModules_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/localAarsAsModules_Agp_4_1_Gradle_6_5_V1.txt index b3fcb60f5fa..ae67b1c32a8 100644 --- a/android/testData/snapshots/ideModels/localAarsAsModules_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/localAarsAsModules_Agp_4_1_Gradle_6_5_V1.txt @@ -370,7 +370,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.test.localaarsasmodules + testApplicationId : com.android.test.localaarsasmodules.test - basicVariant: : release + applicationId : com.android.test.localaarsasmodules BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -748,6 +751,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.android.test.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/localAarsAsModules_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/localAarsAsModules_Agp_4_2_Gradle_6_7_1_V1.txt index 0d430a75891..e9d033bb6a3 100644 --- a/android/testData/snapshots/ideModels/localAarsAsModules_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/localAarsAsModules_Agp_4_2_Gradle_6_7_1_V1.txt @@ -369,7 +369,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.test.localaarsasmodules + testApplicationId : com.android.test.localaarsasmodules.test - basicVariant: : release + applicationId : com.android.test.localaarsasmodules BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -748,6 +751,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.android.test.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_0_Gradle_7_0_2_V1.txt index da419d5038c..8b10fdfeb3e 100644 --- a/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_0_Gradle_7_0_2_V1.txt @@ -309,7 +309,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.test.localaarsasmodules + testApplicationId : com.android.test.localaarsasmodules.test - basicVariant: : release + applicationId : com.android.test.localaarsasmodules BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -708,6 +711,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.android.test.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_1_Gradle_7_2_V1.txt index 7d949e346e2..12b19128e62 100644 --- a/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_1_Gradle_7_2_V1.txt @@ -343,7 +343,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.test.localaarsasmodules + testApplicationId : com.android.test.localaarsasmodules.test - basicVariant: : release + applicationId : com.android.test.localaarsasmodules BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -742,6 +745,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.android.test.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_2_Gradle_7_3_3_V1.txt index 9694b345aa6..97529f4046b 100644 --- a/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_2_Gradle_7_3_3_V1.txt @@ -343,7 +343,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.test.localaarsasmodules + testApplicationId : com.android.test.localaarsasmodules.test - basicVariant: : release + applicationId : com.android.test.localaarsasmodules BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -728,6 +731,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.android.test.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_2_Gradle_7_3_3_V2.txt index 85c4806b221..82c41966e14 100644 --- a/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/localAarsAsModules_Agp_7_2_Gradle_7_3_3_V2.txt @@ -343,7 +343,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.test.localaarsasmodules + testApplicationId : com.android.test.localaarsasmodules.test - basicVariant: : release + applicationId : com.android.test.localaarsasmodules BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -728,6 +731,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.android.test.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/localAarsAsModules_NewAgp_V1.txt b/android/testData/snapshots/ideModels/localAarsAsModules_NewAgp_V1.txt index dbfb0124381..96af7e11c8b 100644 --- a/android/testData/snapshots/ideModels/localAarsAsModules_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/localAarsAsModules_NewAgp_V1.txt @@ -343,7 +343,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.test.localaarsasmodules + testApplicationId : com.android.test.localaarsasmodules.test - basicVariant: : release + applicationId : com.android.test.localaarsasmodules BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -728,6 +731,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.android.test.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/localAarsAsModules_V2.txt b/android/testData/snapshots/ideModels/localAarsAsModules_V2.txt index 7ba7f2cb053..c2fe4eee4dd 100644 --- a/android/testData/snapshots/ideModels/localAarsAsModules_V2.txt +++ b/android/testData/snapshots/ideModels/localAarsAsModules_V2.txt @@ -343,7 +343,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.android.test.localaarsasmodules + testApplicationId : com.android.test.localaarsasmodules.test - basicVariant: : release + applicationId : com.android.test.localaarsasmodules BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -728,6 +731,7 @@ MODULE : project.library UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.android.test.library.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/multiFlavor_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/multiFlavor_Agp_4_1_Gradle_6_5_V1.txt index 95c0cdec08e..e222bfddf1b 100644 --- a/android/testData/snapshots/ideModels/multiFlavor_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/multiFlavor_Agp_4_1_Gradle_6_5_V1.txt @@ -726,13 +726,25 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondXyzDebug + applicationId : com.example.multiflavor.firstAbc.secondXyz.debug + testApplicationId : com.example.multiflavor.firstAbc.secondXyz.debug.test - basicVariant: : firstXyzSecondAbcDebug + applicationId : com.example.multiflavor.secondAbc.debug + testApplicationId : com.example.multiflavor.secondAbc.debug.test - basicVariant: : firstXyzSecondXyzDebug + applicationId : com.example.multiflavor.secondXyz.debug + testApplicationId : com.example.multiflavor.secondXyz.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release - basicVariant: : firstAbcSecondXyzRelease + applicationId : com.example.multiflavor.firstAbc.secondXyz.release - basicVariant: : firstXyzSecondAbcRelease + applicationId : com.example.multiflavor.secondAbc.release - basicVariant: : firstXyzSecondXyzRelease + applicationId : com.example.multiflavor.secondXyz.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/multiFlavor_Agp_4_2_Gradle_6_7_1_V1.txt index ba050dc21a0..d1535a96e58 100644 --- a/android/testData/snapshots/ideModels/multiFlavor_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/multiFlavor_Agp_4_2_Gradle_6_7_1_V1.txt @@ -726,13 +726,25 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondXyzDebug + applicationId : com.example.multiflavor.firstAbc.secondXyz.debug + testApplicationId : com.example.multiflavor.firstAbc.secondXyz.debug.test - basicVariant: : firstXyzSecondAbcDebug + applicationId : com.example.multiflavor.secondAbc.debug + testApplicationId : com.example.multiflavor.secondAbc.debug.test - basicVariant: : firstXyzSecondXyzDebug + applicationId : com.example.multiflavor.secondXyz.debug + testApplicationId : com.example.multiflavor.secondXyz.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release - basicVariant: : firstAbcSecondXyzRelease + applicationId : com.example.multiflavor.firstAbc.secondXyz.release - basicVariant: : firstXyzSecondAbcRelease + applicationId : com.example.multiflavor.secondAbc.release - basicVariant: : firstXyzSecondXyzRelease + applicationId : com.example.multiflavor.secondXyz.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/multiFlavor_Agp_7_0_Gradle_7_0_2_V1.txt index 7edb50209ab..36c91f56b4d 100644 --- a/android/testData/snapshots/ideModels/multiFlavor_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/multiFlavor_Agp_7_0_Gradle_7_0_2_V1.txt @@ -537,13 +537,25 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondXyzDebug + applicationId : com.example.multiflavor.firstAbc.secondXyz.debug + testApplicationId : com.example.multiflavor.firstAbc.secondXyz.debug.test - basicVariant: : firstXyzSecondAbcDebug + applicationId : com.example.multiflavor.secondAbc.debug + testApplicationId : com.example.multiflavor.secondAbc.debug.test - basicVariant: : firstXyzSecondXyzDebug + applicationId : com.example.multiflavor.secondXyz.debug + testApplicationId : com.example.multiflavor.secondXyz.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release - basicVariant: : firstAbcSecondXyzRelease + applicationId : com.example.multiflavor.firstAbc.secondXyz.release - basicVariant: : firstXyzSecondAbcRelease + applicationId : com.example.multiflavor.secondAbc.release - basicVariant: : firstXyzSecondXyzRelease + applicationId : com.example.multiflavor.secondXyz.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/multiFlavor_Agp_7_1_Gradle_7_2_V1.txt index ab16d85aeb5..74f62d94625 100644 --- a/android/testData/snapshots/ideModels/multiFlavor_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/multiFlavor_Agp_7_1_Gradle_7_2_V1.txt @@ -578,13 +578,25 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondXyzDebug + applicationId : com.example.multiflavor.firstAbc.secondXyz.debug + testApplicationId : com.example.multiflavor.firstAbc.secondXyz.debug.test - basicVariant: : firstXyzSecondAbcDebug + applicationId : com.example.multiflavor.secondAbc.debug + testApplicationId : com.example.multiflavor.secondAbc.debug.test - basicVariant: : firstXyzSecondXyzDebug + applicationId : com.example.multiflavor.secondXyz.debug + testApplicationId : com.example.multiflavor.secondXyz.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release - basicVariant: : firstAbcSecondXyzRelease + applicationId : com.example.multiflavor.firstAbc.secondXyz.release - basicVariant: : firstXyzSecondAbcRelease + applicationId : com.example.multiflavor.secondAbc.release - basicVariant: : firstXyzSecondXyzRelease + applicationId : com.example.multiflavor.secondXyz.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/multiFlavor_Agp_7_2_Gradle_7_3_3_V1.txt index c9a039a0ffb..8f659b09642 100644 --- a/android/testData/snapshots/ideModels/multiFlavor_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/multiFlavor_Agp_7_2_Gradle_7_3_3_V1.txt @@ -578,13 +578,25 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondXyzDebug + applicationId : com.example.multiflavor.firstAbc.secondXyz.debug + testApplicationId : com.example.multiflavor.firstAbc.secondXyz.debug.test - basicVariant: : firstXyzSecondAbcDebug + applicationId : com.example.multiflavor.secondAbc.debug + testApplicationId : com.example.multiflavor.secondAbc.debug.test - basicVariant: : firstXyzSecondXyzDebug + applicationId : com.example.multiflavor.secondXyz.debug + testApplicationId : com.example.multiflavor.secondXyz.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release - basicVariant: : firstAbcSecondXyzRelease + applicationId : com.example.multiflavor.firstAbc.secondXyz.release - basicVariant: : firstXyzSecondAbcRelease + applicationId : com.example.multiflavor.secondAbc.release - basicVariant: : firstXyzSecondXyzRelease + applicationId : com.example.multiflavor.secondXyz.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/multiFlavor_Agp_7_2_Gradle_7_3_3_V2.txt index c97b3948140..ce9413bd79f 100644 --- a/android/testData/snapshots/ideModels/multiFlavor_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/multiFlavor_Agp_7_2_Gradle_7_3_3_V2.txt @@ -578,13 +578,25 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondXyzDebug + applicationId : com.example.multiflavor.firstAbc.secondXyz.debug + testApplicationId : com.example.multiflavor.firstAbc.secondXyz.debug.test - basicVariant: : firstXyzSecondAbcDebug + applicationId : com.example.multiflavor.secondAbc.debug + testApplicationId : com.example.multiflavor.secondAbc.debug.test - basicVariant: : firstXyzSecondXyzDebug + applicationId : com.example.multiflavor.secondXyz.debug + testApplicationId : com.example.multiflavor.secondXyz.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release - basicVariant: : firstAbcSecondXyzRelease + applicationId : com.example.multiflavor.firstAbc.secondXyz.release - basicVariant: : firstXyzSecondAbcRelease + applicationId : com.example.multiflavor.secondAbc.release - basicVariant: : firstXyzSecondXyzRelease + applicationId : com.example.multiflavor.secondXyz.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor_NewAgp_V1.txt b/android/testData/snapshots/ideModels/multiFlavor_NewAgp_V1.txt index 54c4b432f3a..2690dc266c5 100644 --- a/android/testData/snapshots/ideModels/multiFlavor_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/multiFlavor_NewAgp_V1.txt @@ -578,13 +578,25 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondXyzDebug + applicationId : com.example.multiflavor.firstAbc.secondXyz.debug + testApplicationId : com.example.multiflavor.firstAbc.secondXyz.debug.test - basicVariant: : firstXyzSecondAbcDebug + applicationId : com.example.multiflavor.secondAbc.debug + testApplicationId : com.example.multiflavor.secondAbc.debug.test - basicVariant: : firstXyzSecondXyzDebug + applicationId : com.example.multiflavor.secondXyz.debug + testApplicationId : com.example.multiflavor.secondXyz.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release - basicVariant: : firstAbcSecondXyzRelease + applicationId : com.example.multiflavor.firstAbc.secondXyz.release - basicVariant: : firstXyzSecondAbcRelease + applicationId : com.example.multiflavor.secondAbc.release - basicVariant: : firstXyzSecondXyzRelease + applicationId : com.example.multiflavor.secondXyz.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor_V2.txt b/android/testData/snapshots/ideModels/multiFlavor_V2.txt index 3dd5fcd9f73..d78665cc14b 100644 --- a/android/testData/snapshots/ideModels/multiFlavor_V2.txt +++ b/android/testData/snapshots/ideModels/multiFlavor_V2.txt @@ -578,13 +578,25 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondXyzDebug + applicationId : com.example.multiflavor.firstAbc.secondXyz.debug + testApplicationId : com.example.multiflavor.firstAbc.secondXyz.debug.test - basicVariant: : firstXyzSecondAbcDebug + applicationId : com.example.multiflavor.secondAbc.debug + testApplicationId : com.example.multiflavor.secondAbc.debug.test - basicVariant: : firstXyzSecondXyzDebug + applicationId : com.example.multiflavor.secondXyz.debug + testApplicationId : com.example.multiflavor.secondXyz.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release - basicVariant: : firstAbcSecondXyzRelease + applicationId : com.example.multiflavor.firstAbc.secondXyz.release - basicVariant: : firstXyzSecondAbcRelease + applicationId : com.example.multiflavor.secondAbc.release - basicVariant: : firstXyzSecondXyzRelease + applicationId : com.example.multiflavor.secondXyz.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_4_1_Gradle_6_5_V1.txt index db72cf58028..5a0a48ade14 100644 --- a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_4_1_Gradle_6_5_V1.txt @@ -399,7 +399,10 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_4_2_Gradle_6_7_1_V1.txt index 460ae51be77..6ff66b27b4e 100644 --- a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_4_2_Gradle_6_7_1_V1.txt @@ -399,7 +399,10 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_0_Gradle_7_0_2_V1.txt index aacb246c092..557bd726951 100644 --- a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_0_Gradle_7_0_2_V1.txt @@ -297,7 +297,10 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_1_Gradle_7_2_V1.txt index 654c291c60e..d51b0f51b90 100644 --- a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_1_Gradle_7_2_V1.txt @@ -338,7 +338,10 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_2_Gradle_7_3_3_V1.txt index 9296be0f43e..295ffb1d24a 100644 --- a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_2_Gradle_7_3_3_V1.txt @@ -338,7 +338,10 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_2_Gradle_7_3_3_V2.txt index 0438e93d28c..769f032bb66 100644 --- a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_7_2_Gradle_7_3_3_V2.txt @@ -338,7 +338,10 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_NewAgp_V1.txt b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_NewAgp_V1.txt index 5486badf8a3..3d2c2c612bb 100644 --- a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_NewAgp_V1.txt @@ -338,7 +338,10 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_V2.txt b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_V2.txt index 848a058f425..76f3fa45645 100644 --- a/android/testData/snapshots/ideModels/multiFlavor____withFiltering_V2.txt +++ b/android/testData/snapshots/ideModels/multiFlavor____withFiltering_V2.txt @@ -338,7 +338,10 @@ MODULE : MultiFlavor.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : firstAbcSecondAbcDebug + applicationId : com.example.multiflavor.firstAbc.secondAbc.debug + testApplicationId : com.example.multiflavor.firstAbc.secondAbc.debug.test - basicVariant: : firstAbcSecondAbcRelease + applicationId : com.example.multiflavor.firstAbc.secondAbc.release FlavorDimensions : Dim1 FlavorDimensions : Dim2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar diff --git a/android/testData/snapshots/ideModels/namespaces_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/namespaces_Agp_4_1_Gradle_6_5_V1.txt index 1b21c2a5ca3..f3a0823c5e4 100644 --- a/android/testData/snapshots/ideModels/namespaces_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/namespaces_Agp_4_1_Gradle_6_5_V1.txt @@ -499,7 +499,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : testData.namespaces + testApplicationId : testData.namespaces.test - basicVariant: : release + applicationId : testData.namespaces BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -884,6 +887,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1219,6 +1223,7 @@ MODULE : project.otherlib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.otherlib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/namespaces_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/namespaces_Agp_4_2_Gradle_6_7_1_V1.txt index f8b4a91a463..355076d4bc9 100644 --- a/android/testData/snapshots/ideModels/namespaces_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/namespaces_Agp_4_2_Gradle_6_7_1_V1.txt @@ -497,7 +497,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : testData.namespaces + testApplicationId : testData.namespaces.test - basicVariant: : release + applicationId : testData.namespaces BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -883,6 +886,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1219,6 +1223,7 @@ MODULE : project.otherlib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.otherlib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/namespaces_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/namespaces_Agp_7_0_Gradle_7_0_2_V1.txt index f6c07e51888..d3f6a1157dc 100644 --- a/android/testData/snapshots/ideModels/namespaces_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/namespaces_Agp_7_0_Gradle_7_0_2_V1.txt @@ -406,7 +406,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : testData.namespaces + testApplicationId : testData.namespaces.test - basicVariant: : release + applicationId : testData.namespaces BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -802,6 +805,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1157,6 +1161,7 @@ MODULE : project.otherlib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.otherlib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/namespaces_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/namespaces_Agp_7_1_Gradle_7_2_V1.txt index 7fc567a8589..c9acde23509 100644 --- a/android/testData/snapshots/ideModels/namespaces_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/namespaces_Agp_7_1_Gradle_7_2_V1.txt @@ -457,7 +457,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : testData.namespaces + testApplicationId : testData.namespaces.test - basicVariant: : release + applicationId : testData.namespaces BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -853,6 +856,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1208,6 +1212,7 @@ MODULE : project.otherlib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.otherlib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/namespaces_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/namespaces_Agp_7_2_Gradle_7_3_3_V1.txt index 41c83cc5b0e..cb6cba0d26d 100644 --- a/android/testData/snapshots/ideModels/namespaces_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/namespaces_Agp_7_2_Gradle_7_3_3_V1.txt @@ -457,7 +457,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : testData.namespaces + testApplicationId : testData.namespaces.test - basicVariant: : release + applicationId : testData.namespaces BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -837,6 +840,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1176,6 +1180,7 @@ MODULE : project.otherlib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.otherlib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/namespaces_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/namespaces_Agp_7_2_Gradle_7_3_3_V2.txt index 450246087d6..f17f3c4130b 100644 --- a/android/testData/snapshots/ideModels/namespaces_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/namespaces_Agp_7_2_Gradle_7_3_3_V2.txt @@ -457,7 +457,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : testData.namespaces + testApplicationId : testData.namespaces.test - basicVariant: : release + applicationId : testData.namespaces BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -830,6 +833,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1174,6 +1178,7 @@ MODULE : project.otherlib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.otherlib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/namespaces_NewAgp_V1.txt b/android/testData/snapshots/ideModels/namespaces_NewAgp_V1.txt index c551d2716ae..344953a0409 100644 --- a/android/testData/snapshots/ideModels/namespaces_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/namespaces_NewAgp_V1.txt @@ -457,7 +457,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : testData.namespaces + testApplicationId : testData.namespaces.test - basicVariant: : release + applicationId : testData.namespaces BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -837,6 +840,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1176,6 +1180,7 @@ MODULE : project.otherlib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.otherlib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/namespaces_V2.txt b/android/testData/snapshots/ideModels/namespaces_V2.txt index e6855677b7d..10c65205c7b 100644 --- a/android/testData/snapshots/ideModels/namespaces_V2.txt +++ b/android/testData/snapshots/ideModels/namespaces_V2.txt @@ -457,7 +457,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : testData.namespaces + testApplicationId : testData.namespaces.test - basicVariant: : release + applicationId : testData.namespaces BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -829,6 +832,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -1172,6 +1176,7 @@ MODULE : project.otherlib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.otherlib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/nonStandardSourceSetDependencies_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/nonStandardSourceSetDependencies_Agp_7_2_Gradle_7_3_3_V2.txt index deee57b513e..ad3656b1886 100644 --- a/android/testData/snapshots/ideModels/nonStandardSourceSetDependencies_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/nonStandardSourceSetDependencies_Agp_7_2_Gradle_7_3_3_V2.txt @@ -1099,7 +1099,10 @@ MODULE : NonStandardSourceSetDependencies.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : me.monori.gradleprojectpathissue + testApplicationId : me.monori.gradleprojectpathissue.test - basicVariant: : release + applicationId : me.monori.gradleprojectpathissue BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2328,6 +2331,7 @@ MODULE : NonStandardSourceSetDependencies.feature-a UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : me.monori.feature.a.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -3404,6 +3408,7 @@ MODULE : NonStandardSourceSetDependencies.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/nonStandardSourceSetDependencies_V2.txt b/android/testData/snapshots/ideModels/nonStandardSourceSetDependencies_V2.txt index 9a94ff5c314..e7897203da0 100644 --- a/android/testData/snapshots/ideModels/nonStandardSourceSetDependencies_V2.txt +++ b/android/testData/snapshots/ideModels/nonStandardSourceSetDependencies_V2.txt @@ -1103,7 +1103,10 @@ MODULE : NonStandardSourceSetDependencies.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : me.monori.gradleprojectpathissue + testApplicationId : me.monori.gradleprojectpathissue.test - basicVariant: : release + applicationId : me.monori.gradleprojectpathissue BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2332,6 +2335,7 @@ MODULE : NonStandardSourceSetDependencies.feature-a UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : me.monori.feature.a.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -3408,6 +3412,7 @@ MODULE : NonStandardSourceSetDependencies.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/nonStandardSourceSetDependencies___hierarchical_V2.txt b/android/testData/snapshots/ideModels/nonStandardSourceSetDependencies___hierarchical_V2.txt index 9a94ff5c314..e7897203da0 100644 --- a/android/testData/snapshots/ideModels/nonStandardSourceSetDependencies___hierarchical_V2.txt +++ b/android/testData/snapshots/ideModels/nonStandardSourceSetDependencies___hierarchical_V2.txt @@ -1103,7 +1103,10 @@ MODULE : NonStandardSourceSetDependencies.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : me.monori.gradleprojectpathissue + testApplicationId : me.monori.gradleprojectpathissue.test - basicVariant: : release + applicationId : me.monori.gradleprojectpathissue BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2332,6 +2335,7 @@ MODULE : NonStandardSourceSetDependencies.feature-a UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : me.monori.feature.a.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -3408,6 +3412,7 @@ MODULE : NonStandardSourceSetDependencies.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_4_1_Gradle_6_5_V1.txt index a3be9489d8d..1d5db4a5f2a 100644 --- a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_4_1_Gradle_6_5_V1.txt @@ -219,7 +219,10 @@ MODULE : application.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_4_2_Gradle_6_7_1_V1.txt index 30492f6df72..17ea230da3f 100644 --- a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_4_2_Gradle_6_7_1_V1.txt @@ -219,7 +219,10 @@ MODULE : application.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_0_Gradle_7_0_2_V1.txt index bd5a105dc07..1d2a2a240f8 100644 --- a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_0_Gradle_7_0_2_V1.txt @@ -190,7 +190,10 @@ MODULE : application.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_1_Gradle_7_2_V1.txt index 32a7ebdbfe3..31c727b0f7e 100644 --- a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_1_Gradle_7_2_V1.txt @@ -207,7 +207,10 @@ MODULE : application.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_2_Gradle_7_3_3_V1.txt index b7322929935..cb8e151e1be 100644 --- a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_2_Gradle_7_3_3_V1.txt @@ -207,7 +207,10 @@ MODULE : application.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_2_Gradle_7_3_3_V2.txt index 935b2aac86d..d2f2de997c0 100644 --- a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_7_2_Gradle_7_3_3_V2.txt @@ -207,7 +207,10 @@ MODULE : application.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_NewAgp_V1.txt b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_NewAgp_V1.txt index 99c53dd8d5d..41669fe1e3f 100644 --- a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_NewAgp_V1.txt @@ -207,7 +207,10 @@ MODULE : application.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_V2.txt b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_V2.txt index f9d37a66069..b4361b7e63d 100644 --- a/android/testData/snapshots/ideModels/nonStandardSourceSets_application_V2.txt +++ b/android/testData/snapshots/ideModels/nonStandardSourceSets_application_V2.txt @@ -207,7 +207,10 @@ MODULE : application.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/onlyModule_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/onlyModule_Agp_4_1_Gradle_6_5_V1.txt index 261fcebcd52..e5798d2e2df 100644 --- a/android/testData/snapshots/ideModels/onlyModule_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/onlyModule_Agp_4_1_Gradle_6_5_V1.txt @@ -307,7 +307,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app + testApplicationId : com.example.android.app.test - basicVariant: : release + applicationId : com.example.android.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -664,6 +667,7 @@ MODULE : project.test UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app.testmodule BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1542,6 +1546,7 @@ MODULE : project.test2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.test2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/onlyModule_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/onlyModule_Agp_4_2_Gradle_6_7_1_V1.txt index ab7b145502e..55131978288 100644 --- a/android/testData/snapshots/ideModels/onlyModule_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/onlyModule_Agp_4_2_Gradle_6_7_1_V1.txt @@ -305,7 +305,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app + testApplicationId : com.example.android.app.test - basicVariant: : release + applicationId : com.example.android.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -663,6 +666,7 @@ MODULE : project.test UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app.testmodule BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1542,6 +1546,7 @@ MODULE : project.test2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.test2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/onlyModule_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/onlyModule_Agp_7_0_Gradle_7_0_2_V1.txt index 4796675a4ac..967fd5ef8da 100644 --- a/android/testData/snapshots/ideModels/onlyModule_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/onlyModule_Agp_7_0_Gradle_7_0_2_V1.txt @@ -266,7 +266,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app + testApplicationId : com.example.android.app.test - basicVariant: : release + applicationId : com.example.android.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -643,6 +646,7 @@ MODULE : project.test UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app.testmodule BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1527,6 +1531,7 @@ MODULE : project.test2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.test2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/onlyModule_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/onlyModule_Agp_7_1_Gradle_7_2_V1.txt index 292d76830ee..3190c4821a1 100644 --- a/android/testData/snapshots/ideModels/onlyModule_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/onlyModule_Agp_7_1_Gradle_7_2_V1.txt @@ -281,7 +281,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app + testApplicationId : com.example.android.app.test - basicVariant: : release + applicationId : com.example.android.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -658,6 +661,7 @@ MODULE : project.test UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app.testmodule BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1545,6 +1549,7 @@ MODULE : project.test2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.test2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/onlyModule_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/onlyModule_Agp_7_2_Gradle_7_3_3_V1.txt index 61ac222e727..facfff756b1 100644 --- a/android/testData/snapshots/ideModels/onlyModule_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/onlyModule_Agp_7_2_Gradle_7_3_3_V1.txt @@ -283,7 +283,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app + testApplicationId : com.example.android.app.test - basicVariant: : release + applicationId : com.example.android.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -644,6 +647,7 @@ MODULE : project.test UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app.testmodule BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1531,6 +1535,7 @@ MODULE : project.test2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.test2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/onlyModule_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/onlyModule_Agp_7_2_Gradle_7_3_3_V2.txt index 2aea082941b..4e9f6b7cfd3 100644 --- a/android/testData/snapshots/ideModels/onlyModule_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/onlyModule_Agp_7_2_Gradle_7_3_3_V2.txt @@ -283,7 +283,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app + testApplicationId : com.example.android.app.test - basicVariant: : release + applicationId : com.example.android.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -645,6 +648,7 @@ MODULE : project.test UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app.testmodule BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1499,6 +1503,7 @@ MODULE : project.test2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.test2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/onlyModule_NewAgp_V1.txt b/android/testData/snapshots/ideModels/onlyModule_NewAgp_V1.txt index 81d0d42f807..2733e100a6f 100644 --- a/android/testData/snapshots/ideModels/onlyModule_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/onlyModule_NewAgp_V1.txt @@ -283,7 +283,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app + testApplicationId : com.example.android.app.test - basicVariant: : release + applicationId : com.example.android.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -644,6 +647,7 @@ MODULE : project.test UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app.testmodule BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1531,6 +1535,7 @@ MODULE : project.test2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.test2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/onlyModule_V2.txt b/android/testData/snapshots/ideModels/onlyModule_V2.txt index 3de0b968c10..e1badbe031d 100644 --- a/android/testData/snapshots/ideModels/onlyModule_V2.txt +++ b/android/testData/snapshots/ideModels/onlyModule_V2.txt @@ -283,7 +283,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app + testApplicationId : com.example.android.app.test - basicVariant: : release + applicationId : com.example.android.app BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -645,6 +648,7 @@ MODULE : project.test UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.app.testmodule BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1499,6 +1503,7 @@ MODULE : project.test2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.android.test2 BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_4_1_Gradle_6_5_V1.txt index 773eaa2ec84..edef111c7ac 100644 --- a/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_4_1_Gradle_6_5_V1.txt @@ -2139,17 +2139,33 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : basicOtherBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : paidBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : paidOtherBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : basicBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix.suffix - basicVariant: : basicOtherBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.suffix - basicVariant: : paidBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix.suffix - basicVariant: : paidOtherBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.suffix - basicVariant: : basicBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix - basicVariant: : basicOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix - basicVariant: : paidBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix - basicVariant: : paidOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix FlavorDimensions : foo FlavorDimensions : bar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar @@ -3968,6 +3984,7 @@ MODULE : project.dyn_feature UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.dyn_feature.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BaseFeature : :app @@ -4306,6 +4323,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.projectwithappandlib.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5006,6 +5024,7 @@ MODULE : project.nested1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5321,6 +5340,7 @@ MODULE : project.nested1.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5646,7 +5666,9 @@ MODULE : project.nested2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicDebug + testApplicationId : com.example.nested2.test - basicVariant: : paidDebug + testApplicationId : com.example.nested2.test - basicVariant: : basicRelease - basicVariant: : paidRelease FlavorDimensions : foo @@ -6092,6 +6114,7 @@ MODULE : project.nested2.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6421,6 +6444,7 @@ MODULE : project.nested2.trans.deep2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.trans.deep2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_4_2_Gradle_6_7_1_V1.txt index 45125a097cc..b1fbda01850 100644 --- a/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_4_2_Gradle_6_7_1_V1.txt @@ -2133,17 +2133,33 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : basicOtherBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : paidBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : paidOtherBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : basicBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix.suffix - basicVariant: : basicOtherBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.suffix - basicVariant: : paidBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix.suffix - basicVariant: : paidOtherBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.suffix - basicVariant: : basicBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix - basicVariant: : basicOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix - basicVariant: : paidBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix - basicVariant: : paidOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix FlavorDimensions : foo FlavorDimensions : bar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar @@ -3963,6 +3979,7 @@ MODULE : project.dyn_feature UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.dyn_feature.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BaseFeature : :app @@ -4303,6 +4320,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.projectwithappandlib.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5004,6 +5022,7 @@ MODULE : project.nested1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5320,6 +5339,7 @@ MODULE : project.nested1.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5646,7 +5666,9 @@ MODULE : project.nested2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicDebug + testApplicationId : com.example.nested2.test - basicVariant: : paidDebug + testApplicationId : com.example.nested2.test - basicVariant: : basicRelease - basicVariant: : paidRelease FlavorDimensions : foo @@ -6093,6 +6115,7 @@ MODULE : project.nested2.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6423,6 +6446,7 @@ MODULE : project.nested2.trans.deep2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.trans.deep2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_0_Gradle_7_0_2_V1.txt index 7fbe1d1d6fe..53e4401b70c 100644 --- a/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_0_Gradle_7_0_2_V1.txt @@ -1626,17 +1626,33 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : basicOtherBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : paidBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : paidOtherBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : basicBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix.suffix - basicVariant: : basicOtherBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.suffix - basicVariant: : paidBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix.suffix - basicVariant: : paidOtherBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.suffix - basicVariant: : basicBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix - basicVariant: : basicOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix - basicVariant: : paidBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix - basicVariant: : paidOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix FlavorDimensions : foo FlavorDimensions : bar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar @@ -3513,6 +3529,7 @@ MODULE : project.dyn_feature UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.dyn_feature.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BaseFeature : :app @@ -3873,6 +3890,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.projectwithappandlib.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -4593,6 +4611,7 @@ MODULE : project.nested1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -4928,6 +4947,7 @@ MODULE : project.nested1.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5273,7 +5293,9 @@ MODULE : project.nested2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicDebug + testApplicationId : com.example.nested2.test - basicVariant: : paidDebug + testApplicationId : com.example.nested2.test - basicVariant: : basicRelease - basicVariant: : paidRelease FlavorDimensions : foo @@ -5757,6 +5779,7 @@ MODULE : project.nested2.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6106,6 +6129,7 @@ MODULE : project.nested2.trans.deep2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.trans.deep2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_1_Gradle_7_2_V1.txt index 4b8b69e964e..9992917fc38 100644 --- a/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_1_Gradle_7_2_V1.txt @@ -1792,17 +1792,33 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : basicOtherBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : paidBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : paidOtherBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : basicBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix.suffix - basicVariant: : basicOtherBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.suffix - basicVariant: : paidBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix.suffix - basicVariant: : paidOtherBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.suffix - basicVariant: : basicBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix - basicVariant: : basicOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix - basicVariant: : paidBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix - basicVariant: : paidOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix FlavorDimensions : foo FlavorDimensions : bar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar @@ -3669,6 +3685,7 @@ MODULE : project.dyn_feature UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.dyn_feature.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BaseFeature : :app @@ -4029,6 +4046,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.projectwithappandlib.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -4749,6 +4767,7 @@ MODULE : project.nested1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5084,6 +5103,7 @@ MODULE : project.nested1.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5429,7 +5449,9 @@ MODULE : project.nested2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicDebug + testApplicationId : com.example.nested2.test - basicVariant: : paidDebug + testApplicationId : com.example.nested2.test - basicVariant: : basicRelease - basicVariant: : paidRelease FlavorDimensions : foo @@ -5913,6 +5935,7 @@ MODULE : project.nested2.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6262,6 +6285,7 @@ MODULE : project.nested2.trans.deep2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.trans.deep2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_2_Gradle_7_3_3_V1.txt index 5a10eafc6fe..76247207303 100644 --- a/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_2_Gradle_7_3_3_V1.txt @@ -1792,17 +1792,33 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : basicOtherBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : paidBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : paidOtherBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : basicBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix.suffix - basicVariant: : basicOtherBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.suffix - basicVariant: : paidBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix.suffix - basicVariant: : paidOtherBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.suffix - basicVariant: : basicBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix - basicVariant: : basicOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix - basicVariant: : paidBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix - basicVariant: : paidOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix FlavorDimensions : foo FlavorDimensions : bar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar @@ -3640,6 +3656,7 @@ MODULE : project.dyn_feature UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.dyn_feature.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BaseFeature : :app @@ -3986,6 +4003,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.projectwithappandlib.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -4693,6 +4711,7 @@ MODULE : project.nested1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5012,6 +5031,7 @@ MODULE : project.nested1.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5341,7 +5361,9 @@ MODULE : project.nested2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicDebug + testApplicationId : com.example.nested2.test - basicVariant: : paidDebug + testApplicationId : com.example.nested2.test - basicVariant: : basicRelease - basicVariant: : paidRelease FlavorDimensions : foo @@ -5809,6 +5831,7 @@ MODULE : project.nested2.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6142,6 +6165,7 @@ MODULE : project.nested2.trans.deep2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.trans.deep2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_2_Gradle_7_3_3_V2.txt index 90882382ec6..72501623198 100644 --- a/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/psdSample_Groovy_Agp_7_2_Gradle_7_3_3_V2.txt @@ -1792,17 +1792,33 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : basicOtherBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : paidBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : paidOtherBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : basicBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix.suffix - basicVariant: : basicOtherBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.suffix - basicVariant: : paidBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix.suffix - basicVariant: : paidOtherBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.suffix - basicVariant: : basicBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix - basicVariant: : basicOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix - basicVariant: : paidBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix - basicVariant: : paidOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix FlavorDimensions : foo FlavorDimensions : bar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar @@ -3612,6 +3628,7 @@ MODULE : project.dyn_feature UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.dyn_feature.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BaseFeature : :app @@ -3959,6 +3976,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.projectwithappandlib.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -4666,6 +4684,7 @@ MODULE : project.nested1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -4988,6 +5007,7 @@ MODULE : project.nested1.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5320,7 +5340,9 @@ MODULE : project.nested2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicDebug + testApplicationId : com.example.nested2.test - basicVariant: : paidDebug + testApplicationId : com.example.nested2.test - basicVariant: : basicRelease - basicVariant: : paidRelease FlavorDimensions : foo @@ -5791,6 +5813,7 @@ MODULE : project.nested2.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6127,6 +6150,7 @@ MODULE : project.nested2.trans.deep2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.trans.deep2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/psdSample_Groovy_NewAgp_V1.txt b/android/testData/snapshots/ideModels/psdSample_Groovy_NewAgp_V1.txt index 8a61023ebeb..fcdb641060f 100644 --- a/android/testData/snapshots/ideModels/psdSample_Groovy_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/psdSample_Groovy_NewAgp_V1.txt @@ -1795,17 +1795,33 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : basicOtherBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : paidBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : paidOtherBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : basicBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix.suffix - basicVariant: : basicOtherBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.suffix - basicVariant: : paidBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix.suffix - basicVariant: : paidOtherBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.suffix - basicVariant: : basicBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix - basicVariant: : basicOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix - basicVariant: : paidBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix - basicVariant: : paidOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix FlavorDimensions : foo FlavorDimensions : bar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar @@ -3643,6 +3659,7 @@ MODULE : project.dyn_feature UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.dyn_feature.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BaseFeature : :app @@ -3989,6 +4006,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.projectwithappandlib.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -4696,6 +4714,7 @@ MODULE : project.nested1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5015,6 +5034,7 @@ MODULE : project.nested1.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5344,7 +5364,9 @@ MODULE : project.nested2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicDebug + testApplicationId : com.example.nested2.test - basicVariant: : paidDebug + testApplicationId : com.example.nested2.test - basicVariant: : basicRelease - basicVariant: : paidRelease FlavorDimensions : foo @@ -5812,6 +5834,7 @@ MODULE : project.nested2.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6145,6 +6168,7 @@ MODULE : project.nested2.trans.deep2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.trans.deep2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/psdSample_Groovy_V2.txt b/android/testData/snapshots/ideModels/psdSample_Groovy_V2.txt index cd573712035..a99bb961980 100644 --- a/android/testData/snapshots/ideModels/psdSample_Groovy_V2.txt +++ b/android/testData/snapshots/ideModels/psdSample_Groovy_V2.txt @@ -1795,17 +1795,33 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : basicOtherBarDebug + applicationId : com.example.psd.sample.app.defaultSuffix + testApplicationId : com.example.psd.sample.app.default.test - basicVariant: : paidBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : paidOtherBarDebug + applicationId : com.example.psd.sample.app.paid.defaultSuffix + testApplicationId : com.example.psd.sample.app.paid.test - basicVariant: : basicBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix.suffix - basicVariant: : basicOtherBarRelease + applicationId : com.example.psd.sample.app.defaultSuffix.suffix - basicVariant: : paidBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix.suffix - basicVariant: : paidOtherBarRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.suffix - basicVariant: : basicBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix.barSuffix - basicVariant: : basicOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.defaultSuffix - basicVariant: : paidBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix.barSuffix - basicVariant: : paidOtherBarSpecialRelease + applicationId : com.example.psd.sample.app.paid.defaultSuffix FlavorDimensions : foo FlavorDimensions : bar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar @@ -3615,6 +3631,7 @@ MODULE : project.dyn_feature UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.dyn_feature.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BaseFeature : :app @@ -3962,6 +3979,7 @@ MODULE : project.lib UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.projectwithappandlib.lib.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -4669,6 +4687,7 @@ MODULE : project.nested1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -4991,6 +5010,7 @@ MODULE : project.nested1.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested1.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -5323,7 +5343,9 @@ MODULE : project.nested2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : basicDebug + testApplicationId : com.example.nested2.test - basicVariant: : paidDebug + testApplicationId : com.example.nested2.test - basicVariant: : basicRelease - basicVariant: : paidRelease FlavorDimensions : foo @@ -5794,6 +5816,7 @@ MODULE : project.nested2.deep UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.deep.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -6130,6 +6153,7 @@ MODULE : project.nested2.trans.deep2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.nested2.trans.deep2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/simpleApplication_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/simpleApplication_Agp_4_1_Gradle_6_5_V1.txt index 85071976605..eb5f63196c2 100644 --- a/android/testData/snapshots/ideModels/simpleApplication_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/simpleApplication_Agp_4_1_Gradle_6_5_V1.txt @@ -219,7 +219,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/simpleApplication_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/simpleApplication_Agp_4_2_Gradle_6_7_1_V1.txt index 89653ec0154..6e7dee8fc83 100644 --- a/android/testData/snapshots/ideModels/simpleApplication_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/simpleApplication_Agp_4_2_Gradle_6_7_1_V1.txt @@ -219,7 +219,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/simpleApplication_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/simpleApplication_Agp_7_0_Gradle_7_0_2_V1.txt index ae496585bf4..22480f816c4 100644 --- a/android/testData/snapshots/ideModels/simpleApplication_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/simpleApplication_Agp_7_0_Gradle_7_0_2_V1.txt @@ -190,7 +190,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/simpleApplication_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/simpleApplication_Agp_7_1_Gradle_7_2_V1.txt index 7b3cb91d3bc..6e02a870790 100644 --- a/android/testData/snapshots/ideModels/simpleApplication_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/simpleApplication_Agp_7_1_Gradle_7_2_V1.txt @@ -207,7 +207,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/simpleApplication_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/simpleApplication_Agp_7_2_Gradle_7_3_3_V1.txt index 285a7479f05..eba98d21976 100644 --- a/android/testData/snapshots/ideModels/simpleApplication_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/simpleApplication_Agp_7_2_Gradle_7_3_3_V1.txt @@ -207,7 +207,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/simpleApplication_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/simpleApplication_Agp_7_2_Gradle_7_3_3_V2.txt index cf497a9c019..8af023736fb 100644 --- a/android/testData/snapshots/ideModels/simpleApplication_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/simpleApplication_Agp_7_2_Gradle_7_3_3_V2.txt @@ -207,7 +207,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/simpleApplication_NewAgp_V1.txt b/android/testData/snapshots/ideModels/simpleApplication_NewAgp_V1.txt index dabb2c402f7..53f39e18a8c 100644 --- a/android/testData/snapshots/ideModels/simpleApplication_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/simpleApplication_NewAgp_V1.txt @@ -207,7 +207,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/simpleApplication_V2.txt b/android/testData/snapshots/ideModels/simpleApplication_V2.txt index f556114fa92..305b8a6d9ac 100644 --- a/android/testData/snapshots/ideModels/simpleApplication_V2.txt +++ b/android/testData/snapshots/ideModels/simpleApplication_V2.txt @@ -207,7 +207,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/simpleApplication___additionalGradleSourceSets_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/simpleApplication___additionalGradleSourceSets_Agp_7_2_Gradle_7_3_3_V2.txt index f1f535b2ff2..34972972eea 100644 --- a/android/testData/snapshots/ideModels/simpleApplication___additionalGradleSourceSets_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/simpleApplication___additionalGradleSourceSets_Agp_7_2_Gradle_7_3_3_V2.txt @@ -209,7 +209,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/simpleApplication___additionalGradleSourceSets_V2.txt b/android/testData/snapshots/ideModels/simpleApplication___additionalGradleSourceSets_V2.txt index ecbeb78b1a4..bbedef4b7c7 100644 --- a/android/testData/snapshots/ideModels/simpleApplication___additionalGradleSourceSets_V2.txt +++ b/android/testData/snapshots/ideModels/simpleApplication___additionalGradleSourceSets_V2.txt @@ -209,7 +209,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : google.simpleapplication + testApplicationId : google.simpleapplication.test - basicVariant: : release + applicationId : google.simpleapplication BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/optional/org.apache.http.legacy.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_3_5_Gradle_5_5_V1.txt b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_3_5_Gradle_5_5_V1.txt index 8613f13d018..690a88a0fca 100644 --- a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_3_5_Gradle_5_5_V1.txt +++ b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_3_5_Gradle_5_5_V1.txt @@ -285,7 +285,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.alruiz.transitive_dependencies + testApplicationId : com.example.alruiz.transitive_dependencies.test - basicVariant: : release + applicationId : com.example.alruiz.transitive_dependencies BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar DefaultConfig ProductFlavor @@ -1792,6 +1795,7 @@ MODULE : project.library1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar DefaultConfig @@ -2776,6 +2780,7 @@ MODULE : project.library2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar DefaultConfig diff --git a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_0_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_0_Gradle_6_5_V1.txt index 858038bf412..b971bfeed37 100644 --- a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_0_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_0_Gradle_6_5_V1.txt @@ -70,7 +70,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.alruiz.transitive_dependencies + testApplicationId : com.example.alruiz.transitive_dependencies.test - basicVariant: : release + applicationId : com.example.alruiz.transitive_dependencies BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1369,6 +1372,7 @@ MODULE : project.library1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2164,6 +2168,7 @@ MODULE : project.library2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_1_Gradle_6_5_V1.txt index d7892bd4535..b2bc254e580 100644 --- a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_1_Gradle_6_5_V1.txt @@ -684,7 +684,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.alruiz.transitive_dependencies + testApplicationId : com.example.alruiz.transitive_dependencies.test - basicVariant: : release + applicationId : com.example.alruiz.transitive_dependencies BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2034,6 +2037,7 @@ MODULE : project.library1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2867,6 +2871,7 @@ MODULE : project.library2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_2_Gradle_6_7_1_V1.txt index ea035d01545..4bb51f3b0d5 100644 --- a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_2_Gradle_6_7_1_V1.txt @@ -684,7 +684,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.alruiz.transitive_dependencies + testApplicationId : com.example.alruiz.transitive_dependencies.test - basicVariant: : release + applicationId : com.example.alruiz.transitive_dependencies BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -2037,6 +2040,7 @@ MODULE : project.library1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2871,6 +2875,7 @@ MODULE : project.library2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_0_Gradle_7_0_2_V1.txt index ee840134d4f..07db66730f1 100644 --- a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_0_Gradle_7_0_2_V1.txt @@ -585,7 +585,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.alruiz.transitive_dependencies + testApplicationId : com.example.alruiz.transitive_dependencies.test - basicVariant: : release + applicationId : com.example.alruiz.transitive_dependencies BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1948,6 +1951,7 @@ MODULE : project.library1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2801,6 +2805,7 @@ MODULE : project.library2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_1_Gradle_7_2_V1.txt index e9325b26ee6..8555b7132c1 100644 --- a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_1_Gradle_7_2_V1.txt @@ -636,7 +636,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.alruiz.transitive_dependencies + testApplicationId : com.example.alruiz.transitive_dependencies.test - basicVariant: : release + applicationId : com.example.alruiz.transitive_dependencies BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1999,6 +2002,7 @@ MODULE : project.library1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2852,6 +2856,7 @@ MODULE : project.library2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_2_Gradle_7_3_3_V1.txt index ea85a92c73c..4917f29e7af 100644 --- a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_2_Gradle_7_3_3_V1.txt @@ -636,7 +636,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.alruiz.transitive_dependencies + testApplicationId : com.example.alruiz.transitive_dependencies.test - basicVariant: : release + applicationId : com.example.alruiz.transitive_dependencies BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1989,6 +1992,7 @@ MODULE : project.library1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2828,6 +2832,7 @@ MODULE : project.library2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_2_Gradle_7_3_3_V2.txt index 88b0c7602e5..a4eb5534416 100644 --- a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_7_2_Gradle_7_3_3_V2.txt @@ -636,7 +636,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.alruiz.transitive_dependencies + testApplicationId : com.example.alruiz.transitive_dependencies.test - basicVariant: : release + applicationId : com.example.alruiz.transitive_dependencies BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1956,6 +1959,7 @@ MODULE : project.library1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2794,6 +2798,7 @@ MODULE : project.library2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_NewAgp_V1.txt b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_NewAgp_V1.txt index f8cfdc9c7c6..25db8d4e5b8 100644 --- a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_NewAgp_V1.txt @@ -642,7 +642,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.alruiz.transitive_dependencies + testApplicationId : com.example.alruiz.transitive_dependencies.test - basicVariant: : release + applicationId : com.example.alruiz.transitive_dependencies BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1995,6 +1998,7 @@ MODULE : project.library1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2834,6 +2838,7 @@ MODULE : project.library2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_V2.txt b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_V2.txt index a301aa9e8d7..64672ed6b79 100644 --- a/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_V2.txt +++ b/android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_V2.txt @@ -642,7 +642,10 @@ MODULE : project.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : com.example.alruiz.transitive_dependencies + testApplicationId : com.example.alruiz.transitive_dependencies.test - basicVariant: : release + applicationId : com.example.alruiz.transitive_dependencies BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false @@ -1962,6 +1965,7 @@ MODULE : project.library1 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library1.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions @@ -2800,6 +2804,7 @@ MODULE : project.library2 UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + testApplicationId : com.example.library2.test - basicVariant: : release BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions diff --git a/android/testData/snapshots/ideModels/withGradleMetadata_Agp_4_1_Gradle_6_5_V1.txt b/android/testData/snapshots/ideModels/withGradleMetadata_Agp_4_1_Gradle_6_5_V1.txt index b079dd2fb16..6794f136b42 100644 --- a/android/testData/snapshots/ideModels/withGradleMetadata_Agp_4_1_Gradle_6_5_V1.txt +++ b/android/testData/snapshots/ideModels/withGradleMetadata_Agp_4_1_Gradle_6_5_V1.txt @@ -219,7 +219,10 @@ MODULE : withGradleMetadata.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : come.example.with.gradle.metadata + testApplicationId : come.example.with.gradle.metadata.test - basicVariant: : release + applicationId : come.example.with.gradle.metadata BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/withGradleMetadata_Agp_4_2_Gradle_6_7_1_V1.txt b/android/testData/snapshots/ideModels/withGradleMetadata_Agp_4_2_Gradle_6_7_1_V1.txt index b8e841e6979..8e80a70db32 100644 --- a/android/testData/snapshots/ideModels/withGradleMetadata_Agp_4_2_Gradle_6_7_1_V1.txt +++ b/android/testData/snapshots/ideModels/withGradleMetadata_Agp_4_2_Gradle_6_7_1_V1.txt @@ -219,7 +219,10 @@ MODULE : withGradleMetadata.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : come.example.with.gradle.metadata + testApplicationId : come.example.with.gradle.metadata.test - basicVariant: : release + applicationId : come.example.with.gradle.metadata BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_0_Gradle_7_0_2_V1.txt b/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_0_Gradle_7_0_2_V1.txt index e133f10f0e6..580c3d25d67 100644 --- a/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_0_Gradle_7_0_2_V1.txt +++ b/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_0_Gradle_7_0_2_V1.txt @@ -190,7 +190,10 @@ MODULE : withGradleMetadata.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : come.example.with.gradle.metadata + testApplicationId : come.example.with.gradle.metadata.test - basicVariant: : release + applicationId : come.example.with.gradle.metadata BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_1_Gradle_7_2_V1.txt b/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_1_Gradle_7_2_V1.txt index a95bf34acca..e2e63e3e456 100644 --- a/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_1_Gradle_7_2_V1.txt +++ b/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_1_Gradle_7_2_V1.txt @@ -207,7 +207,10 @@ MODULE : withGradleMetadata.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : come.example.with.gradle.metadata + testApplicationId : come.example.with.gradle.metadata.test - basicVariant: : release + applicationId : come.example.with.gradle.metadata BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_2_Gradle_7_3_3_V1.txt b/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_2_Gradle_7_3_3_V1.txt index 2d0476cb096..524b78ccf45 100644 --- a/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_2_Gradle_7_3_3_V1.txt +++ b/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_2_Gradle_7_3_3_V1.txt @@ -207,7 +207,10 @@ MODULE : withGradleMetadata.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : come.example.with.gradle.metadata + testApplicationId : come.example.with.gradle.metadata.test - basicVariant: : release + applicationId : come.example.with.gradle.metadata BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_2_Gradle_7_3_3_V2.txt b/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_2_Gradle_7_3_3_V2.txt index df0dc0dde30..432f62d78c5 100644 --- a/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_2_Gradle_7_3_3_V2.txt +++ b/android/testData/snapshots/ideModels/withGradleMetadata_Agp_7_2_Gradle_7_3_3_V2.txt @@ -207,7 +207,10 @@ MODULE : withGradleMetadata.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : come.example.with.gradle.metadata + testApplicationId : come.example.with.gradle.metadata.test - basicVariant: : release + applicationId : come.example.with.gradle.metadata BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/withGradleMetadata_NewAgp_V1.txt b/android/testData/snapshots/ideModels/withGradleMetadata_NewAgp_V1.txt index f163be6cf6e..d534e6b12c8 100644 --- a/android/testData/snapshots/ideModels/withGradleMetadata_NewAgp_V1.txt +++ b/android/testData/snapshots/ideModels/withGradleMetadata_NewAgp_V1.txt @@ -207,7 +207,10 @@ MODULE : withGradleMetadata.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : come.example.with.gradle.metadata + testApplicationId : come.example.with.gradle.metadata.test - basicVariant: : release + applicationId : come.example.with.gradle.metadata BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testData/snapshots/ideModels/withGradleMetadata_V2.txt b/android/testData/snapshots/ideModels/withGradleMetadata_V2.txt index af6f6de82a0..1b5d8344ddc 100644 --- a/android/testData/snapshots/ideModels/withGradleMetadata_V2.txt +++ b/android/testData/snapshots/ideModels/withGradleMetadata_V2.txt @@ -207,7 +207,10 @@ MODULE : withGradleMetadata.app UsesCompose : false MlModelBindingEnabled : false - basicVariant: : debug + applicationId : come.example.with.gradle.metadata + testApplicationId : come.example.with.gradle.metadata.test - basicVariant: : release + applicationId : come.example.with.gradle.metadata BootClassPath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar ViewBindingOptions Enabled : false diff --git a/android/testSrc/com/android/tools/idea/gradle/stubs/android/AndroidProjectStub.java b/android/testSrc/com/android/tools/idea/gradle/stubs/android/AndroidProjectStub.java index de0ad5f7397..5211b51aac2 100644 --- a/android/testSrc/com/android/tools/idea/gradle/stubs/android/AndroidProjectStub.java +++ b/android/testSrc/com/android/tools/idea/gradle/stubs/android/AndroidProjectStub.java @@ -390,6 +390,6 @@ public class AndroidProjectStub implements AndroidProject { @NotNull public static IdeAndroidProject toIdeAndroidProject(AndroidProjectStub androidProject) { - return ((ModelCache.V1)(ModelCache.createForTests(false))).androidProjectFrom(androidProject); + return ((ModelCache.V1)(ModelCache.createForTests(false))).androidProjectFrom(androidProject, null); } } diff --git a/project-system-gradle-models/src/com/android/tools/idea/gradle/model/IdeVariant.kt b/project-system-gradle-models/src/com/android/tools/idea/gradle/model/IdeVariant.kt index db28e87a765..a18eac6a1b1 100644 --- a/project-system-gradle-models/src/com/android/tools/idea/gradle/model/IdeVariant.kt +++ b/project-system-gradle-models/src/com/android/tools/idea/gradle/model/IdeVariant.kt @@ -19,6 +19,16 @@ import java.io.File interface IdeBasicVariant { val name: String + + /** + * See [IdeAndroidArtifactCore.applicationId] for details. + */ + val applicationId: String? + + /** + * See [IdeAndroidArtifactCore.applicationId] for details. + */ + val testApplicationId: String? } interface IdeVariantHeader { diff --git a/project-system-gradle-models/src/com/android/tools/idea/gradle/model/impl/IdeVariantImpl.kt b/project-system-gradle-models/src/com/android/tools/idea/gradle/model/impl/IdeVariantImpl.kt index 4b289c8148a..2022ef4ea6a 100644 --- a/project-system-gradle-models/src/com/android/tools/idea/gradle/model/impl/IdeVariantImpl.kt +++ b/project-system-gradle-models/src/com/android/tools/idea/gradle/model/impl/IdeVariantImpl.kt @@ -25,7 +25,9 @@ import java.io.File import java.io.Serializable data class IdeBasicVariantImpl( - override val name: String + override val name: String, + override val applicationId: String?, + override val testApplicationId: String? ) : IdeBasicVariant, Serializable data class IdeVariantCoreImpl( diff --git a/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/AndroidExtraModelProviderWorker.kt b/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/AndroidExtraModelProviderWorker.kt index bf2b1741f25..e2290a82de1 100644 --- a/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/AndroidExtraModelProviderWorker.kt +++ b/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/AndroidExtraModelProviderWorker.kt @@ -236,8 +236,14 @@ internal class AndroidExtraModelProviderWorker( val modelCache = modelCacheV2Impl(internedModels, modelCacheLock, agpVersion) val androidProjectResult = - AndroidProjectResult.V2Project(modelCache, basicAndroidProject, androidProject, it.versions, - androidDsl, legacyApplicationIdModel) + AndroidProjectResult.V2Project( + modelCache, + basicAndroidProject, + androidProject, + it.versions, + androidDsl, + legacyApplicationIdModel + ) // TODO(solodkyy): Perhaps request the version interface depending on AGP version. val nativeModule = controller.findNativeModuleModel(it.gradleProject, syncAllVariantsAndAbis = false) @@ -562,7 +568,7 @@ internal class AndroidExtraModelProviderWorker( ) : AndroidProjectResult() { override val buildName: String? = null override val agpVersion: String = safeGet(androidProject::getModelVersion, "") - override val ideAndroidProject: IdeAndroidProjectImpl = modelCache.androidProjectFrom(androidProject) + override val ideAndroidProject: IdeAndroidProjectImpl = modelCache.androidProjectFrom(androidProject, legacyApplicationIdModel) override val allVariantNames: Set<String> = safeGet(androidProject::getVariantNames, null).orEmpty().toSet() override val defaultVariantName: String? = safeGet(androidProject::getDefaultVariant, null) ?: allVariantNames.getDefaultOrFirstItem("debug") @@ -583,8 +589,10 @@ internal class AndroidExtraModelProviderWorker( override val buildName: String = basicAndroidProject.buildName override val agpVersion: String = modelVersions.agp override val ideAndroidProject: IdeAndroidProjectImpl = - modelCache.androidProjectFrom(basicAndroidProject, androidProject, modelVersions, androidDsl) + modelCache.androidProjectFrom(basicAndroidProject, androidProject, modelVersions, androidDsl, legacyApplicationIdModel) val basicVariants: List<BasicVariant> = basicAndroidProject.variants.toList() + private val agpParsedVersion = GradleVersion.tryParseAndroidGradlePluginVersion(agpVersion) + val v2Variants: List<IdeVariantCoreImpl> = let { val v2Variants: List<V2Variant> = androidProject.variants.toList() val basicVariantMap = basicVariants.associateBy { it.name } diff --git a/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCache.kt b/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCache.kt index 9584d5ac2dc..094073701c5 100644 --- a/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCache.kt +++ b/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCache.kt @@ -26,6 +26,7 @@ import com.android.builder.model.NativeVariantAbi import com.android.builder.model.Variant import com.android.builder.model.v2.ide.BasicVariant import com.android.builder.model.v2.models.AndroidDsl +import com.android.builder.model.v2.models.BasicAndroidProject import com.android.builder.model.v2.models.VariantDependencies import com.android.builder.model.v2.models.Versions import com.android.builder.model.v2.models.ndk.NativeModule @@ -67,7 +68,7 @@ interface ModelCache { androidModuleId: ModuleId ): IdeVariantWithPostProcessor - fun androidProjectFrom(project: AndroidProject): IdeAndroidProjectImpl + fun androidProjectFrom(project: AndroidProject, legacyApplicationIdModel: LegacyApplicationIdModel?): IdeAndroidProjectImpl fun androidArtifactOutputFrom(output: OutputFile): IdeAndroidArtifactOutputImpl @@ -100,10 +101,11 @@ interface ModelCache { ): IdeVariantWithPostProcessor fun androidProjectFrom( - basicProject: com.android.builder.model.v2.models.BasicAndroidProject, + basicProject: BasicAndroidProject, project: com.android.builder.model.v2.models.AndroidProject, androidVersion: Versions, - androidDsl: AndroidDsl + androidDsl: AndroidDsl, + legacyApplicationIdModel: LegacyApplicationIdModel? ): IdeAndroidProjectImpl } diff --git a/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCacheV1Impl.kt b/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCacheV1Impl.kt index 0b107633361..fa04d945917 100644 --- a/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCacheV1Impl.kt +++ b/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCacheV1Impl.kt @@ -734,8 +734,8 @@ internal fun modelCacheV1Impl(internedModels: InternedModels, buildFolderPaths: // Legacy feature plugins are both library-like, and application/dynamic-feature-like // (with separate 'Feature'-suffixed variants for the application/dynamic-feature-like functionality) // From the IDE perspective attach the <variant>Feature applicationId to the library-like variant. - val apkVariantName = if(projectType == IdeAndroidProjectType.PROJECT_TYPE_FEATURE) variantName + "Feature" else variantName - val applicationId = when(ideArtifactName) { + val apkVariantName = if (projectType == IdeAndroidProjectType.PROJECT_TYPE_FEATURE) variantName + "Feature" else variantName + val applicationId = when (ideArtifactName) { // NB: the model will not be available for things that are not applicable, e.g. library and dynamic feature main IdeArtifactName.MAIN -> legacyApplicationIdModel?.componentToApplicationIdMap?.get(apkVariantName) IdeArtifactName.ANDROID_TEST -> legacyApplicationIdModel?.componentToApplicationIdMap?.get(variantName + "AndroidTest") @@ -1176,7 +1176,15 @@ internal fun modelCacheV1Impl(internedModels: InternedModels, buildFolderPaths: return if (project.isLibrary) IdeAndroidProjectType.PROJECT_TYPE_LIBRARY else IdeAndroidProjectType.PROJECT_TYPE_APP } - fun androidProjectFrom(project: AndroidProject): IdeAndroidProjectImpl { + fun basicVariantFrom(name: String, legacyApplicationIdModel: LegacyApplicationIdModel?): IdeBasicVariantImpl { + return IdeBasicVariantImpl( + name, + applicationId = legacyApplicationIdModel?.componentToApplicationIdMap?.get(name), + testApplicationId = legacyApplicationIdModel?.componentToApplicationIdMap?.get(name + "AndroidTest") + ) + } + + fun androidProjectFrom(project: AndroidProject, legacyApplicationIdModel: LegacyApplicationIdModel?): IdeAndroidProjectImpl { // Old plugin versions do not return model version. val parsedModelVersion = GradleVersion.tryParse(project.modelVersion) @@ -1197,7 +1205,7 @@ internal fun modelCacheV1Impl(internedModels: InternedModels, buildFolderPaths: else copy(project::getVariantNames, ::deduplicateString) ) - .map { IdeBasicVariantImpl(name = it) } + .map { basicVariantFrom(it, legacyApplicationIdModel) } val flavorDimensionCopy: Collection<String> = copy(project::getFlavorDimensions, ::deduplicateString) val bootClasspathCopy: Collection<String> = ImmutableList.copyOf(project.bootClasspath) val signingConfigsCopy: Collection<IdeSigningConfigImpl> = copy(project::getSigningConfigs, ::signingConfigFrom) @@ -1265,9 +1273,12 @@ internal fun modelCacheV1Impl(internedModels: InternedModels, buildFolderPaths: legacyApplicationIdModel: LegacyApplicationIdModel?, modelVersion: GradleVersion?, androidModuleId: ModuleId - ): IdeVariantWithPostProcessor = lock.withLock { variantFrom(androidProject, variant, legacyApplicationIdModel, modelVersion, androidModuleId ) } + ): IdeVariantWithPostProcessor = + lock.withLock { variantFrom(androidProject, variant, legacyApplicationIdModel, modelVersion, androidModuleId) } - override fun androidProjectFrom(project: AndroidProject): IdeAndroidProjectImpl = lock.withLock { androidProjectFrom(project) } + override fun androidProjectFrom(project: AndroidProject, legacyApplicationIdModel: LegacyApplicationIdModel?): IdeAndroidProjectImpl { + return lock.withLock { androidProjectFrom(project, legacyApplicationIdModel) } + } override fun androidArtifactOutputFrom(output: OutputFile): IdeAndroidArtifactOutputImpl = lock.withLock { androidArtifactOutputFrom(output) } diff --git a/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCacheV2Impl.kt b/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCacheV2Impl.kt index f0dd53551cd..cab0a792c61 100644 --- a/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCacheV2Impl.kt +++ b/project-system-gradle-sync/src/com/android/tools/idea/gradle/project/sync/ModelCacheV2Impl.kt @@ -744,15 +744,7 @@ internal fun modelCacheV2Impl(internedModels: InternedModels, lock: ReentrantLoc ): IdeAndroidArtifactCoreImpl { val testInfo = artifact.testInfo - val applicationId: String? = if (agpVersion.agpModelIncludesApplicationId) { - artifact.applicationId - } else { - when (name) { - IdeArtifactName.MAIN -> legacyApplicationIdModel?.componentToApplicationIdMap?.get(mainVariantName) - IdeArtifactName.ANDROID_TEST -> legacyApplicationIdModel?.componentToApplicationIdMap?.get(mainVariantName + "AndroidTest") - IdeArtifactName.UNIT_TEST, IdeArtifactName.TEST_FIXTURES -> null - } - } + val applicationId: String? = getApplicationIdFromArtifact(agpVersion, artifact, name, legacyApplicationIdModel, mainVariantName) return IdeAndroidArtifactCoreImpl( name = name, @@ -1136,11 +1128,22 @@ internal fun modelCacheV2Impl(internedModels: InternedModels, lock: ReentrantLoc else -> error("Unknown Android project type: $projectType") } + fun basicVariantFrom(variant: Variant, legacyApplicationIdModel: LegacyApplicationIdModel?): IdeBasicVariantImpl { + val variantName = variant.name + return IdeBasicVariantImpl( + variantName, + applicationId = variant.mainArtifact.applicationId ?: legacyApplicationIdModel?.componentToApplicationIdMap?.get(variantName), + testApplicationId = variant.androidTestArtifact?.applicationId + ?: legacyApplicationIdModel?.componentToApplicationIdMap?.get(variantName + "AndroidTest") + ) + } + fun androidProjectFrom( basicProject: BasicAndroidProject, project: AndroidProject, modelsVersions: Versions, - androidDsl: AndroidDsl + androidDsl: AndroidDsl, + legacyApplicationIdModel: LegacyApplicationIdModel? ): IdeAndroidProjectImpl { val defaultConfigCopy: IdeProductFlavorContainerImpl = productFlavorContainerFrom(androidDsl.defaultConfig, basicProject.mainSourceSet) val buildTypesCopy: Collection<IdeBuildTypeContainerImpl> = zip( @@ -1157,7 +1160,13 @@ internal fun modelCacheV2Impl(internedModels: InternedModels, lock: ReentrantLoc { it.sourceProvider.name }, ::productFlavorContainerFrom ) - val basicVariantsCopy: Collection<IdeBasicVariantImpl> = project.variants.map { IdeBasicVariantImpl(name = it.name) } + val basicVariantsCopy: Collection<IdeBasicVariantImpl> = project.variants.map { + IdeBasicVariantImpl( + name = it.name, + applicationId = getApplicationIdFromArtifact(agpVersion, it.mainArtifact, IdeArtifactName.MAIN, legacyApplicationIdModel, it.name), + testApplicationId = it.androidTestArtifact?.let{ androidTestArtifact -> getApplicationIdFromArtifact(agpVersion, androidTestArtifact, IdeArtifactName.ANDROID_TEST, legacyApplicationIdModel, it.name) } + ) + } val flavorDimensionCopy: Collection<String> = androidDsl.flavorDimensions.deduplicateStrings() val bootClasspathCopy: Collection<String> = ImmutableList.copyOf(basicProject.bootClasspath.map { it.absolutePath }) val signingConfigsCopy: Collection<IdeSigningConfigImpl> = androidDsl.signingConfigs.map { signingConfigFrom(it) } @@ -1232,13 +1241,30 @@ internal fun modelCacheV2Impl(internedModels: InternedModels, lock: ReentrantLoc basicProject: BasicAndroidProject, project: AndroidProject, androidVersion: Versions, - androidDsl: AndroidDsl - ): IdeAndroidProjectImpl = lock.withLock { androidProjectFrom(basicProject, project, androidVersion, androidDsl) } + androidDsl: AndroidDsl, + legacyApplicationIdModel: LegacyApplicationIdModel? + ): IdeAndroidProjectImpl = lock.withLock { androidProjectFrom(basicProject, project, androidVersion, androidDsl, legacyApplicationIdModel) } override fun nativeModuleFrom(nativeModule: NativeModule): IdeNativeModuleImpl = lock.withLock { nativeModuleFrom(nativeModule) } } } +private fun getApplicationIdFromArtifact( + agpVersion: GradleVersion, + artifact: AndroidArtifact, + name: IdeArtifactName, + legacyApplicationIdModel: LegacyApplicationIdModel?, + mainVariantName: String +) = if (agpVersion.agpModelIncludesApplicationId) { + artifact.applicationId +} else { + when (name) { + IdeArtifactName.MAIN -> legacyApplicationIdModel?.componentToApplicationIdMap?.get(mainVariantName) + IdeArtifactName.ANDROID_TEST -> legacyApplicationIdModel?.componentToApplicationIdMap?.get(mainVariantName + "AndroidTest") + IdeArtifactName.UNIT_TEST, IdeArtifactName.TEST_FIXTURES -> null + } +} + private inline fun <K, V, W, R> zip( original1: Collection<V>, original2: Collection<W>, diff --git a/project-system-gradle/src/com/android/tools/idea/gradle/project/sync/internal/IdeModelDumper.kt b/project-system-gradle/src/com/android/tools/idea/gradle/project/sync/internal/IdeModelDumper.kt index 3e882e4dfa4..fc8428c9482 100644 --- a/project-system-gradle/src/com/android/tools/idea/gradle/project/sync/internal/IdeModelDumper.kt +++ b/project-system-gradle/src/com/android/tools/idea/gradle/project/sync/internal/IdeModelDumper.kt @@ -252,6 +252,8 @@ private fun ideModelDumper(projectDumper: ProjectDumper) = with(projectDumper) { fun dump(ideBasicVariant: IdeBasicVariant) { head("- basicVariant:") { ideBasicVariant.name } nest { + prop("applicationId") { ideBasicVariant.applicationId } + prop("testApplicationId") { ideBasicVariant.testApplicationId } } } |