From 7c563d8484b84ca958bbc513b699a69f34dda6f8 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Thu, 20 Jul 2023 10:01:11 +0200
Subject: [PATCH] [Gradle] Update AGP 8.2 version in tests

ExternalAndroidTargetIT: Update to AGP 8.2.0-alpha13

^KT-56178 In Progress
---
 .../kotlin/gradle/android/ExternalAndroidTargetIT.kt       | 7 -------
 .../org/jetbrains/kotlin/gradle/testbase/TestVersions.kt   | 2 +-
 .../externalAndroidTarget-simple/build.gradle.kts          | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt
index e48bd3fb5b3..0c5e84bdb2c 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt
@@ -75,15 +75,8 @@ class ExternalAndroidTargetIT : KGPBaseTest() {
                     dependsOnDependency(":/commonTest"),
                     binaryCoordinates("junit:junit:4.13.2"),
                     binaryCoordinates("org.hamcrest:hamcrest-core:1.3"),
-
-                    /*
-                    Actually the idiomatic expectation would be two friendSourceDependencies being sent instead of the
-                    projectArtifactDependency below.
-
                     friendSourceDependency(":/commonMain"),
                     friendSourceDependency(":/androidMain"),
-                     */
-                    projectArtifactDependency(Regular, ":", FilePathRegex(".*/androidMain/full.jar"))
                 )
             }
         }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
index 4274aa712c6..c5eb150c672 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
@@ -48,7 +48,7 @@ interface TestVersions {
         const val AGP_74 = "7.4.2"
         const val AGP_80 = "8.0.2"
         const val AGP_81 = "8.1.0-rc01"
-        const val AGP_82 = "8.2.0-alpha09" // -alpha10 fails ExternalAndroidTargetIT test
+        const val AGP_82 = "8.2.0-alpha13"
 
         const val MIN_SUPPORTED = AGP_42 // KotlinAndroidPlugin.minimalSupportedAgpVersion
         const val MAX_SUPPORTED = AGP_81 // Update once Gradle MAX_SUPPORTED version will be bumped
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/externalAndroidTarget-simple/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/externalAndroidTarget-simple/build.gradle.kts
index 0ea3be71c98..aaf36e47d72 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/externalAndroidTarget-simple/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/externalAndroidTarget-simple/build.gradle.kts
@@ -13,7 +13,7 @@ kotlin {
     linuxX64()
     linuxArm64()
 
-    androidExperimental {
+    androidLibrary {
         compileSdk = 33
         namespace = "org.jetbrains.sample"