From 0a3ef84335088feccba395822a66a13b7eb49faa Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Wed, 2 Oct 2024 18:47:24 +0000 Subject: Change compose Compiler. New Soong Exclude_common_Srcs. Default the kotlin compiler to use language-version 1.9, as the kotlin compiler is being upgraded to 2.0.21, but not all of the code yet compiles with 2.0. Test: m Bug: 369137871 Change-Id: I1539860eaa39c858fe6f327a434a2e93f4e05018 --- java/kotlin_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/kotlin_test.go') diff --git a/java/kotlin_test.go b/java/kotlin_test.go index 45eac0134..ad8734d62 100644 --- a/java/kotlin_test.go +++ b/java/kotlin_test.go @@ -501,7 +501,7 @@ func TestKotlinCompose(t *testing.T) { } kotlin_plugin { - name: "androidx.compose.compiler_compiler-hosted-plugin", + name: "kotlin-compose-compiler-plugin", } java_library { @@ -523,7 +523,7 @@ func TestKotlinCompose(t *testing.T) { buildOS := result.Config.BuildOS.String() - composeCompiler := result.ModuleForTests("androidx.compose.compiler_compiler-hosted-plugin", buildOS+"_common").Rule("combineJar").Output + composeCompiler := result.ModuleForTests("kotlin-compose-compiler-plugin", buildOS+"_common").Rule("combineJar").Output withCompose := result.ModuleForTests("withcompose", "android_common") noCompose := result.ModuleForTests("nocompose", "android_common") -- cgit v1.2.3-59-g8ed1b