File tree Expand file tree Collapse file tree 5 files changed +24
-12
lines changed
groovy/org/gradle/android Expand file tree Collapse file tree 5 files changed +24
-12
lines changed Original file line number Diff line number Diff line change @@ -6,4 +6,4 @@ org.gradle.kotlin.dsl.allWarningsAsErrors=true
6
6
7
7
systemProp.pts.enabled =true
8
8
9
- org.gradle.android.latestKnownAgpVersion =8.13.0-alpha02
9
+ org.gradle.android.latestKnownAgpVersion =8.13.0-rc01
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ class PluginApplicationTest extends AbstractTest {
11
11
def projectDir = temporaryFolder. newFolder()
12
12
SimpleAndroidApp . builder(projectDir, cacheDir)
13
13
.withAndroidVersion(androidVersion)
14
- .withKotlinVersion(VersionNumber . parse(TestVersions . kotlinVersionCompatibleWithOlderAgp ))
14
+ .withKotlinVersion(VersionNumber . parse(TestVersions . kotlinVersion19 ))
15
15
.build()
16
16
.writeProject()
17
17
Original file line number Diff line number Diff line change @@ -60,16 +60,22 @@ class TestVersions {
60
60
return minorVersions. collect { getLatestVersionForAndroid(it) }
61
61
}
62
62
63
- static String kotlinVersion = " 2.0.21"
64
- // AGP versions <= 7.0 can't use the kotlin-android plugin version 2.0
65
- static String kotlinVersionCompatibleWithOlderAgp = " 1.9.0"
63
+
64
+ static String kotlinVersion22 = " 2.2.0"
65
+ static String kotlinVersion20 = " 2.0.0"
66
+ static String kotlinVersion19 = " 1.9.0"
66
67
67
68
static VersionNumber latestSupportedKotlinVersion () {
68
- // version 7.1.3 or higher should be used with kotlin-android plugin 2
69
- if (latestAndroidVersionForCurrentJDK() <= VersionNumber . parse(" 7.0.4" )) {
70
- return VersionNumber . parse(kotlinVersionCompatibleWithOlderAgp)
69
+ def agp = latestAndroidVersionForCurrentJDK()
70
+ if (agp. compareTo(VersionNumber . parse(" 7.0.4" )) <= 0 ) {
71
+ // AGP ≤ 7.0.4 → Kotlin 1.9.0
72
+ return VersionNumber . parse(kotlinVersion19);
73
+ } else if (agp. compareTo(VersionNumber . parse(" 8.0.2" )) < 0 ) {
74
+ // 7.0.4 < AGP < 8.0.2 → Kotlin 2.0
75
+ return VersionNumber . parse(kotlinVersion20);
71
76
} else {
72
- return VersionNumber . parse(kotlinVersion)
77
+ // AGP ≥ 8.0.2 → Kotlin 2.2.0
78
+ return VersionNumber . parse(kotlinVersion22);
73
79
}
74
80
}
75
81
Original file line number Diff line number Diff line change 190
190
":app:checkKotlinGradlePluginConfigurationErrors" : " SKIPPED" ,
191
191
":library:checkKotlinGradlePluginConfigurationErrors" : " SKIPPED" ,
192
192
":library:checkReleaseAarMetadata" : " SUCCESS" ,
193
- ":library:checkDebugAarMetadata" : " SUCCESS"
193
+ ":library:checkDebugAarMetadata" : " SUCCESS" ,
194
+ ":library:processDebugNavigationResources" : " FROM_CACHE" ,
195
+ ":app:processDebugNavigationResources" : " FROM_CACHE" ,
196
+ ":app:compileDebugNavigationResources" : " FROM_CACHE" ,
197
+ ":library:processReleaseNavigationResources" : " FROM_CACHE" ,
198
+ ":app:processReleaseNavigationResources" : " FROM_CACHE" ,
199
+ ":app:compileReleaseNavigationResources" : " FROM_CACHE"
194
200
}
Original file line number Diff line number Diff line change 1
1
{
2
2
"testedVersions" : {
3
- "8.13.0-alpha02 " : [
3
+ "8.13.0-rc01 " : [
4
4
" 8.14"
5
5
],
6
- "8.12.0-rc01 " : [
6
+ "8.12.0" : [
7
7
" 8.14"
8
8
],
9
9
"8.11.1" : [
You can’t perform that action at this time.
0 commit comments