Skip to content

Commit 46b63d9

Browse files
TapchicomaSpace Team
Tapchicoma
authored and
Space Team
committed
[Gradle] Bump minimal supported AGP version to 8.2.2
^KT-79238 Fixed
1 parent 630dad8 commit 46b63d9

File tree

333 files changed

+88
-1335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+88
-1335
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ junit5 = "5.10.1"
3131
junit-platform = "1.10.0"
3232
okhttp = "4.12.0"
3333
opentest4j = "1.3.0" # should be consistent with the version brought by junit-platform
34-
android-gradle-plugin = "7.3.1"
34+
android-gradle-plugin = "8.2.2"
3535
android-tools = "30.3.1"
3636
gradle-node-plugin = "7.0.2"
3737
commons-text = "1.10.0"

‎gradle/verification-metadata.xml‎

Lines changed: 32 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,10 @@
212212
<sha256 value="c1dca2c683634ee1a294298f9c7179578af6a86e080bdc40f961915bc5c8142f" origin="Generated by Gradle"/>
213213
</artifact>
214214
</component>
215-
<component group="com.android" name="zipflinger" version="7.3.1">
216-
<artifact name="zipflinger-7.3.1.jar">
217-
<md5 value="d6f47341b5289a215f8ea2a622e8c2a0" origin="Generated by Gradle"/>
218-
<sha256 value="accf407c70267cf7eb583ed5aaa1358c2d8fdbdf9c77675010118af6b55c0d5c" origin="Generated by Gradle"/>
215+
<component group="com.android" name="zipflinger" version="8.2.2">
216+
<artifact name="zipflinger-8.2.2.jar">
217+
<md5 value="9a2488c541285ce303db28bac03e45ed" origin="Generated by Gradle"/>
218+
<sha256 value="81dd485618a509a3235929b9eb13091d884452661de6ce5a45cc38b1c555421c" origin="Generated by Gradle"/>
219219
</artifact>
220220
</component>
221221
<component group="com.android" name="zipflinger" version="8.8.1">
@@ -332,10 +332,10 @@
332332
<sha256 value="beca54cf5f21f007dc3293de633b84d215a5f11230eec1b2d57c4202342fec2b" origin="Generated by Gradle"/>
333333
</artifact>
334334
</component>
335-
<component group="com.android.tools.build" name="apksig" version="7.3.1">
336-
<artifact name="apksig-7.3.1.jar">
337-
<md5 value="ee070aca20a38414e78027fb2be23266" origin="Generated by Gradle"/>
338-
<sha256 value="6d6a13a51ac3806c11af5f0967092055e35a67df6a74bff1544d9f5518c5ad55" origin="Generated by Gradle"/>
335+
<component group="com.android.tools.build" name="apksig" version="8.2.2">
336+
<artifact name="apksig-8.2.2.jar">
337+
<md5 value="58a8a61f6cac79554d9db2dff7fe50be" origin="Generated by Gradle"/>
338+
<sha256 value="468ee1852fa12461c6629608fe47be70e50f60be7c4744bb7f62ca48e85c0a6c" origin="Generated by Gradle"/>
339339
</artifact>
340340
</component>
341341
<component group="com.android.tools.build" name="apksig" version="8.8.1">
@@ -344,10 +344,10 @@
344344
<sha256 value="c070ed1394629d74641aa0906f60b2ffa1ee77e6366a1f93437f59717b1aeb89" origin="Generated by Gradle"/>
345345
</artifact>
346346
</component>
347-
<component group="com.android.tools.build" name="apkzlib" version="7.3.1">
348-
<artifact name="apkzlib-7.3.1.jar">
349-
<md5 value="01e8372b9563a0b0870e3121a1f83423" origin="Generated by Gradle"/>
350-
<sha256 value="415c5d5adff68b0ebd700e27c04c150683e65d5731d47fdb018eae391f70768c" origin="Generated by Gradle"/>
347+
<component group="com.android.tools.build" name="apkzlib" version="8.2.2">
348+
<artifact name="apkzlib-8.2.2.jar">
349+
<md5 value="bcf81bd4ead7ce99851fbfe420e91a1f" origin="Generated by Gradle"/>
350+
<sha256 value="1c1a67d6f4f186427ac166ebaa0dd867f595d5144fc925252b05ffb9d1a156b7" origin="Generated by Gradle"/>
351351
</artifact>
352352
</component>
353353
<component group="com.android.tools.build" name="apkzlib" version="8.8.1">
@@ -356,10 +356,10 @@
356356
<sha256 value="1c1a67d6f4f186427ac166ebaa0dd867f595d5144fc925252b05ffb9d1a156b7" origin="Generated by Gradle"/>
357357
</artifact>
358358
</component>
359-
<component group="com.android.tools.build" name="builder" version="7.3.1">
360-
<artifact name="builder-7.3.1.jar">
361-
<md5 value="0e70273d79dd6f4d51efd7d1dd307ee2" origin="Generated by Gradle"/>
362-
<sha256 value="53e55562cb42ff174c49077618ed8f3857b0a9a5e3d4055fdfecb287f65ae4f8" origin="Generated by Gradle"/>
359+
<component group="com.android.tools.build" name="builder" version="8.2.2">
360+
<artifact name="builder-8.2.2.jar">
361+
<md5 value="4d392a9f760bce18cf3f59177d4793c3" origin="Generated by Gradle"/>
362+
<sha256 value="904d118e1b1d88992518bc6329bb2f596016641f5b1d97c9bd93f787ab864c21" origin="Generated by Gradle"/>
363363
</artifact>
364364
</component>
365365
<component group="com.android.tools.build" name="builder" version="8.8.1">
@@ -368,10 +368,10 @@
368368
<sha256 value="c702d45209e754936a3d5fa482519e8e811e01b359e624d207218a2043cd4bb6" origin="Generated by Gradle"/>
369369
</artifact>
370370
</component>
371-
<component group="com.android.tools.build" name="builder-model" version="7.3.1">
372-
<artifact name="builder-model-7.3.1.jar">
373-
<md5 value="a32e84eca86602d5e48150469a8561ba" origin="Generated by Gradle"/>
374-
<sha256 value="9737e0b1873180027f58e9902b2fc832e0ce22d36dd9d78fc93a5ca32b6ca5b1" origin="Generated by Gradle"/>
371+
<component group="com.android.tools.build" name="builder-model" version="8.2.2">
372+
<artifact name="builder-model-8.2.2.jar">
373+
<md5 value="99262433f790ca47c80fe06c8541e0d0" origin="Generated by Gradle"/>
374+
<sha256 value="4a10c9f4ed6fbb576339f8ca7c77867923c7566ef5a2b122f43f3586e5964b4e" origin="Generated by Gradle"/>
375375
</artifact>
376376
</component>
377377
<component group="com.android.tools.build" name="builder-model" version="8.8.1">
@@ -392,10 +392,10 @@
392392
<sha256 value="166855cb81e10f2328a2931006f4801f422d8f4de5d717ec0f7f16fc2049a089" origin="Generated by Gradle"/>
393393
</artifact>
394394
</component>
395-
<component group="com.android.tools.build" name="gradle" version="7.3.1">
396-
<artifact name="gradle-7.3.1.jar">
397-
<md5 value="50c6dc634a46c9b5233d6aac73d72044" origin="Generated by Gradle"/>
398-
<sha256 value="93e03174bf18f41554b7ee767c9080937a5efe5015ec9bdf8cc97550d427f7a5" origin="Generated by Gradle"/>
395+
<component group="com.android.tools.build" name="gradle" version="8.2.2">
396+
<artifact name="gradle-8.2.2.jar">
397+
<md5 value="8c5ee564244a5a9cbc18ce664a4dfa5d" origin="Generated by Gradle"/>
398+
<sha256 value="ca50f47cd13d347de7c89ecb2bd06487b03a88687c46c2b776bc0a9323958955" origin="Generated by Gradle"/>
399399
</artifact>
400400
</component>
401401
<component group="com.android.tools.build" name="gradle" version="8.8.1">
@@ -404,10 +404,10 @@
404404
<sha256 value="b1a04b22cd86b7c8e72ead579b43e0e2f1ea8f666d7aa546c06272ee0c77d411" origin="Generated by Gradle"/>
405405
</artifact>
406406
</component>
407-
<component group="com.android.tools.build" name="gradle-api" version="7.3.1">
408-
<artifact name="gradle-api-7.3.1.jar">
409-
<md5 value="6d17877dc7d76252b6ef54acae78d5b6" origin="Generated by Gradle"/>
410-
<sha256 value="5a661315d1b7addcabfa981caa5ddac0c59b043580ad18886724df162a0a643f" origin="Generated by Gradle"/>
407+
<component group="com.android.tools.build" name="gradle-api" version="8.2.2">
408+
<artifact name="gradle-api-8.2.2.jar">
409+
<md5 value="5c40c5185c62b3494f9fbc453bf2eb90" origin="Generated by Gradle"/>
410+
<sha256 value="15d1fb5e892d0bf03f371271cf67bae95db8e89082d12a8b58165d49f4288643" origin="Generated by Gradle"/>
411411
</artifact>
412412
</component>
413413
<component group="com.android.tools.build" name="gradle-api" version="8.8.1">
@@ -422,10 +422,10 @@
422422
<sha256 value="70b5065989037a1d59377de36a29cfbf16d489881ab391ae1feaffb65f2425ba" origin="Generated by Gradle"/>
423423
</artifact>
424424
</component>
425-
<component group="com.android.tools.build" name="manifest-merger" version="30.3.1">
426-
<artifact name="manifest-merger-30.3.1.jar">
427-
<md5 value="ee93d9fd1a647fe057e6c0f350c815df" origin="Generated by Gradle"/>
428-
<sha256 value="534ac50d45d1bbc80f4122c7fa221402442835029ef05ec056f4edf2776c8c9f" origin="Generated by Gradle"/>
425+
<component group="com.android.tools.build" name="manifest-merger" version="31.2.2">
426+
<artifact name="manifest-merger-31.2.2.jar">
427+
<md5 value="567b23550e782a0b9488123d45a6c6e8" origin="Generated by Gradle"/>
428+
<sha256 value="cf4109b22c159d56b45ad382d550df4fd03694b8b1ddd1378ef1a09ea378a4c0" origin="Generated by Gradle"/>
429429
</artifact>
430430
</component>
431431
<component group="com.android.tools.build" name="manifest-merger" version="31.8.1">
@@ -5434,12 +5434,6 @@
54345434
<sha256 value="0df97574914aee92fd349d0cb4e00f3345d45b2c239e0bb50f0a90ead47888e0" origin="Generated by Gradle"/>
54355435
</artifact>
54365436
</component>
5437-
<component group="org.ow2.asm" name="asm" version="9.1">
5438-
<artifact name="asm-9.1.jar">
5439-
<md5 value="54b9f5d15e4877a4ea4cf9ec48e07afa" origin="Generated by Gradle"/>
5440-
<sha256 value="cda4de455fab48ff0bcb7c48b4639447d4de859a7afc30a094a986f0936beba2" origin="Generated by Gradle"/>
5441-
</artifact>
5442-
</component>
54435437
<component group="org.ow2.asm" name="asm" version="9.2">
54445438
<artifact name="asm-9.2.jar">
54455439
<md5 value="8f184dce9b1bedc675d4a3640d43ddf0" origin="Generated by Gradle"/>

