Skip to content

Commit 28bede4

Browse files
micahjo7Android (Google) Code Review
authored andcommitted
Merge "Remove Kotlin 1.9.20" into studio-main
2 parents 75ef0c1 + d818d22 commit 28bede4

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("//tools/base/bazel:kotlin.bzl", "kotlin_library", "kotlin_test")
22
load("//tools/base/bazel:maven.bzl", "maven_repository")
3-
load("//tools/base/build-system/integration-test:common-dependencies.bzl", "KGP_1_8_10", "KGP_1_9_20")
3+
load("//tools/base/build-system/integration-test:common-dependencies.bzl", "KGP_1_8_10", "KGP_1_9_22")
44
load(":recipes.bzl", "recipe_test")
55

66
kotlin_library(
@@ -47,8 +47,8 @@ kotlin_library(
4747

4848
# for testing against older KGP
4949
maven_repository(
50-
name = "kotlin_1_9_20",
51-
artifacts = KGP_1_9_20,
50+
name = "kotlin_1_9_22",
51+
artifacts = KGP_1_9_22,
5252
visibility = [":__subpackages__"],
5353
)
5454

convert-tool/app/src/test/kotlin/com/google/android/gradle_recipe/converter/context/DefaultContextTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ class DefaultContextTest {
6565
# mapping of AGP versions to Gradle and Kotlin Versions, separated by ';'
6666
8.1;8.0;1.8.10
6767
8.2;8.2;1.8.10
68-
8.3;8.4;1.9.20
69-
8.4;8.6;1.9.20
70-
8.5;8.6;1.9.20
68+
8.3;8.4;1.9.22
69+
8.4;8.6;1.9.22
70+
8.5;8.6;1.9.22
7171
""".trimIndent()
7272
)
7373
}

recipes.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def recipe_test(
5252
"gradle_path": "$(location //tools/base/build-system:gradle-distrib-8.4)",
5353
"manifest_repos": [
5454
"//tools/base/build-system/previous-versions:8.3.1",
55-
":kotlin_1_9_20",
55+
":kotlin_1_9_22",
5656
"//tools/base/build-system:gradle-8.4-runtime-maven",
5757
],
5858
"zip_repos": [],
@@ -67,7 +67,7 @@ def recipe_test(
6767
"gradle_path": "$(location //tools/base/build-system:gradle-distrib)",
6868
"manifest_repos": [
6969
"//tools/base/build-system/integration-test:kotlin_gradle_plugin_prebuilts",
70-
":kotlin_1_9_20",
70+
":kotlin_1_9_22",
7171
"//tools/base/build-system:gradle-runtime-maven",
7272
],
7373
"zip_repos": ["//tools/base/build-system:android_gradle_plugin"],

version_mappings.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# mapping of AGP versions to Gradle and Kotlin Versions, separated by ';'
22
8.1;8.0;1.8.10
33
8.2;8.2;1.8.10
4-
8.3;8.4;1.9.20
5-
8.4;8.6;1.9.20
6-
8.5;8.6;1.9.20
4+
8.3;8.4;1.9.22
5+
8.4;8.6;1.9.22
6+
8.5;8.6;1.9.22

0 commit comments

Comments
 (0)