Skip to content

Commit 968777f

Browse files
[Renovate Bot] Update tested AGP versions (patch) (#1859)
This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [com.android.tools.build:gradle](https://developer.android.com/studio/build) ([source](https://android.googlesource.com/platform/tools/base)) | `8.12.0-rc01` -> `8.12.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.android.tools.build:gradle/8.12.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.android.tools.build:gradle/8.12.0-rc01/8.12.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [com.android.tools.build:gradle](https://developer.android.com/studio/build) ([source](https://android.googlesource.com/platform/tools/base)) | `8.13.0-alpha02` -> `8.13.0-rc01` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.android.tools.build:gradle/8.13.0-rc01?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.android.tools.build:gradle/8.13.0-alpha02/8.13.0-rc01?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS40Ni41IiwidXBkYXRlZEluVmVyIjoiNDEuNzMuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUiXX0=--> --------- Signed-off-by: Renovate Bot for Gradle <[email protected]> Co-authored-by: Iñaki Villar <[email protected]> Co-authored-by: Inaki Villar <[email protected]>
1 parent 9248aa4 commit 968777f

File tree

5 files changed

+24
-12
lines changed

5 files changed

+24
-12
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ org.gradle.kotlin.dsl.allWarningsAsErrors=true
66

77
systemProp.pts.enabled=true
88

9-
org.gradle.android.latestKnownAgpVersion=8.13.0-alpha02
9+
org.gradle.android.latestKnownAgpVersion=8.13.0-rc01

src/test/groovy/org/gradle/android/PluginApplicationTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class PluginApplicationTest extends AbstractTest {
1111
def projectDir = temporaryFolder.newFolder()
1212
SimpleAndroidApp.builder(projectDir, cacheDir)
1313
.withAndroidVersion(androidVersion)
14-
.withKotlinVersion(VersionNumber.parse(TestVersions.kotlinVersionCompatibleWithOlderAgp))
14+
.withKotlinVersion(VersionNumber.parse(TestVersions.kotlinVersion19))
1515
.build()
1616
.writeProject()
1717

src/test/groovy/org/gradle/android/TestVersions.groovy

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,22 @@ class TestVersions {
6060
return minorVersions.collect { getLatestVersionForAndroid(it) }
6161
}
6262

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"
6667

6768
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);
7176
} else {
72-
return VersionNumber.parse(kotlinVersion)
77+
// AGP ≥ 8.0.2 → Kotlin 2.2.0
78+
return VersionNumber.parse(kotlinVersion22);
7379
}
7480
}
7581

src/test/resources/expectedOutcomes/8.13_outcomes.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,5 +190,11 @@
190190
":app:checkKotlinGradlePluginConfigurationErrors" : "SKIPPED",
191191
":library:checkKotlinGradlePluginConfigurationErrors": "SKIPPED",
192192
":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"
194200
}

src/test/resources/versions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"testedVersions": {
3-
"8.13.0-alpha02": [
3+
"8.13.0-rc01": [
44
"8.14"
55
],
6-
"8.12.0-rc01": [
6+
"8.12.0": [
77
"8.14"
88
],
99
"8.11.1": [

0 commit comments

Comments
 (0)