‎libraries/tools/gradle/android-test-fixes/build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ repositories {
1010

1111
dependencies {
1212
commonCompileOnly(gradleKotlinDsl())
13-
commonCompileOnly(libs.android.gradle.plugin.gradle.api) { isTransitive = false }
13+
commonCompileOnly(libs.android.gradle.plugin.gradle.api) {
14+
overrideTargetJvmVersion(11)
15+
isTransitive = false
16+
}
1417
}
1518

1619
gradlePlugin {

‎libraries/tools/gradle/android-test-fixes/src/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ internal fun Project.applyDebugKeystoreFix(
2727
plugins.withId("com.android.test", fix<TestExtension>(testFixesProperties))
2828
}
2929

30-
private inline fun <reified AndroidExtension : CommonExtension<*, *, *, *>> Project.fix(
30+
private inline fun <reified AndroidExtension : CommonExtension<*, *, *, *, *>> Project.fix(
3131
testFixesProperties: TestFixesProperties
3232
): Action<Plugin<*>> = Action {
3333
extensions.configure<AndroidExtension> {

‎libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,18 @@ dependencies {
9292
}
9393

9494
// AGP classes for buildScriptInjection's
95-
testImplementation(libs.android.gradle.plugin.gradle.api) { isTransitive = false }
96-
testImplementation(libs.android.gradle.plugin.gradle) { isTransitive = false }
97-
testImplementation(libs.android.gradle.plugin.builder.model) { isTransitive = false }
95+
testImplementation(libs.android.gradle.plugin.gradle.api) {
96+
overrideTargetJvmVersion(11)
97+
isTransitive = false
98+
}
99+
testImplementation(libs.android.gradle.plugin.gradle) {
100+
overrideTargetJvmVersion(11)
101+
isTransitive = false
102+
}
103+
testImplementation(libs.android.gradle.plugin.builder.model) {
104+
overrideTargetJvmVersion(11)
105+
isTransitive = false
106+
}
98107

99108
testImplementation(project(path = ":examples:annotation-processor-example"))
100109
testImplementation(kotlinStdlib("jdk8"))

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ComposeIT.kt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@ class ComposeIT : KGPBaseTest() {
108108

109109
buildAndFail("assembleDebug") {
110110
when (agpVersion) {
111-
TestVersions.AgpCompatibilityMatrix.AGP_73.version,
112-
TestVersions.AgpCompatibilityMatrix.AGP_74.version,
113-
TestVersions.AgpCompatibilityMatrix.AGP_80.version,
114-
TestVersions.AgpCompatibilityMatrix.AGP_81.version,
115111
TestVersions.AgpCompatibilityMatrix.AGP_82.version,
116112
TestVersions.AgpCompatibilityMatrix.AGP_83.version,
117113
TestVersions.AgpCompatibilityMatrix.AGP_84.version,
@@ -191,7 +187,6 @@ class ComposeIT : KGPBaseTest() {
191187
@DisplayName("Should work with JB Compose plugin")
192188
@AndroidGradlePluginTests
193189
@GradleAndroidTest
194-
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_80)
195190
@TestMetadata("JBComposeApp")
196191
fun testJBCompose(
197192
gradleVersion: GradleVersion,
@@ -235,7 +230,6 @@ class ComposeIT : KGPBaseTest() {
235230
@DisplayName("Should not suggest apply Kotlin compose plugin in JB Compose plugin")
236231
@AndroidGradlePluginTests
237232
@GradleAndroidTest
238-
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_80)
239233
@TestMetadata("JBComposeApp")
240234
fun testAndroidJBComposeNoSuggestion(
241235
gradleVersion: GradleVersion,

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,6 @@ import kotlin.io.path.appendText
1616
@DisplayName("android with kapt3 external dependencies tests")
1717
@AndroidGradlePluginTests
1818
open class Kapt3AndroidExternalIT : Kapt3BaseIT() {
19-
// Deprecated and doesn't work with Gradle 8 + AGP 8, so keeping max Gradle version as 7.6
20-
// For example: https://github.com/JakeWharton/butterknife/issues/1686
21-
@DisplayName("kapt works with butterknife")
22-
@GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
23-
@AndroidTestVersions(maxVersion = TestVersions.AGP.AGP_74)
24-
@GradleAndroidTest
25-
fun testButterKnife(
26-
gradleVersion: GradleVersion,
27-
agpVersion: String,
28-
jdkVersion: JdkVersions.ProvidedJdk,
29-
) {
30-
project(
31-
"android-butterknife".withPrefix,
32-
gradleVersion,
33-
buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion),
34-
buildJdk = jdkVersion.location
35-
) {
36-
build("assembleDebug") {
37-
assertKaptSuccessful()
38-
assertFileInProjectExists("app/build/generated/source/kapt/debug/org/example/kotlin/butterknife/SimpleActivity\$\$ViewBinder.java")
39-
40-
val butterknifeJavaClassesDir = "app/build/intermediates/javac/debug/classes/org/example/kotlin/butterknife/"
41-
assertFileInProjectExists(butterknifeJavaClassesDir + "SimpleActivity\$\$ViewBinder.class")
42-
43-
assertFileInProjectExists("app/build/tmp/kotlin-classes/debug/org/example/kotlin/butterknife/SimpleAdapter\$ViewHolder.class")
44-
}
45-
46-
build("assembleDebug") {
47-
assertTasksUpToDate(":app:compileDebugKotlin", ":app:compileDebugJavaWithJavac")
48-
}
49-
}
50-
}
5119

5220
@DisplayName("kapt works with dagger")
5321
@GradleAndroidTest
@@ -112,11 +80,7 @@ open class Kapt3AndroidExternalIT : Kapt3BaseIT() {
11280
agpVersion: String,
11381
jdkVersion: JdkVersions.ProvidedJdk,
11482
) {
115-
val realmVersion = if (agpVersion != TestVersions.AGP.AGP_73) {
116-
"10.19.0"
117-
} else {
118-
"10.11.0"
119-
}
83+
val realmVersion = "10.19.0"
12084
project(
12185
"android-realm".withPrefix,
12286
gradleVersion,

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,6 @@ class KotlinAndroidMppIT : KGPBaseTest() {
10701070

10711071
@DisplayName("KT-70380: KMM App failed to consume android binary lib when published incorrectly")
10721072
@GradleAndroidTest
1073-
@AndroidTestVersions(additionalVersions = [TestVersions.AGP.AGP_81])
10741073
@GradleTestVersions(additionalVersions = [TestVersions.Gradle.G_8_1, TestVersions.Gradle.G_8_2, TestVersions.Gradle.G_8_3])
10751074
fun kotlinAndroidHasBuildTypeAttribute(
10761075
gradleVersion: GradleVersion,
@@ -1092,12 +1091,7 @@ class KotlinAndroidMppIT : KGPBaseTest() {
10921091
}
10931092

10941093
build("publish") {
1095-
if (agpVersion == TestVersions.AGP.AGP_73) {
1096-
// AGP 7.3 configures Publication automatically, so no diagnostic should be reported
1097-
assertNoDiagnostic(KotlinToolingDiagnostics.AndroidPublicationNotConfigured)
1098-
} else {
1099-
assertHasDiagnostic(KotlinToolingDiagnostics.AndroidPublicationNotConfigured)
1100-
}
1094+
assertHasDiagnostic(KotlinToolingDiagnostics.AndroidPublicationNotConfigured)
11011095
}
11021096
}
11031097
}

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesConsumptionIT.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ import org.junit.jupiter.api.DisplayName
2323
class MultiplatformResourcesConsumptionIT : KGPBaseTest() {
2424

2525
@DisplayName("Resolve resources with consumption API using variant reselection")
26-
// Before 7.6 Gradle fails to resolve project dependencies with variant reselection
27-
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_74)
2826
@GradleAndroidTest
2927
fun testWithVariantReselection(
3028
gradleVersion: GradleVersion,

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ interface TestVersions {
5353
}
5454

5555
object AGP {
56-
const val AGP_73 = "7.3.1"
57-
const val AGP_74 = "7.4.2"
58-
const val AGP_80 = "8.0.2"
59-
const val AGP_81 = "8.1.4"
6056
const val AGP_82 = "8.2.2"
6157
const val AGP_83 = "8.3.2"
6258
const val AGP_84 = "8.4.0"
@@ -69,7 +65,7 @@ interface TestVersions {
6965
const val AGP_811 = "8.11.1" // Remove suppressAgpWarningSinceGradle814 once AGP 8.12 is default
7066

7167
// Should be in sync with KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck
72-
const val MIN_SUPPORTED = AGP_73 // AgpCompatibilityCheck.minimalSupportedAgpVersion
68+
const val MIN_SUPPORTED = AGP_82 // AgpCompatibilityCheck.minimalSupportedAgpVersion
7369
const val MAX_SUPPORTED = AGP_811 // Update once the Gradle MAX_SUPPORTED version is bumped
7470
}
7571

@@ -79,10 +75,6 @@ interface TestVersions {
7975
val maxSupportedGradleVersion: GradleVersion,
8076
val requiredJdkVersion: JavaVersion,
8177
) {
82-
AGP_73(AGP.AGP_73, GradleVersion.version(Gradle.G_7_6), GradleVersion.version(Gradle.G_7_6), JavaVersion.VERSION_11),
83-
AGP_74(AGP.AGP_74, GradleVersion.version(Gradle.G_7_6), GradleVersion.version(Gradle.G_7_6), JavaVersion.VERSION_11),
84-
AGP_80(AGP.AGP_80, GradleVersion.version(Gradle.G_8_0), GradleVersion.version(Gradle.G_8_0), JavaVersion.VERSION_17),
85-
AGP_81(AGP.AGP_81, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17),
8678
AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_2), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17),
8779
AGP_83(AGP.AGP_83, GradleVersion.version(Gradle.G_8_4), GradleVersion.version(Gradle.G_8_8), JavaVersion.VERSION_17),
8880
AGP_84(AGP.AGP_84, GradleVersion.version(Gradle.G_8_6), GradleVersion.version(Gradle.G_8_8), JavaVersion.VERSION_17),

0 commit comments

Comments
 (0)