Merge "Remove Kotlin 1.9.20" into studio-main

android · Apr 22, 2024 · 28bede4 · 28bede4
2 parents 75ef0c1 + d818d22
commit 28bede4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/BUILD b/BUILD
@@ -1,6 +1,6 @@
 load("//tools/base/bazel:kotlin.bzl", "kotlin_library", "kotlin_test")
 load("//tools/base/bazel:maven.bzl", "maven_repository")
-load("//tools/base/build-system/integration-test:common-dependencies.bzl", "KGP_1_8_10", "KGP_1_9_20")
+load("//tools/base/build-system/integration-test:common-dependencies.bzl", "KGP_1_8_10", "KGP_1_9_22")
 load(":recipes.bzl", "recipe_test")
 
 kotlin_library(
@@ -47,8 +47,8 @@ kotlin_library(
 
 # for testing against older KGP
 maven_repository(
-    name = "kotlin_1_9_20",
-    artifacts = KGP_1_9_20,
+    name = "kotlin_1_9_22",
+    artifacts = KGP_1_9_22,
     visibility = [":__subpackages__"],
 )
 

diff --git a/.../src/test/kotlin/com/google/android/gradle_recipe/converter/context/DefaultContextTest.kt b/.../src/test/kotlin/com/google/android/gradle_recipe/converter/context/DefaultContextTest.kt
@@ -65,9 +65,9 @@ class DefaultContextTest {
                     # mapping of AGP versions to Gradle and Kotlin Versions, separated by ';'
                     8.1;8.0;1.8.10
                     8.2;8.2;1.8.10
-                    8.3;8.4;1.9.20
-                    8.4;8.6;1.9.20
-                    8.5;8.6;1.9.20
+                    8.3;8.4;1.9.22
+                    8.4;8.6;1.9.22
+                    8.5;8.6;1.9.22
                 """.trimIndent()
             )
     }

diff --git a/recipes.bzl b/recipes.bzl
@@ -52,7 +52,7 @@ def recipe_test(
             "gradle_path": "$(location //tools/base/build-system:gradle-distrib-8.4)",
             "manifest_repos": [
                 "//tools/base/build-system/previous-versions:8.3.1",
-                ":kotlin_1_9_20",
+                ":kotlin_1_9_22",
                 "//tools/base/build-system:gradle-8.4-runtime-maven",
             ],
             "zip_repos": [],
@@ -67,7 +67,7 @@ def recipe_test(
             "gradle_path": "$(location //tools/base/build-system:gradle-distrib)",
             "manifest_repos": [
                 "//tools/base/build-system/integration-test:kotlin_gradle_plugin_prebuilts",
-                ":kotlin_1_9_20",
+                ":kotlin_1_9_22",
                 "//tools/base/build-system:gradle-runtime-maven",
             ],
             "zip_repos": ["//tools/base/build-system:android_gradle_plugin"],

diff --git a/version_mappings.txt b/version_mappings.txt
@@ -1,6 +1,6 @@
 # mapping of AGP versions to Gradle and Kotlin Versions, separated by ';'
 8.1;8.0;1.8.10
 8.2;8.2;1.8.10
-8.3;8.4;1.9.20
-8.4;8.6;1.9.20
-8.5;8.6;1.9.20
+8.3;8.4;1.9.22
+8.4;8.6;1.9.22
+8.5;8.6;1.9.22