diff options
| author | Ivan Gavrilovic <gavra@google.com> | 2022-07-05 15:54:31 +0100 |
|---|---|---|
| committer | Ivan Gavrilovic <gavra@google.com> | 2022-07-06 16:37:37 +0000 |
| commit | 4cafb91afdff006a2de07b0082b1250d262e3e66 (patch) | |
| tree | 6f5d18a44672455b5e57ec06ef39cd98b82420fa | |
| parent | 776f900531709c371a567ac98117360371e24fdb (diff) | |
| download | idea-4cafb91afdff006a2de07b0082b1250d262e3e66.tar.gz | |
Move AGP 4.0 and 4.1 tests to Gradle 6.7.1
This is because KGP 1.7.0 uses Gradle plugin variant
publishing that does not work with Gradle 6.5 which
was used previously.
Bug: 237634933
Test: existing
Change-Id: Id2c4d3a93f9ab7d79b20fb935ec99e4e2c15cd5a
| -rw-r--r-- | android-test-framework/testSrc/com/android/tools/idea/testing/AgpIntegrationTests.kt | 4 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/basicCmakeApp_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/basicCmakeApp_Agp_4_1_Gradle_6_5_V1.txt) | 5 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/basic_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/basic_Agp_4_1_Gradle_6_5_V1.txt) | 5 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/includeFromLib_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/includeFromLib_Agp_4_1_Gradle_6_5_V1.txt) | 10 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/kotlinKapt_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/kotlinKapt_Agp_4_1_Gradle_6_5_V1.txt) | 46 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/kotlinKapt_Agp_4_2_Gradle_6_7_1_V1.txt | 28 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/linked_firstapp_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/linked_firstapp_Agp_4_1_Gradle_6_5_V1.txt) | 22 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/linked_firstapp_Agp_4_2_Gradle_6_7_1_V1.txt | 12 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/localAarsAsModules_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/localAarsAsModules_Agp_4_1_Gradle_6_5_V1.txt) | 12 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/multiFlavor_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/multiFlavor_Agp_4_1_Gradle_6_5_V1.txt) | 5 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/multiFlavor____withFiltering_Agp_4_1_Gradle_6_5_V1.txt) | 5 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/namespaces_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/namespaces_Agp_4_1_Gradle_6_5_V1.txt) | 15 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/nonStandardSourceSets_application_Agp_4_1_Gradle_6_5_V1.txt) | 5 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/onlyModule_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/onlyModule_Agp_4_1_Gradle_6_5_V1.txt) | 15 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/psdSample_Groovy_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/psdSample_Groovy_Agp_4_1_Gradle_6_5_V1.txt) | 48 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/simpleApplication_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/simpleApplication_Agp_4_1_Gradle_6_5_V1.txt) | 5 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_0_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_0_Gradle_6_5_V1.txt) | 25 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/transitiveDependencies____no_target_sdk_in_libs_Agp_4_1_Gradle_6_5_V1.txt) | 27 | ||||
| -rw-r--r-- | android/testData/snapshots/ideModels/withGradleMetadata_Agp_4_1_Gradle_6_7_1_V1.txt (renamed from android/testData/snapshots/ideModels/withGradleMetadata_Agp_4_1_Gradle_6_5_V1.txt) | 5 | ||||
| -rw-r--r-- | old-agp-tests/BUILD | 7 |
20 files changed, 163 insertions, 143 deletions
diff --git a/android-test-framework/testSrc/com/android/tools/idea/testing/AgpIntegrationTests.kt b/android-test-framework/testSrc/com/android/tools/idea/testing/AgpIntegrationTests.kt index cb78fc1a044..a8f6afee146 100644 --- a/android-test-framework/testSrc/com/android/tools/idea/testing/AgpIntegrationTests.kt +++ b/android-test-framework/testSrc/com/android/tools/idea/testing/AgpIntegrationTests.kt @@ -46,8 +46,8 @@ enum class AgpVersionSoftwareEnvironmentDescriptor( ) { AGP_32("3.3.2", gradleVersion = "5.5", kotlinVersion = "1.4.32", modelVersion = ModelVersion.V1), AGP_35("3.5.0", gradleVersion = "5.5", kotlinVersion = "1.4.32", modelVersion = ModelVersion.V1), - AGP_40("4.0.0", gradleVersion = "6.5", modelVersion = ModelVersion.V1), - AGP_41("4.1.0", gradleVersion = "6.5", modelVersion = ModelVersion.V1), + AGP_40("4.0.0", gradleVersion = "6.7.1", modelVersion = ModelVersion.V1), + AGP_41("4.1.0", gradleVersion = "6.7.1", modelVersion = ModelVersion.V1), AGP_42("4.2.0", gradleVersion = "6.7.1", modelVersion = ModelVersion.V1), AGP_70("7.0.0", gradleVersion = "7.0.2", modelVersion = ModelVersion.V1), AGP_71("7.1.0", gradleVersion = "7.2", modelVersion = ModelVersion.V1), 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_7_1_V1.txt index 7c21cc94271..52dc4251be3 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_7_1_V1.txt @@ -152,7 +152,7 @@ MODULE : project.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -164,8 +164,9 @@ MODULE : project.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions 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_7_1_V1.txt index 21a74cce799..d8c43151a64 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_7_1_V1.txt @@ -2,7 +2,7 @@ MODULE : project GradleModuleModel agpVersion : 4.1.0 gradlePath : : - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/build.gradle buildFilePath : <ROOT>/build.gradle rootFolderPath : <ROOT> @@ -14,8 +14,9 @@ MODULE : project - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions 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_7_1_V1.txt index 15d3365c0a4..ba25bd719a2 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_7_1_V1.txt @@ -292,7 +292,7 @@ MODULE : navgraph.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -304,8 +304,9 @@ MODULE : navgraph.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions @@ -2095,7 +2096,7 @@ MODULE : navgraph.lib GradleModuleModel agpVersion : 4.1.0 gradlePath : :lib - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/lib/build.gradle buildFilePath : <ROOT>/lib/build.gradle rootFolderPath : <ROOT> @@ -2107,8 +2108,9 @@ MODULE : navgraph.lib - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions 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_7_1_V1.txt index b9e7dcde8f7..e8117f4ffaf 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_7_1_V1.txt @@ -37,16 +37,6 @@ MODULE : MainActivity type : com.android.build.gradle.tasks.factory.AndroidUnitTest externalSystemId : GRADLE artifactsByConfiguration - _classStructurekaptLocalDebugAndroidTestKotlin : <empty> - _classStructurekaptLocalDebugKotlin : <empty> - _classStructurekaptLocalDebugUnitTestKotlin : <empty> - _classStructurekaptLocalReleaseKotlin : <empty> - _classStructurekaptLocalReleaseUnitTestKotlin : <empty> - _classStructurekaptRemoteDebugAndroidTestKotlin : <empty> - _classStructurekaptRemoteDebugKotlin : <empty> - _classStructurekaptRemoteDebugUnitTestKotlin : <empty> - _classStructurekaptRemoteReleaseKotlin : <empty> - _classStructurekaptRemoteReleaseUnitTestKotlin : <empty> _internal_aapt2_binary : <empty> androidApis : <empty> androidTestAnnotationProcessor : <empty> @@ -668,8 +658,6 @@ MODULE : MainActivity externalSystemId : GRADLE - artifacts : <ROOT>/javaLib/build/libs/javaLib.jar [-] artifactsByConfiguration - _classStructurekaptKotlin : <empty> - _classStructurekaptTestKotlin : <empty> annotationProcessor : <empty> api : <empty> apiDependenciesMetadata : <empty> @@ -679,6 +667,7 @@ MODULE : MainActivity compile : <empty> compileClasspath : <empty> compileOnly : <empty> + compileOnlyApi : <empty> compileOnlyDependenciesMetadata : <empty> default : <empty> implementation : <empty> @@ -958,7 +947,7 @@ MODULE : MainActivity.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -970,8 +959,9 @@ MODULE : MainActivity.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin - gradlePlugins : org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper @@ -1963,9 +1953,9 @@ MODULE : MainActivity.app - classpath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar destination : <ROOT>/app/build/tmp/kotlin-classes/localDebug jvmDefault : disable - jvmTarget : 1.8 moduleName : app_localDebug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2024,9 +2014,9 @@ MODULE : MainActivity.app - friendPaths : <ROOT>/app/build/tmp/kapt3/classes/localDebug [-] - friendPaths : <ROOT>/app/build/intermediates/app_classes/localDebug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : app_localDebug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2074,9 +2064,9 @@ MODULE : MainActivity.app - friendPaths : <ROOT>/app/build/tmp/kapt3/classes/localDebug [-] - friendPaths : <ROOT>/app/build/intermediates/app_classes/localDebug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : app_localDebug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2145,7 +2135,7 @@ MODULE : MainActivity.app.unitTest MODULE : MainActivity.javaLib GradleModuleModel gradlePath : :javaLib - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/javaLib/build.gradle buildFilePath : <ROOT>/javaLib/build.gradle rootFolderPath : <ROOT> @@ -2155,8 +2145,9 @@ MODULE : MainActivity.javaLib - gradlePlugins : org.gradle.buildinit.plugins.WrapperPlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : org.gradle.api.plugins.JavaPlugin - gradlePlugins : org.gradle.api.plugins.JavaLibraryPlugin - gradlePlugins : org.jetbrains.kotlin.gradle.scripting.internal.ScriptingKotlinGradleSubplugin @@ -2181,8 +2172,8 @@ MODULE : MainActivity.javaLib - classpath : <M2>/org/jetbrains/annotations/13.0/annotations-13.0.jar destination : <ROOT>/javaLib/build/classes/kotlin/main jvmDefault : disable - jvmTarget : 1.8 moduleName : javaLib + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2221,8 +2212,8 @@ MODULE : MainActivity.javaLib - friendPaths : <ROOT>/javaLib/build/tmp/kapt3/classes/main [-] - friendPaths : <ROOT>/javaLib/build/libs/javaLib.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : javaLib + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2281,7 +2272,7 @@ MODULE : MainActivity.lib GradleModuleModel agpVersion : 4.1.0 gradlePath : :lib - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/lib/build.gradle buildFilePath : <ROOT>/lib/build.gradle rootFolderPath : <ROOT> @@ -2293,8 +2284,9 @@ MODULE : MainActivity.lib - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin - gradlePlugins : org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper @@ -3198,7 +3190,7 @@ MODULE : MainActivity.lib - moduleDependencies : <ROOT>::lib@debug (IdeModuleDependencyImpl) target : <ROOT>::lib@debug (IdeModuleLibraryImpl) buildId : <ROOT> - lintJar : <ROOT>/lib/build/intermediates/library_manifest/debug/AndroidManifest.xml/jars/lint.jar [-] + lintJar : <ROOT>/lib/build/intermediates/lint_publish_jar/global/lint.jar [-] projectPath : :lib sourceSet : MAIN variant : debug @@ -3502,9 +3494,9 @@ MODULE : MainActivity.lib - classpath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar destination : <ROOT>/lib/build/tmp/kotlin-classes/debug jvmDefault : disable - jvmTarget : 1.8 moduleName : lib_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -3568,9 +3560,9 @@ MODULE : MainActivity.lib - friendPaths : <ROOT>/lib/build/intermediates/javac/debug/classes [-] - friendPaths : <ROOT>/lib/build/intermediates/compile_library_classes_jar/debug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : lib_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -3634,9 +3626,9 @@ MODULE : MainActivity.lib - friendPaths : <ROOT>/lib/build/intermediates/javac/debug/classes [-] - friendPaths : <ROOT>/lib/build/intermediates/compile_library_classes_jar/debug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : lib_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none 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 c587fdf2ae2..6eb41a0023d 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 @@ -37,16 +37,6 @@ MODULE : MainActivity type : com.android.build.gradle.tasks.factory.AndroidUnitTest externalSystemId : GRADLE artifactsByConfiguration - _classStructurekaptLocalDebugAndroidTestKotlin : <empty> - _classStructurekaptLocalDebugKotlin : <empty> - _classStructurekaptLocalDebugUnitTestKotlin : <empty> - _classStructurekaptLocalReleaseKotlin : <empty> - _classStructurekaptLocalReleaseUnitTestKotlin : <empty> - _classStructurekaptRemoteDebugAndroidTestKotlin : <empty> - _classStructurekaptRemoteDebugKotlin : <empty> - _classStructurekaptRemoteDebugUnitTestKotlin : <empty> - _classStructurekaptRemoteReleaseKotlin : <empty> - _classStructurekaptRemoteReleaseUnitTestKotlin : <empty> androidApis : <empty> androidTestAnnotationProcessor : <empty> androidTestApi : <empty> @@ -667,8 +657,6 @@ MODULE : MainActivity externalSystemId : GRADLE - artifacts : <ROOT>/javaLib/build/libs/javaLib.jar [-] artifactsByConfiguration - _classStructurekaptKotlin : <empty> - _classStructurekaptTestKotlin : <empty> annotationProcessor : <empty> api : <empty> apiDependenciesMetadata : <empty> @@ -1964,9 +1952,9 @@ MODULE : MainActivity.app - classpath : <ANDROID_SDK>/build-tools/<BUILD_TOOLS_VERSION>/core-lambda-stubs.jar destination : <ROOT>/app/build/tmp/kotlin-classes/localDebug jvmDefault : disable - jvmTarget : 1.8 moduleName : app_localDebug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2026,9 +2014,9 @@ MODULE : MainActivity.app - friendPaths : <ROOT>/app/build/tmp/kapt3/classes/localDebug [-] - friendPaths : <ROOT>/app/build/intermediates/app_classes/localDebug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : app_localDebug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2077,9 +2065,9 @@ MODULE : MainActivity.app - friendPaths : <ROOT>/app/build/tmp/kapt3/classes/localDebug [-] - friendPaths : <ROOT>/app/build/intermediates/app_classes/localDebug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : app_localDebug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2185,8 +2173,8 @@ MODULE : MainActivity.javaLib - classpath : <M2>/org/jetbrains/annotations/13.0/annotations-13.0.jar destination : <ROOT>/javaLib/build/classes/kotlin/main jvmDefault : disable - jvmTarget : 1.8 moduleName : javaLib + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2225,8 +2213,8 @@ MODULE : MainActivity.javaLib - friendPaths : <ROOT>/javaLib/build/tmp/kapt3/classes/main [-] - friendPaths : <ROOT>/javaLib/build/libs/javaLib.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : javaLib + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -3508,9 +3496,9 @@ MODULE : MainActivity.lib - classpath : <ANDROID_SDK>/build-tools/<BUILD_TOOLS_VERSION>/core-lambda-stubs.jar destination : <ROOT>/lib/build/tmp/kotlin-classes/debug jvmDefault : disable - jvmTarget : 1.8 moduleName : lib_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -3575,9 +3563,9 @@ MODULE : MainActivity.lib - friendPaths : <ROOT>/lib/build/intermediates/javac/debug/classes [-] - friendPaths : <ROOT>/lib/build/intermediates/compile_library_classes_jar/debug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : lib_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -3642,9 +3630,9 @@ MODULE : MainActivity.lib - friendPaths : <ROOT>/lib/build/intermediates/javac/debug/classes [-] - friendPaths : <ROOT>/lib/build/intermediates/compile_library_classes_jar/debug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : lib_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none 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_7_1_V1.txt index 8d7176c3f44..cbc73e3c3b1 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_7_1_V1.txt @@ -464,7 +464,7 @@ MODULE : My_First_App.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/firstapp/app/build.gradle buildFilePath : <ROOT>/firstapp/app/build.gradle rootFolderPath : <ROOT>/firstapp @@ -476,8 +476,9 @@ MODULE : My_First_App.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin - gradlePlugins : org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper @@ -1790,9 +1791,9 @@ MODULE : My_First_App.app - classpath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar destination : <ROOT>/firstapp/app/build/tmp/kotlin-classes/debug jvmDefault : disable - jvmTarget : 1.8 moduleName : app_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -1857,9 +1858,9 @@ MODULE : My_First_App.app - friendPaths : <ROOT>/firstapp/app/build/intermediates/javac/debug/classes [-] - friendPaths : <ROOT>/firstapp/app/build/intermediates/app_classes/debug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : app_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -1926,9 +1927,9 @@ MODULE : My_First_App.app - friendPaths : <ROOT>/firstapp/app/build/intermediates/javac/debug/classes [-] - friendPaths : <ROOT>/firstapp/app/build/intermediates/app_classes/debug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : app_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -1970,7 +1971,7 @@ MODULE : My_First_App.app.mysharedlibrary GradleModuleModel agpVersion : 4.1.0 gradlePath : :app:mysharedlibrary - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/shared/mysharedlibrary/build.gradle buildFilePath : <ROOT>/shared/mysharedlibrary/build.gradle rootFolderPath : <ROOT>/firstapp @@ -1982,8 +1983,9 @@ MODULE : My_First_App.app.mysharedlibrary - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin - gradlePlugins : org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper @@ -2775,9 +2777,9 @@ MODULE : My_First_App.app.mysharedlibrary - classpath : <ANDROID_SDK>/platforms/android-<SDK_VERSION>/android.jar destination : <ROOT>/shared/mysharedlibrary/build/tmp/kotlin-classes/debug jvmDefault : disable - jvmTarget : 1.8 moduleName : mysharedlibrary_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2840,9 +2842,9 @@ MODULE : My_First_App.app.mysharedlibrary - friendPaths : <ROOT>/shared/mysharedlibrary/build/intermediates/javac/debug/classes [-] - friendPaths : <ROOT>/shared/mysharedlibrary/build/intermediates/compile_library_classes_jar/debug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : mysharedlibrary_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2907,9 +2909,9 @@ MODULE : My_First_App.app.mysharedlibrary - friendPaths : <ROOT>/shared/mysharedlibrary/build/intermediates/javac/debug/classes [-] - friendPaths : <ROOT>/shared/mysharedlibrary/build/intermediates/compile_library_classes_jar/debug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : mysharedlibrary_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none 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 76708057a30..eda65b98bfb 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 @@ -1790,9 +1790,9 @@ MODULE : My_First_App.app - classpath : <ANDROID_SDK>/build-tools/<BUILD_TOOLS_VERSION>/core-lambda-stubs.jar destination : <ROOT>/firstapp/app/build/tmp/kotlin-classes/debug jvmDefault : disable - jvmTarget : 1.8 moduleName : app_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -1858,9 +1858,9 @@ MODULE : My_First_App.app - friendPaths : <ROOT>/firstapp/app/build/intermediates/javac/debug/classes [-] - friendPaths : <ROOT>/firstapp/app/build/intermediates/app_classes/debug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : app_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -1928,9 +1928,9 @@ MODULE : My_First_App.app - friendPaths : <ROOT>/firstapp/app/build/intermediates/javac/debug/classes [-] - friendPaths : <ROOT>/firstapp/app/build/intermediates/app_classes/debug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : app_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2779,9 +2779,9 @@ MODULE : My_First_App.app.mysharedlibrary - classpath : <ANDROID_SDK>/build-tools/<BUILD_TOOLS_VERSION>/core-lambda-stubs.jar destination : <ROOT>/shared/mysharedlibrary/build/tmp/kotlin-classes/debug jvmDefault : disable - jvmTarget : 1.8 moduleName : mysharedlibrary_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2845,9 +2845,9 @@ MODULE : My_First_App.app.mysharedlibrary - friendPaths : <ROOT>/shared/mysharedlibrary/build/intermediates/javac/debug/classes [-] - friendPaths : <ROOT>/shared/mysharedlibrary/build/intermediates/compile_library_classes_jar/debug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : mysharedlibrary_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none @@ -2913,9 +2913,9 @@ MODULE : My_First_App.app.mysharedlibrary - friendPaths : <ROOT>/shared/mysharedlibrary/build/intermediates/javac/debug/classes [-] - friendPaths : <ROOT>/shared/mysharedlibrary/build/intermediates/compile_library_classes_jar/debug/classes.jar [-] jvmDefault : disable - jvmTarget : 1.8 moduleName : mysharedlibrary_debug noJdk : true + noReflect : true noStdlib : true parallelBackendThreads : 1 serializeIr : none 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_7_1_V1.txt index 6f0ba6d7339..41b5765a2f5 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_7_1_V1.txt @@ -303,7 +303,7 @@ MODULE : project.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -315,8 +315,9 @@ MODULE : project.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions @@ -685,7 +686,7 @@ MODULE : project.library GradleModuleModel agpVersion : 4.1.0 gradlePath : :library - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/library/build.gradle buildFilePath : <ROOT>/library/build.gradle rootFolderPath : <ROOT> @@ -697,8 +698,9 @@ MODULE : project.library - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions @@ -1013,7 +1015,7 @@ MODULE : project.library MODULE : project.library-debug GradleModuleModel gradlePath : :library-debug - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/library-debug/build.gradle buildFilePath : <ROOT>/library-debug/build.gradle rootFolderPath : <ROOT> 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_7_1_V1.txt index 7eae7556d13..7c98bf27e65 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_7_1_V1.txt @@ -659,7 +659,7 @@ MODULE : MultiFlavor.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -671,8 +671,9 @@ MODULE : MultiFlavor.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions 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_7_1_V1.txt index f9b72bdffaa..f32f849461e 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_7_1_V1.txt @@ -332,7 +332,7 @@ MODULE : MultiFlavor.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -344,8 +344,9 @@ MODULE : MultiFlavor.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions 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_7_1_V1.txt index 8db68ef43c9..2f1f682a0b8 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_7_1_V1.txt @@ -432,7 +432,7 @@ MODULE : project.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -444,8 +444,9 @@ MODULE : project.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions @@ -821,7 +822,7 @@ MODULE : project.lib GradleModuleModel agpVersion : 4.1.0 gradlePath : :lib - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/lib/build.gradle buildFilePath : <ROOT>/lib/build.gradle rootFolderPath : <ROOT> @@ -833,8 +834,9 @@ MODULE : project.lib - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions @@ -1158,7 +1160,7 @@ MODULE : project.otherlib GradleModuleModel agpVersion : 4.1.0 gradlePath : :otherlib - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/otherlib/build.gradle buildFilePath : <ROOT>/otherlib/build.gradle rootFolderPath : <ROOT> @@ -1170,8 +1172,9 @@ MODULE : project.otherlib - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions 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_7_1_V1.txt index 4243d9c8c9c..2909db6f37d 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_7_1_V1.txt @@ -152,7 +152,7 @@ MODULE : application.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/application/app/build.gradle buildFilePath : <ROOT>/application/app/build.gradle rootFolderPath : <ROOT>/application @@ -164,8 +164,9 @@ MODULE : application.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions 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_7_1_V1.txt index 2857df01e25..15c209d29fe 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_7_1_V1.txt @@ -240,7 +240,7 @@ MODULE : project.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -252,8 +252,9 @@ MODULE : project.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions @@ -601,7 +602,7 @@ MODULE : project.test GradleModuleModel agpVersion : 4.1.0 gradlePath : :test - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/test/build.gradle buildFilePath : <ROOT>/test/build.gradle rootFolderPath : <ROOT> @@ -613,8 +614,9 @@ MODULE : project.test - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.TestPlugin - gradlePlugins : com.android.build.gradle.TestPlugin CurrentVariantReportedVersions @@ -1481,7 +1483,7 @@ MODULE : project.test2 GradleModuleModel agpVersion : 4.1.0 gradlePath : :test2 - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/test2/build.gradle buildFilePath : <ROOT>/test2/build.gradle rootFolderPath : <ROOT> @@ -1493,8 +1495,9 @@ MODULE : project.test2 - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.TestPlugin - gradlePlugins : com.android.build.gradle.TestPlugin CurrentVariantReportedVersions 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_7_1_V1.txt index a4b5d1a9a51..5c5fb553e7c 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_7_1_V1.txt @@ -1017,6 +1017,7 @@ MODULE : project compile : <empty> compileClasspath : <empty> compileOnly : <empty> + compileOnlyApi : <empty> default : <empty> implementation : <empty> - runtime : <ROOT>/jav/build/libs/jav.jar [-] @@ -2072,7 +2073,7 @@ MODULE : project.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -2084,8 +2085,9 @@ MODULE : project.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions @@ -3918,7 +3920,7 @@ MODULE : project.dyn_feature GradleModuleModel agpVersion : 4.1.0 gradlePath : :dyn_feature - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/dyn_feature/build.gradle buildFilePath : <ROOT>/dyn_feature/build.gradle rootFolderPath : <ROOT> @@ -3930,8 +3932,9 @@ MODULE : project.dyn_feature - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.DynamicFeaturePlugin - gradlePlugins : com.android.build.gradle.DynamicFeaturePlugin CurrentVariantReportedVersions @@ -4237,7 +4240,7 @@ MODULE : project.dyn_feature.unitTest MODULE : project.jav GradleModuleModel gradlePath : :jav - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/jav/build.gradle buildFilePath : <ROOT>/jav/build.gradle rootFolderPath : <ROOT> @@ -4247,8 +4250,9 @@ MODULE : project.jav - gradlePlugins : org.gradle.buildinit.plugins.WrapperPlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : org.gradle.api.plugins.JavaPlugin - gradlePlugins : org.gradle.api.plugins.JavaLibraryPlugin externalProject : :jav (DefaultExternalProject) (*seen*) @@ -4258,7 +4262,7 @@ MODULE : project.lib GradleModuleModel agpVersion : 4.1.0 gradlePath : :lib - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/lib/build.gradle buildFilePath : <ROOT>/lib/build.gradle rootFolderPath : <ROOT> @@ -4270,8 +4274,9 @@ MODULE : project.lib - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions @@ -4960,7 +4965,7 @@ MODULE : project.nested1 GradleModuleModel agpVersion : 4.1.0 gradlePath : :nested1 - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/nested1/build.gradle buildFilePath : <ROOT>/nested1/build.gradle rootFolderPath : <ROOT> @@ -4972,8 +4977,9 @@ MODULE : project.nested1 - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions @@ -5277,7 +5283,7 @@ MODULE : project.nested1.deep GradleModuleModel agpVersion : 4.1.0 gradlePath : :nested1:deep - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/nested1/deep/build.gradle buildFilePath : <ROOT>/nested1/deep/build.gradle rootFolderPath : <ROOT> @@ -5289,8 +5295,9 @@ MODULE : project.nested1.deep - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions @@ -5604,7 +5611,7 @@ MODULE : project.nested2 GradleModuleModel agpVersion : 4.1.0 gradlePath : :nested2 - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/nested2/build.gradle buildFilePath : <ROOT>/nested2/build.gradle rootFolderPath : <ROOT> @@ -5616,8 +5623,9 @@ MODULE : project.nested2 - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions @@ -6053,7 +6061,7 @@ MODULE : project.nested2.deep GradleModuleModel agpVersion : 4.1.0 gradlePath : :nested2:deep - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/nested2/deep/build.gradle buildFilePath : <ROOT>/nested2/deep/build.gradle rootFolderPath : <ROOT> @@ -6065,8 +6073,9 @@ MODULE : project.nested2.deep - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions @@ -6372,7 +6381,7 @@ MODULE : project.nested2.main MODULE : project.nested2.trans GradleModuleModel gradlePath : :nested2:trans - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFilePath : <ROOT>/nested2/trans/build.gradle [-] rootFolderPath : <ROOT> - gradlePlugins : com.android.ide.gradle.model.builder.AndroidStudioToolingPlugin @@ -6384,7 +6393,7 @@ MODULE : project.nested2.trans.deep2 GradleModuleModel agpVersion : 4.1.0 gradlePath : :nested2:trans:deep2 - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/nested2/trans/deep2/build.gradle buildFilePath : <ROOT>/nested2/trans/deep2/build.gradle rootFolderPath : <ROOT> @@ -6396,8 +6405,9 @@ MODULE : project.nested2.trans.deep2 - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions 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_7_1_V1.txt index 5ef6048bcff..f3d581bee41 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_7_1_V1.txt @@ -152,7 +152,7 @@ MODULE : project.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -164,8 +164,9 @@ MODULE : project.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions 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_7_1_V1.txt index 572f964e364..d0f0563caa7 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_7_1_V1.txt @@ -3,7 +3,7 @@ MODULE : project.app GradleModuleModel agpVersion : 4.0.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -15,8 +15,9 @@ MODULE : project.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions @@ -1267,7 +1268,7 @@ MODULE : project.app.unitTest MODULE : project.javalib1 GradleModuleModel gradlePath : :javalib1 - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/javalib1/build.gradle buildFilePath : <ROOT>/javalib1/build.gradle rootFolderPath : <ROOT> @@ -1277,8 +1278,9 @@ MODULE : project.javalib1 - gradlePlugins : org.gradle.buildinit.plugins.WrapperPlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : org.gradle.api.plugins.JavaPlugin - gradlePlugins : org.gradle.api.plugins.JavaLibraryPlugin MODULE : project.javalib1.main @@ -1286,7 +1288,7 @@ MODULE : project.javalib1.test MODULE : project.javalib2 GradleModuleModel gradlePath : :javalib2 - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/javalib2/build.gradle buildFilePath : <ROOT>/javalib2/build.gradle rootFolderPath : <ROOT> @@ -1296,8 +1298,9 @@ MODULE : project.javalib2 - gradlePlugins : org.gradle.buildinit.plugins.WrapperPlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : org.gradle.api.plugins.JavaPlugin - gradlePlugins : org.gradle.api.plugins.JavaLibraryPlugin MODULE : project.javalib2.main @@ -1306,7 +1309,7 @@ MODULE : project.library1 GradleModuleModel agpVersion : 4.0.0 gradlePath : :library1 - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/library1/build.gradle buildFilePath : <ROOT>/library1/build.gradle rootFolderPath : <ROOT> @@ -1318,8 +1321,9 @@ MODULE : project.library1 - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions @@ -2103,7 +2107,7 @@ MODULE : project.library2 GradleModuleModel agpVersion : 4.0.0 gradlePath : :library2 - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/library2/build.gradle buildFilePath : <ROOT>/library2/build.gradle rootFolderPath : <ROOT> @@ -2115,8 +2119,9 @@ MODULE : project.library2 - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions 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_7_1_V1.txt index 9eb6b27ff13..5dda11d8050 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_7_1_V1.txt @@ -236,6 +236,7 @@ MODULE : project compile : <empty> compileClasspath : <empty> compileOnly : <empty> + compileOnlyApi : <empty> default : <empty> implementation : <empty> - runtime : <ROOT>/javalib1/build/libs/javalib1.jar [-] @@ -315,6 +316,7 @@ MODULE : project compile : <empty> compileClasspath : <empty> compileOnly : <empty> + compileOnlyApi : <empty> default : <empty> implementation : <empty> - runtime : <ROOT>/javalib2/build/libs/javalib2.jar [-] @@ -617,7 +619,7 @@ MODULE : project.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -629,8 +631,9 @@ MODULE : project.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions @@ -1930,7 +1933,7 @@ MODULE : project.app.unitTest MODULE : project.javalib1 GradleModuleModel gradlePath : :javalib1 - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/javalib1/build.gradle buildFilePath : <ROOT>/javalib1/build.gradle rootFolderPath : <ROOT> @@ -1940,8 +1943,9 @@ MODULE : project.javalib1 - gradlePlugins : org.gradle.buildinit.plugins.WrapperPlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : org.gradle.api.plugins.JavaPlugin - gradlePlugins : org.gradle.api.plugins.JavaLibraryPlugin externalProject : :javalib1 (DefaultExternalProject) (*seen*) @@ -1950,7 +1954,7 @@ MODULE : project.javalib1.test MODULE : project.javalib2 GradleModuleModel gradlePath : :javalib2 - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/javalib2/build.gradle buildFilePath : <ROOT>/javalib2/build.gradle rootFolderPath : <ROOT> @@ -1960,8 +1964,9 @@ MODULE : project.javalib2 - gradlePlugins : org.gradle.buildinit.plugins.WrapperPlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : org.gradle.api.plugins.JavaPlugin - gradlePlugins : org.gradle.api.plugins.JavaLibraryPlugin externalProject : :javalib2 (DefaultExternalProject) (*seen*) @@ -1971,7 +1976,7 @@ MODULE : project.library1 GradleModuleModel agpVersion : 4.1.0 gradlePath : :library1 - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/library1/build.gradle buildFilePath : <ROOT>/library1/build.gradle rootFolderPath : <ROOT> @@ -1983,8 +1988,9 @@ MODULE : project.library1 - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions @@ -2806,7 +2812,7 @@ MODULE : project.library2 GradleModuleModel agpVersion : 4.1.0 gradlePath : :library2 - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/library2/build.gradle buildFilePath : <ROOT>/library2/build.gradle rootFolderPath : <ROOT> @@ -2818,8 +2824,9 @@ MODULE : project.library2 - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.LibraryPlugin - gradlePlugins : com.android.build.gradle.LibraryPlugin CurrentVariantReportedVersions 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_7_1_V1.txt index c4cfa49fcb0..df45fba0ff2 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_7_1_V1.txt @@ -152,7 +152,7 @@ MODULE : withGradleMetadata.app GradleModuleModel agpVersion : 4.1.0 gradlePath : :app - gradleVersion : 6.5 + gradleVersion : 6.7.1 buildFile : <ROOT>/app/build.gradle buildFilePath : <ROOT>/app/build.gradle rootFolderPath : <ROOT> @@ -164,8 +164,9 @@ MODULE : withGradleMetadata.app - gradlePlugins : com.android.build.gradle.api.AndroidBasePlugin - gradlePlugins : org.gradle.language.base.plugins.LifecycleBasePlugin - gradlePlugins : org.gradle.api.plugins.BasePlugin + - gradlePlugins : org.gradle.api.plugins.JvmEcosystemPlugin - gradlePlugins : org.gradle.api.plugins.ReportingBasePlugin - - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin + - gradlePlugins : org.gradle.api.plugins.JavaBasePlugin$Inject - gradlePlugins : com.android.build.gradle.internal.plugins.AppPlugin - gradlePlugins : com.android.build.gradle.AppPlugin CurrentVariantReportedVersions diff --git a/old-agp-tests/BUILD b/old-agp-tests/BUILD index aa5ac0fb0c8..efae1de3001 100644 --- a/old-agp-tests/BUILD +++ b/old-agp-tests/BUILD @@ -1,7 +1,7 @@ load("//tools/base/bazel:bazel.bzl", "iml_module") load("//tools/base/bazel:maven.bzl", "maven_repository") load("//tools/adt/idea/adt-testutils:old-agp-test.bzl", "old_agp_test") -load(":agp_versions.bzl", "AGP_3_1_4", "AGP_3_3_2", "AGP_3_5", "AGP_4_0", "AGP_4_1", "AGP_4_2", "AGP_7_0", "AGP_7_1", "AGP_7_2", "GRADLE_5_3_1", "GRADLE_5_5", "GRADLE_6_5", "GRADLE_6_7_1", "GRADLE_7_0_2", "GRADLE_7_2", "GRADLE_7_3_3", "GRADLE_LATEST", "local_old_agp_test") +load(":agp_versions.bzl", "AGP_3_1_4", "AGP_3_3_2", "AGP_3_5", "AGP_4_0", "AGP_4_1", "AGP_4_2", "AGP_7_0", "AGP_7_1", "AGP_7_2", "GRADLE_5_3_1", "GRADLE_5_5", "GRADLE_6_7_1", "GRADLE_7_0_2", "GRADLE_7_2", "GRADLE_7_3_3", "GRADLE_LATEST", "local_old_agp_test") # managed by go/iml_to_build iml_module( @@ -37,7 +37,6 @@ iml_module( "//tools/base/build-system:gradle-distrib", "//tools/base/build-system:gradle-distrib-5.3.1", "//tools/base/build-system:gradle-distrib-5.5", - "//tools/base/build-system:gradle-distrib-6.5", "//tools/base/build-system:gradle-distrib-6.7.1", "//tools/base/build-system:gradle-distrib-7.0.2", "//tools/base/build-system:gradle-distrib-7.2", @@ -191,7 +190,7 @@ local_old_agp_test( local_old_agp_test( agp_version = AGP_4_0, - gradle_version = GRADLE_6_5, + gradle_version = GRADLE_6_7_1, shard_count = 3, tags = [ "block-network", @@ -202,7 +201,7 @@ local_old_agp_test( local_old_agp_test( agp_version = AGP_4_1, - gradle_version = GRADLE_6_5, + gradle_version = GRADLE_6_7_1, shard_count = 3, tags = [ "block-network", |