Skip to content

Commit

Permalink
Update to KGP 2.0.0-Beta1 (tools/gradle-recipes)
Browse files Browse the repository at this point in the history
Test: Updated
Bug: 313061502
Change-Id: I3acbc5ffb8705c476a51dbf096795388342a6b9b
  • Loading branch information
hungvietnguyen committed Dec 7, 2023
1 parent 8d7fb1b commit b4fa890
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ val agpToGradleVersions = mapOf(
* Current supported Kotlin plugin, later we add a
* CLI argument to support more versions
*/
const val kotlinPluginVersion = "1.9.20-RC"
const val kotlinPluginVersion = "2.0.0-Beta1"

/**
* The compile SDK version for recipes
Expand Down
6 changes: 3 additions & 3 deletions recipes.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ def recipe_test(
test_scenarios = {
"8.1.0": {
"name": name + "_8_1_0",
"gradle_path": "$(location //tools/base/build-system:gradle-distrib-8.0)",
"gradle_path": "$(location //tools/base/build-system:gradle-distrib-8.1)",
"manifest_repos": ["//tools/base/build-system/previous-versions:8.1.0"],
"zip_repos": [],
"data": [
"//prebuilts/studio/sdk:build-tools/33.0.1",
"//tools/base/build-system:android_platform_for_tests",
"//tools/base/build-system:gradle-distrib-8.0",
"//tools/base/build-system:gradle-distrib-8.1",
],
},
"ToT": {
Expand All @@ -37,7 +37,7 @@ def recipe_test(
"//prebuilts/studio/sdk:build-tools/latest",
"//tools/base/build-system:android_platform_for_tests",
"//tools/base/build-system:gradle-distrib",
"//tools/base/build-system:gradle-distrib-8.0",
"//tools/base/build-system:gradle-distrib-8.1",
"version_mappings.txt",
],
},
Expand Down
5 changes: 4 additions & 1 deletion version_mappings.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# mapping of AGP versions to Gradle Versions, separated by ';'
8.1.0;8.0
# Note: For AGP 8.1, minimum required Gradle version is 8.0, but because of
# https://github.com/gradle/gradle/issues/21436, we need to use Gradle 8.1 to be able to run against
# KGP 2.0+.
8.1.0;8.1
8.2.0-alpha13;8.1

0 comments on commit b4fa890

Please sign in to comment.