From d818d222809c341255da670aaa684ca287dca42a Mon Sep 17 00:00:00 2001
From: Micah Jo <micahjo@google.com>
Date: Fri, 12 Apr 2024 16:09:02 -0700
Subject: [PATCH] Remove Kotlin 1.9.20

Bug: 333777237
Test: n/a
Change-Id: I6bab48e2fd291dcf868d647810e0743961f8f0e2
---
 BUILD                                                       | 6 +++---
 .../gradle_recipe/converter/context/DefaultContextTest.kt   | 6 +++---
 recipes.bzl                                                 | 4 ++--
 version_mappings.txt                                        | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/BUILD b/BUILD
index 1d78d1d5..575b5db4 100644
--- 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/convert-tool/app/src/test/kotlin/com/google/android/gradle_recipe/converter/context/DefaultContextTest.kt b/convert-tool/app/src/test/kotlin/com/google/android/gradle_recipe/converter/context/DefaultContextTest.kt
index 4def43e6..0e0aa9aa 100644
--- a/convert-tool/app/src/test/kotlin/com/google/android/gradle_recipe/converter/context/DefaultContextTest.kt
+++ b/convert-tool/app/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
index affef826..faf3495b 100644
--- 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
index 13e67a5d..5e3d90bf 100644
--- 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