Skip to content

Commit b4fa890

Browse files
Update to KGP 2.0.0-Beta1 (tools/gradle-recipes)
Test: Updated Bug: 313061502 Change-Id: I3acbc5ffb8705c476a51dbf096795388342a6b9b
1 parent 8d7fb1b commit b4fa890

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

convert-tool/app/src/main/kotlin/com/google/android/gradle_recipe/converter/converters/RecipeConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ val agpToGradleVersions = mapOf(
4242
* Current supported Kotlin plugin, later we add a
4343
* CLI argument to support more versions
4444
*/
45-
const val kotlinPluginVersion = "1.9.20-RC"
45+
const val kotlinPluginVersion = "2.0.0-Beta1"
4646

4747
/**
4848
* The compile SDK version for recipes

recipes.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ def recipe_test(
1818
test_scenarios = {
1919
"8.1.0": {
2020
"name": name + "_8_1_0",
21-
"gradle_path": "$(location //tools/base/build-system:gradle-distrib-8.0)",
21+
"gradle_path": "$(location //tools/base/build-system:gradle-distrib-8.1)",
2222
"manifest_repos": ["//tools/base/build-system/previous-versions:8.1.0"],
2323
"zip_repos": [],
2424
"data": [
2525
"//prebuilts/studio/sdk:build-tools/33.0.1",
2626
"//tools/base/build-system:android_platform_for_tests",
27-
"//tools/base/build-system:gradle-distrib-8.0",
27+
"//tools/base/build-system:gradle-distrib-8.1",
2828
],
2929
},
3030
"ToT": {
@@ -37,7 +37,7 @@ def recipe_test(
3737
"//prebuilts/studio/sdk:build-tools/latest",
3838
"//tools/base/build-system:android_platform_for_tests",
3939
"//tools/base/build-system:gradle-distrib",
40-
"//tools/base/build-system:gradle-distrib-8.0",
40+
"//tools/base/build-system:gradle-distrib-8.1",
4141
"version_mappings.txt",
4242
],
4343
},

version_mappings.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
# mapping of AGP versions to Gradle Versions, separated by ';'
2-
8.1.0;8.0
2+
# Note: For AGP 8.1, minimum required Gradle version is 8.0, but because of
3+
# https://github.com/gradle/gradle/issues/21436, we need to use Gradle 8.1 to be able to run against
4+
# KGP 2.0+.
5+
8.1.0;8.1
36
8.2.0-alpha13;8.1

0 commit comments

Comments
 (0)