Support multiple stability configuration files [325326744]

Fixed

Bug

Status Update

No update yet.

Description

be...@google.com

created issue #1

Feb 14, 2024 10:11PM

The plugin option is set to allow multiple occurrences, but then we only read one path.

We should either just disable that, or support multiple files.

Comments

be...@google.com <be...@google.com> Feb 14, 2024 10:33PM

Reassigned to be...@google.com.

be...@google.com <be...@google.com> Feb 14, 2024 11:38PM

Accepted by be...@google.com.

ni...@ansman.se <ni...@ansman.se> #2Feb 15, 2024 12:45AM

Ignore this msg

be...@google.com <be...@google.com> #3Feb 15, 2024 02:26AM

Project: platform/frameworks/support
Branch: androidx-main

commit e7b4b06e67951ab47157d06ff314a5c8b2e8fdc6
Author: Andrei Shikov <ashikov@google.com>
Date: Mon Jan 08 15:54:51 2024

Count recursive local declarations as captures

Local declarations were already counted as captures for composable lambdas before, but the traversal ordering missed the recursive captures, converting some of them into singletons.

Test: Compiler test
Fixes: 318745941
Change-Id: I9097d1be71fb67b73e5027f723fd187c4272f6b4

M compose/compiler/compiler-hosted/integration-tests/src/androidUnitTest/kotlin/androidx/compose/compiler/plugins/kotlin/ComposeBytecodeCodegenTest.kt
M compose/compiler/compiler-hosted/integration-tests/src/jvmTest/kotlin/androidx/compose/compiler/plugins/kotlin/AbstractCodegenTest.kt
M compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerLambdaMemoization.kt

https://android-review.googlesource.com/2900890

ap...@google.com <ap...@google.com> #4Feb 19, 2024 09:03PM

Marked as fixed.

Project: platform/frameworks/support
Branch: androidx-main

commit 028a8b04adc10a851b2954455dcce29affa9fb49
Author: Ben Trengrove <bentrengrove@google.com>
Date: Thu Feb 15 09:40:38 2024

Support multiple stability configuration files

Fixes: 325326744
Test: SingleStabilityConfigurationTest & MultipleStabilityConfigurationTest
Relnote: Support multiple stability configuration files
Change-Id: I8db1452cf033d493255ae54d0a708be636a47eea

M compose/compiler/compiler-hosted/integration-tests/src/jvmTest/kotlin/androidx/compose/compiler/plugins/kotlin/StabilityConfigurationParserTests.kt
A compose/compiler/compiler-hosted/integration-tests/src/test/resources/golden/androidx.compose.compiler.plugins.kotlin.MultipleStabilityConfigurationTest/testExternalTypeStable[useFir = false].txt
A compose/compiler/compiler-hosted/integration-tests/src/test/resources/golden/androidx.compose.compiler.plugins.kotlin.MultipleStabilityConfigurationTest/testExternalTypeStable[useFir = true].txt
A compose/compiler/compiler-hosted/integration-tests/src/test/resources/golden/androidx.compose.compiler.plugins.kotlin.SingleStabilityConfigurationTest/testExternalTypeStable[useFir = false].txt
A compose/compiler/compiler-hosted/integration-tests/src/test/resources/golden/androidx.compose.compiler.plugins.kotlin.SingleStabilityConfigurationTest/testExternalTypeStable[useFir = true].txt
A compose/compiler/compiler-hosted/integration-tests/src/test/resources/testStabilityConfigFiles/config1.conf
A compose/compiler/compiler-hosted/integration-tests/src/test/resources/testStabilityConfigFiles/config2.conf
M compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposePlugin.kt
M compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/analysis/StabilityConfigParser.kt
M compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/analysis/StabilityExternalClassNameMatching.kt

https://android-review.googlesource.com/2963746

ub...@gmail.com <ub...@gmail.com> #5Mar 20, 2024 05:53PM

This change seems to have broken behavior when a stability configuration file does not exist. Previously it would ignore this case, now it triggers a build error.

This is relevant when there is a single specification for a module-local stability configuration in a project. Modules could have a stability configuration file at the specified path, or they could have no such file. Now (Compose Compiler 1.5.11) the absence of this file breaks the build.

Only one module in my project has this file, all others do not.

For example:

    kotlinOptions {
        freeCompilerArgs += [
                "-P",
                "plugin:androidx.compose.compiler.plugins.kotlin:stabilityConfigurationPath=" +
                        layout.projectDirectory.file('compose_compiler.conf').asFile.absolutePath
        ]
    }

Error is e: Project/module/compose_compiler.conf (No such file or directory)

pr...@google.com <pr...@google.com> #6Mar 20, 2024 08:26PM

The following release(s) address this bug.It is possible this bug has only been partially addressed:

androidx.compose.compiler:compiler-hosted:1.5.11