Skip to content

Commit e3e9ddc

Browse files
MatkovIvanMatkovIvan
committed
Merge commit '7a145e052ae61e272e91ffe285e9451b8ab71870' into integration
# Conflicts: # annotation/annotation/build.gradle # buildSrc/OWNERS # buildSrc/lint.xml # buildSrc/private/src/main/kotlin/androidx/build/AndroidXComposeImplPlugin.kt # buildSrc/private/src/main/kotlin/androidx/build/AndroidXComposeLintIssues.kt # buildSrc/private/src/main/kotlin/androidx/build/AndroidXGradleProperties.kt # buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt # buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt # buildSrc/private/src/main/kotlin/androidx/build/AndroidXPlaygroundRootImplPlugin.kt # buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt # buildSrc/private/src/main/kotlin/androidx/build/BenchmarkConfiguration.kt # buildSrc/private/src/main/kotlin/androidx/build/ErrorProneConfiguration.kt # buildSrc/private/src/main/kotlin/androidx/build/FtlRunner.kt # buildSrc/private/src/main/kotlin/androidx/build/LibraryVersionsService.kt # buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt # buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt # buildSrc/private/src/main/kotlin/androidx/build/MaxDepVersions.kt # buildSrc/private/src/main/kotlin/androidx/build/ProjectParser.kt # buildSrc/private/src/main/kotlin/androidx/build/VerifyDependencyVersionsTask.kt # buildSrc/private/src/main/kotlin/androidx/build/buildInfo/CreateLibraryBuildInfoFileTask.kt # buildSrc/private/src/main/kotlin/androidx/build/clang/ClangArchiveTask.kt # buildSrc/private/src/main/kotlin/androidx/build/clang/ClangCompileTask.kt # buildSrc/private/src/main/kotlin/androidx/build/clang/ClangSharedLibraryTask.kt # buildSrc/private/src/main/kotlin/androidx/build/clang/NativeLibraryBundler.kt # buildSrc/private/src/main/kotlin/androidx/build/dependencyTracker/AffectedModuleDetector.kt # buildSrc/private/src/main/kotlin/androidx/build/docs/AndroidXDocsImplPlugin.kt # buildSrc/private/src/main/kotlin/androidx/build/docs/CheckTipOfTreeDocsTask.kt # buildSrc/private/src/main/kotlin/androidx/build/gitclient/GitClient.kt # buildSrc/private/src/main/kotlin/androidx/build/metalava/GenerateApiLevels.kt # buildSrc/private/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt # buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt # buildSrc/private/src/main/kotlin/androidx/build/testConfiguration/AppApksTestConfigurationHelper.kt # buildSrc/private/src/main/kotlin/androidx/build/testConfiguration/CopyApksFromOutputProviderTask.kt # buildSrc/private/src/main/kotlin/androidx/build/testConfiguration/GenerateMediaTestConfigurationTask.kt # buildSrc/private/src/main/kotlin/androidx/build/testConfiguration/OwnersService.kt # buildSrc/private/src/main/kotlin/androidx/build/testConfiguration/TestSuiteConfiguration.kt # buildSrc/public/src/main/kotlin/androidx/build/AndroidXExtension.kt # buildSrc/public/src/main/kotlin/androidx/build/ApkCopyHelper.kt # buildSrc/public/src/main/kotlin/androidx/build/SoftwareType.kt # buildSrc/settingsScripts/project-dependency-graph.groovy # collection/collection/build.gradle # compose/animation/animation-core-lint/build.gradle # compose/animation/animation-core/benchmark/build.gradle # compose/animation/animation-core/build.gradle # compose/animation/animation-core/samples/build.gradle # compose/animation/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/InternalMutatorMutex.kt # compose/animation/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/internal/PlatformOptimizedCancellationException.kt # compose/animation/animation-core/src/commonStubsMain/kotlin/androidx/compose/animation/core/InternalMutatorMutex.commonStubs.kt # compose/animation/animation-core/src/jvmMain/kotlin/androidx/compose/animation/core/InternalMotatorMutex.jvm.kt # compose/animation/animation-core/src/jvmMain/kotlin/androidx/compose/animation/core/internal/PlatformOptimizedCancellationException.jvm.kt # compose/animation/animation-graphics/build.gradle # compose/animation/animation-graphics/samples/build.gradle # compose/animation/animation-lint/build.gradle # compose/animation/animation-tooling-internal/build.gradle # compose/animation/animation/build.gradle # compose/animation/animation/samples/build.gradle # compose/benchmark-utils/benchmark/build.gradle # compose/benchmark-utils/build.gradle # compose/foundation/foundation-layout/benchmark/build.gradle # compose/foundation/foundation-layout/build.gradle # compose/foundation/foundation-layout/samples/build.gradle # compose/foundation/foundation-lint/build.gradle # compose/foundation/foundation/benchmark/build.gradle # compose/foundation/foundation/build.gradle # compose/foundation/foundation/samples/build.gradle # compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/text/contextmenu/data/TextContextMenuData.android.kt # compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/MutatorMutex.kt # compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/AnchoredDraggable.kt # compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Scrollable.kt # compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/internal/ClipboardUtils.kt # compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyList.kt # compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt # compose/foundation/foundation/src/commonStubsMain/kotlin/androidx/compose/foundation/MutatorMutex.commonStubs.kt # compose/foundation/foundation/src/commonStubsMain/kotlin/androidx/compose/foundation/gestures/AnchoredDraggable.commonStubs.kt # compose/foundation/foundation/src/commonStubsMain/kotlin/androidx/compose/foundation/gestures/Scrollable.commonStubs.kt # compose/foundation/foundation/src/commonStubsMain/kotlin/androidx/compose/foundation/internal/PlatformOptimizedCancellationException.commonStubs.kt # compose/foundation/foundation/src/commonStubsMain/kotlin/androidx/compose/foundation/text/contextmenu/data/TextContextMenuData.commonStubs.kt # compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/lazy/LazyList.commonStubs.kt # compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/text/KeyEventHelpers.desktop.kt # compose/foundation/foundation/src/jsNativeMain/kotlin/androidx/compose/foundation/ActualJsNative.jsNative.kt # compose/foundation/foundation/src/jvmMain/kotlin/androidx/compose/foundation/gestures/AnchoredDraggable.jvm.kt # compose/foundation/foundation/src/jvmMain/kotlin/androidx/compose/foundation/internal/PlatformOptimizedCancellationException.jvm.kt # compose/foundation/foundation/src/macosMain/kotlin/androidx/compose/foundation/internal/ClipboardUtils.macos.kt # compose/foundation/foundation/src/macosMain/kotlin/androidx/compose/foundation/text/TouchMode.macos.kt # compose/foundation/foundation/src/skikoMain/kotlin/androidx/compose/foundation/gestures/TapGestureDetector.skiko.kt # compose/foundation/foundation/src/skikoMain/kotlin/androidx/compose/foundation/text/TextPointerIcon.skiko.kt # compose/integration-tests/docs-snippets/build.gradle # compose/integration-tests/hero/hero-common/hero-common-implementation/build.gradle # compose/integration-tests/hero/jetsnack/jetsnack-microbenchmark/build.gradle # compose/integration-tests/hero/pokedex/pokedex-macrobenchmark/src/main/java/androidx/compose/integration/hero/pokedex/macrobenchmark/PokedexConstants.kt # compose/integration-tests/material-catalog/build.gradle # compose/lint/common-test/build.gradle # compose/lint/internal-lint-checks/build.gradle # compose/material/material-lint/build.gradle # compose/material/material-navigation/build.gradle # compose/material/material-navigation/samples/build.gradle # compose/material/material-ripple/benchmark/build.gradle # compose/material/material-ripple/build.gradle # compose/material/material/api/current.ignore # compose/material/material/api/restricted_current.ignore # compose/material/material/benchmark/build.gradle # compose/material/material/build.gradle # compose/material/material/icons/generator/build.gradle # compose/material/material/integration-tests/material-catalog/build.gradle # compose/material/material/integration-tests/material-demos/build.gradle # compose/material/material/samples/build.gradle # compose/material/material/src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt # compose/material/material/src/commonMain/kotlin/androidx/compose/material/ExposedDropdownMenu.kt # compose/material/material/src/commonMain/kotlin/androidx/compose/material/internal/PlatformOptimizedCancellationException.commonStubs.kt # compose/material/material/src/commonMain/kotlin/androidx/compose/material/internal/PlatformOptimizedCancellationException.kt # compose/material/material/src/commonStubsMain/kotlin/androidx/compose/material/AnchoredDraggable.commonStubs.kt # compose/material/material/src/commonStubsMain/kotlin/androidx/compose/material/InteractiveComponentSize.commonStubs.kt # compose/material/material/src/jsNativeMain/kotlin/androidx/compose/material/internal/PlatformOptimizedCancellationException.jsNative.kt # compose/material/material/src/jvmMain/kotlin/androidx/compose/material/AnchoredDraggable.jvm.kt # compose/material/material/src/jvmMain/kotlin/androidx/compose/material/InteractiveComponentSize.jvm.kt # compose/material/material/src/jvmMain/kotlin/androidx/compose/material/internal/IdentityHashCode.jvm.kt # compose/material/material/src/jvmMain/kotlin/androidx/compose/material/internal/PlatformOptimizedCancellationException.jvm.kt # compose/material3/adaptive/adaptive-layout/build.gradle # compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/internal/IdentityHashCode.kt # compose/material3/adaptive/adaptive-layout/src/jvmMain/kotlin/androidx/compose/material3/adaptive/layout/internal/IdentityHashCode.jvm.kt # compose/material3/adaptive/adaptive-layout/src/jvmMain/kotlin/androidx/compose/material3/adaptive/layout/internal/System.jvm.kt # compose/material3/adaptive/adaptive-layout/src/skikoMain/kotlin/androidx/compose/material3/adaptive/layout/Strings.skiko.kt # compose/material3/adaptive/adaptive-navigation/build.gradle # compose/material3/adaptive/adaptive/build.gradle # compose/material3/adaptive/benchmark/build.gradle # compose/material3/adaptive/samples/build.gradle # compose/material3/benchmark/build.gradle # compose/material3/material3-adaptive-navigation-suite/build.gradle # compose/material3/material3-adaptive-navigation-suite/samples/build.gradle # compose/material3/material3-common/build.gradle # compose/material3/material3-common/samples/build.gradle # compose/material3/material3-common/src/commonStubsMain/kotlin/androidx/compose/material3/common/InteractiveComponentSize.commonStubs.kt # compose/material3/material3-common/src/jvmMain/kotlin/androidx/compose/material3/common/InteractiveComponentSize.jvm.kt # compose/material3/material3-common/src/jvmMain/kotlin/androidx/compose/material3/common/internal/System.jvm.kt # compose/material3/material3-lint/build.gradle # compose/material3/material3-window-size-class/build.gradle # compose/material3/material3-window-size-class/samples/build.gradle # compose/material3/material3-window-size-class/src/nonJvmMain/kotlin/androidx/compose/material3/windowsizeclass/PlatformOptimizedCancellationException.commonStubs.kt # compose/material3/material3/build.gradle # compose/material3/material3/integration-tests/material3-catalog/build.gradle # compose/material3/material3/integration-tests/material3-demos/build.gradle # compose/material3/material3/samples/build.gradle # compose/material3/material3/src/androidMain/kotlin/androidx/compose/material3/InteractiveComponentSize.android.kt # compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/DateInput.kt # compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Slider.kt # compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/internal/AnchoredDraggable.kt # compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/internal/PlatformOptimizedCancellationException.kt # compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/internal/Strings.kt # compose/material3/material3/src/commonStubsMain/kotlin/androidx/compose/material3/InteractiveComponentSize.commonStubs.kt # compose/material3/material3/src/commonStubsMain/kotlin/androidx/compose/material3/internal/Strings.commonStubs.kt # compose/material3/material3/src/jsNativeMain/kotlin/androidx/compose/material3/internal/PlatformOptimizedCancellationException.jsNative.kt # compose/material3/material3/src/jvmMain/kotlin/androidx/compose/material3/internal/PlatformOptimizedCancellationException.jvm.kt # compose/material3/material3/src/jvmMain/kotlin/androidx/compose/material3/internal/System.jvm.kt # compose/material3/material3/src/skikoMain/kotlin/androidx/compose/material3/Menu.skiko.kt # compose/material3/material3/src/skikoMain/kotlin/androidx/compose/material3/internal/CalendarModel.skiko.kt # compose/material3/material3/src/skikoMain/kotlin/androidx/compose/material3/internal/PlatformOptimizedCancellationException.commonStubs.kt # compose/material3/material3/src/skikoMain/kotlin/androidx/compose/material3/internal/System.commonStubs.kt # compose/mpp/demo/src/webMain/kotlin/androidx/compose/mpp/demo/PlatformOptimizedCancellationException.commonStubs.kt # compose/mpp/demo/src/webMain/kotlin/androidx/compose/mpp/demo/System.commonStubs.kt # compose/runtime/runtime-lint/build.gradle # compose/runtime/runtime-livedata/build.gradle # compose/runtime/runtime-livedata/samples/build.gradle # compose/runtime/runtime-rxjava2/build.gradle # compose/runtime/runtime-rxjava2/samples/build.gradle # compose/runtime/runtime-rxjava3/build.gradle # compose/runtime/runtime-rxjava3/samples/build.gradle # compose/runtime/runtime-saveable-lint/build.gradle # compose/runtime/runtime-saveable/build.gradle # compose/runtime/runtime-saveable/samples/build.gradle # compose/runtime/runtime-test-utils/build.gradle # compose/runtime/runtime-test-utils/src/nonJvmMain/kotlin/androidx/compose/runtime/mock/SynchronizedObject.nonJvm.kt # compose/runtime/runtime-tracing/build.gradle # compose/runtime/runtime/build.gradle # compose/runtime/runtime/compose-runtime-benchmark/build.gradle # compose/runtime/runtime/samples/build.gradle # compose/runtime/runtime/src/jvmMain/kotlin/androidx/compose/runtime/OldSynchronization.jvm.kt # compose/runtime/runtime/src/jvmMain/kotlin/androidx/compose/runtime/tooling/DiagnosticComposeException.jvm.kt # compose/runtime/runtime/src/nonJvmMain/kotlin/androidx/compose/runtime/internal/PlatformOptimizedCancellationException.linuxx64Stubs.kt # compose/runtime/runtime/src/nonJvmMain/kotlin/androidx/compose/runtime/internal/System.linuxx64Stubs.kt # compose/runtime/runtime/src/nonJvmMain/kotlin/androidx/compose/runtime/internal/Utils.nonJvm.kt # compose/test-utils/build.gradle # compose/ui/ui-android-stubs/build.gradle # compose/ui/ui-geometry/build.gradle # compose/ui/ui-graphics-lint/build.gradle # compose/ui/ui-graphics/benchmark/build.gradle # compose/ui/ui-graphics/build.gradle # compose/ui/ui-graphics/samples/build.gradle # compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/IntervalTree.kt # compose/ui/ui-inspection/build.gradle # compose/ui/ui-lint/build.gradle # compose/ui/ui-test-junit4/build.gradle # compose/ui/ui-test-manifest-lint/build.gradle # compose/ui/ui-test-manifest/build.gradle # compose/ui/ui-test/build.gradle # compose/ui/ui-test/samples/build.gradle # compose/ui/ui-test/src/androidMain/kotlin/androidx/compose/ui/test/Expect.android.kt # compose/ui/ui-test/src/commonMain/kotlin/androidx/compose/ui/test/TextActions.kt # compose/ui/ui-test/src/commonMain/kotlin/androidx/compose/ui/test/UncaughtExceptionHandler.kt # compose/ui/ui-test/src/commonStubsMain/kotlin/androidx/compose/ui/test/ComposeUiTest.commonStubs.kt # compose/ui/ui-test/src/commonStubsMain/kotlin/androidx/compose/ui/test/Expect.commonStubs.kt # compose/ui/ui-test/src/commonStubsMain/kotlin/androidx/compose/ui/test/TextActions.commonStubs.kt # compose/ui/ui-test/src/commonStubsMain/kotlin/androidx/compose/ui/test/internal/JvmDefaultWithCompatibility.commonStubs.kt # compose/ui/ui-test/src/jsNativeMain/kotlin/androidx/compose/ui/test/TextActions.jsNative.kt # compose/ui/ui-test/src/jvmMain/kotlin/androidx/compose/ui/test/TestMonotonicFrameClock.jvm.kt # compose/ui/ui-test/src/linuxx64StubsMain/kotlin/androidx/compose/ui/test/Expect.linuxx64Stubs.kt # compose/ui/ui-test/src/linuxx64StubsMain/kotlin/androidx/compose/ui/test/TextActions.linuxx64Stubs.kt # compose/ui/ui-test/src/linuxx64StubsMain/kotlin/androidx/compose/ui/test/internal/JvmDefaultWithCompatibility.linuxx64Stubs.kt # compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/TestContext.skiko.kt # compose/ui/ui-text-google-fonts/build.gradle # compose/ui/ui-text/benchmark/build.gradle # compose/ui/ui-text/build.gradle # compose/ui/ui-text/samples/build.gradle # compose/ui/ui-tooling-data/build.gradle # compose/ui/ui-tooling-preview/build.gradle # compose/ui/ui-tooling/build.gradle # compose/ui/ui-uikit/src/uikitMain/objc/CMPUIKitUtils/CMPUIKitUtils/CMPEditMenuView.h # compose/ui/ui-unit/build.gradle # compose/ui/ui-unit/samples/build.gradle # compose/ui/ui-util/build.gradle # compose/ui/ui-util/src/webMain/kotlin/androidx/compose/ui/util/Trace.web.kt # compose/ui/ui-viewbinding/build.gradle # compose/ui/ui-viewbinding/samples/build.gradle # compose/ui/ui/benchmark/build.gradle # compose/ui/ui/build.gradle # compose/ui/ui/samples/build.gradle # compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt # compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/Modifier.kt # compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/ContentDataType.kt # compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/graphics/GraphicsLayerModifier.kt # compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/pointer/SuspendingPointerInputFilter.kt # compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/semantics/SemanticsProperties.kt # compose/ui/ui/src/commonStubsMain/kotlin/androidx/compose/ui/Modifier.commonStubs.kt # compose/ui/ui/src/commonStubsMain/kotlin/androidx/compose/ui/autofill/ContentType.commonStubs.kt # compose/ui/ui/src/commonStubsMain/kotlin/androidx/compose/ui/hapticfeedback/PlatformHapticFeedbackType.commonStubs.kt # compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/Actuals.desktop.kt # compose/ui/ui/src/jvmMain/kotlin/androidx/compose/ui/internal/PlatformOptimizedCancellationException.jvm.kt # compose/ui/ui/src/nativeMain/kotlin/androidx/compose/ui/internal/IdentityHashCode.native.kt # compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/autofill/ContentDataType.skiko.kt # compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/DefaultTextToolbar.skiko.kt # gradle/libs.versions.toml # gradle/verification-keyring.keys # gradle/verification-metadata.xml # gradle/wrapper/gradle-wrapper.properties # graphics/graphics-core/build.gradle # graphics/graphics-shapes/build.gradle # kruth/kruth/build.gradle # libraryversions.toml # lifecycle/lifecycle-common-java8/build.gradle # lifecycle/lifecycle-extensions/build.gradle # lifecycle/lifecycle-livedata-core-ktx/build.gradle # lifecycle/lifecycle-livedata-core-truth/build.gradle # lifecycle/lifecycle-livedata-core/build.gradle # lifecycle/lifecycle-livedata-ktx/build.gradle # lifecycle/lifecycle-livedata/build.gradle # lifecycle/lifecycle-process/build.gradle # lifecycle/lifecycle-reactivestreams-ktx/build.gradle # lifecycle/lifecycle-reactivestreams/build.gradle # lifecycle/lifecycle-runtime-compose/build.gradle # lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle # lifecycle/lifecycle-runtime-ktx/build.gradle # lifecycle/lifecycle-runtime-testing/build.gradle # lifecycle/lifecycle-runtime/api/restricted_current.txt # lifecycle/lifecycle-runtime/build.gradle # lifecycle/lifecycle-service/build.gradle # lifecycle/lifecycle-viewmodel-compose-lint/build.gradle # lifecycle/lifecycle-viewmodel-compose/build.gradle # lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle # lifecycle/lifecycle-viewmodel-compose/samples/build.gradle # lifecycle/lifecycle-viewmodel-ktx/build.gradle # lifecycle/lifecycle-viewmodel-navigation3/build.gradle # lifecycle/lifecycle-viewmodel-navigation3/src/androidInstrumentedTest/kotlin/androidx/lifecycle/viewmodel/navigation3/ViewModelStoreNavLocalProviderTest.kt # lifecycle/lifecycle-viewmodel-navigation3/src/androidMain/kotlin/androidx/lifecycle/viewmodel/navigation3/ViewModelStoreNavLocalProvider.android.kt # lifecycle/lifecycle-viewmodel-savedstate-samples/build.gradle # lifecycle/lifecycle-viewmodel-savedstate/api/current.txt # lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.txt # lifecycle/lifecycle-viewmodel-savedstate/bcv/native/current.txt # lifecycle/lifecycle-viewmodel-savedstate/build.gradle # lifecycle/lifecycle-viewmodel-savedstate/src/commonMain/kotlin/androidx/lifecycle/serialization/SavedStateHandleDelegate.kt # lifecycle/lifecycle-viewmodel-savedstate/src/jvmMain/kotlin/androidx/lifecycle/serialization/SavedStateHandleDelegates.jvm.kt # lifecycle/lifecycle-viewmodel-testing/api/current.txt # lifecycle/lifecycle-viewmodel-testing/api/restricted_current.txt # lifecycle/lifecycle-viewmodel-testing/build.gradle # lifecycle/lifecycle-viewmodel/api/current.txt # lifecycle/lifecycle-viewmodel/api/restricted_current.txt # lifecycle/lifecycle-viewmodel/build.gradle # lint-checks/build.gradle # lint/lint-gradle/build.gradle # navigation/lint/common-test/build.gradle # navigation/navigation-benchmark/build.gradle # navigation/navigation-common-ktx/build.gradle # navigation/navigation-common/api/current.txt # navigation/navigation-common/api/restricted_current.txt # navigation/navigation-common/bcv/native/current.txt # navigation/navigation-common/build.gradle # navigation/navigation-common/src/androidInstrumentedTest/kotlin/androidx/navigation/serialization/RouteDecoderTest.kt # navigation/navigation-common/src/androidInstrumentedTest/kotlin/androidx/navigation/serialization/RouteFilledTest.kt # navigation/navigation-common/src/commonMain/kotlin/androidx/navigation/NavDeepLink.kt # navigation/navigation-common/src/commonMain/kotlin/androidx/navigation/NavUri.kt # navigation/navigation-common/src/commonMain/kotlin/androidx/navigation/serialization/NavTypeConverter.kt # navigation/navigation-common/src/commonTest/kotlin/androidx/navigation/serialization/NavArgumentGeneratorTest.kt # navigation/navigation-compose/build.gradle # navigation/navigation-compose/integration-tests/navigation-demos/build.gradle # navigation/navigation-compose/samples/build.gradle # navigation/navigation-compose/src/androidInstrumentedTest/kotlin/androidx/navigation/compose/ComposeNavigatorTest.kt # navigation/navigation-compose/src/androidInstrumentedTest/kotlin/androidx/navigation/compose/DialogNavigatorTest.kt # navigation/navigation-compose/src/androidInstrumentedTest/kotlin/androidx/navigation/compose/NavBackStackEntryProviderTest.android.kt # navigation/navigation-compose/src/androidInstrumentedTest/kotlin/androidx/navigation/compose/NavBackStackEntryProviderTest.kt # navigation/navigation-compose/src/androidInstrumentedTest/kotlin/androidx/navigation/compose/NavGraphBuilderTest.kt # navigation/navigation-compose/src/androidInstrumentedTest/kotlin/androidx/navigation/compose/NavHostControllerTest.kt # navigation/navigation-compose/src/androidInstrumentedTest/kotlin/androidx/navigation/compose/NavHostTest.kt # navigation/navigation-compose/src/androidMain/kotlin/androidx/navigation/compose/internal/NavHostInternals.android.kt # navigation/navigation-compose/src/androidTest/java/androidx/navigation/compose/ComposeNavigatorTest.kt # navigation/navigation-compose/src/androidTest/java/androidx/navigation/compose/DialogNavigatorTest.kt # navigation/navigation-compose/src/androidTest/java/androidx/navigation/compose/NavBackStackEntryProviderTest.kt # navigation/navigation-compose/src/androidTest/java/androidx/navigation/compose/NavGraphBuilderTest.kt # navigation/navigation-compose/src/androidTest/java/androidx/navigation/compose/NavHostControllerTest.kt # navigation/navigation-compose/src/androidTest/java/androidx/navigation/compose/NavHostTest.kt # navigation/navigation-compose/src/commonMain/kotlin/androidx/navigation/compose/NavHost.kt # navigation/navigation-compose/src/commonMain/kotlin/androidx/navigation/compose/internal/NavHostInternals.kt # navigation/navigation-compose/src/commonTest/kotlin/androidx/navigation/compose/ComposeNavigatorTest.kt # navigation/navigation-compose/src/commonTest/kotlin/androidx/navigation/compose/DialogNavigatorTest.kt # navigation/navigation-compose/src/commonTest/kotlin/androidx/navigation/compose/NavGraphBuilderTest.kt # navigation/navigation-compose/src/commonTest/kotlin/androidx/navigation/compose/NavHostControllerTest.kt # navigation/navigation-compose/src/commonTest/kotlin/androidx/navigation/compose/NavHostTest.kt # navigation/navigation-dynamic-features-fragment/build.gradle # navigation/navigation-fragment-compose/build.gradle # navigation/navigation-fragment/build.gradle # navigation/navigation-runtime-truth/build.gradle # navigation/navigation-runtime/api/current.txt # navigation/navigation-runtime/api/restricted_current.txt # navigation/navigation-runtime/bcv/native/current.txt # navigation/navigation-runtime/build.gradle # navigation/navigation-runtime/src/androidInstrumentedTest/kotlin/androidx/navigation/NavControllerRouteTest.kt # navigation/navigation-runtime/src/androidInstrumentedTest/kotlin/androidx/navigation/NavControllerTest.kt # navigation/navigation-safe-args-generator/build.gradle # navigation/navigation-safe-args-gradle-plugin/build.gradle # navigation/navigation-testing/build.gradle # playground-common/playground-plugin/build.gradle # privacysandbox/ui/integration-tests/inappmediateesdk/build.gradle # savedstate/savedstate-compose/api/current.txt # savedstate/savedstate-compose/api/restricted_current.txt # savedstate/savedstate-compose/bcv/native/current.txt # savedstate/savedstate-compose/build.gradle # savedstate/savedstate-compose/src/commonMain/kotlin/androidx/savedstate/compose/serialization/serializers/MutableStateSerializer.kt # savedstate/savedstate-ktx/build.gradle # savedstate/savedstate-samples/build.gradle # savedstate/savedstate-samples/src/main/java/androidx/savedstate/SavedStateCodecSamples.kt # savedstate/savedstate/api/current.txt # savedstate/savedstate/api/restricted_current.txt # savedstate/savedstate/bcv/native/current.txt # savedstate/savedstate/build.gradle # savedstate/savedstate/src/androidMain/kotlin/androidx/savedstate/SavedStateReader.android.kt # savedstate/savedstate/src/androidMain/kotlin/androidx/savedstate/SavedStateWriter.android.kt # savedstate/savedstate/src/commonMain/kotlin/androidx/savedstate/serialization/SavedStateDecoder.kt # savedstate/savedstate/src/commonMain/kotlin/androidx/savedstate/serialization/SavedStateEncoder.kt # savedstate/savedstate/src/commonTest/kotlin/androidx/savedstate/SavedStateCodecTest.kt # savedstate/savedstate/src/commonTest/kotlin/androidx/savedstate/SavedStateCodecTestUtils.kt # savedstate/savedstate/src/commonTest/kotlin/androidx/savedstate/SavedStateTest.kt # savedstate/savedstate/src/nonAndroidMain/kotlin/androidx/savedstate/SavedStateReader.nonAndroid.kt # savedstate/savedstate/src/nonAndroidMain/kotlin/androidx/savedstate/SavedStateWriter.nonAndroid.kt # settings.gradle # stableaidl/stableaidl-gradle-plugin/build.gradle # test/uiautomator/uiautomator/build.gradle # testutils/testutils-espresso/build.gradle # testutils/testutils-lifecycle/build.gradle # testutils/testutils-navigation/build.gradle # testutils/testutils-runtime/build.gradle # tracing/tracing-driver/src/androidMain/kotlin/androidx/tracing/driver/AtomicBoolean.android.kt # window/window-core/build.gradle # xr/runtime/runtime/src/main/kotlin/androidx/xr/runtime/internal/Dimensions.kt # xr/runtime/runtime/src/main/kotlin/androidx/xr/runtime/internal/PlaneSemantic.kt # xr/scenecore/scenecore/src/main/java/androidx/xr/scenecore/impl/TextureResourceImpl.java
2 parents eef3bda + 7a145e0 commit e3e9ddc

File tree

5,714 files changed

+283401
-95108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,714 files changed

+283401
-95108
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
!.idea/copyright/profiles_settings.xml
1313
!.idea/inspectionProfiles/Project_Default.xml
1414
!.idea/ktfmt.xml
15+
!.idea/icon.svg
1516
.project
1617
.settings/
1718
project.properties

‎OWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ per-file *libraryversions.toml = juanrdz@google.com
4545
per-file *libraryversions.toml = zakcohen@google.com
4646
# AppSearch
4747
per-file *libraryversions.toml = adorokhine@google.com, tjbarron@google.com, xyj@google.com
48+
# XR *
49+
per-file *libraryversions.toml = rafiahmad@google.com
50+
# PDF *
51+
per-file *libraryversions.toml = anuragadarsh@google.com, bhavyajain@google.com, rahulkanojia@google.com
4852

4953
# Copybara can self-approve CLs within synced docs.
5054
per-file docs/** = copybara-worker-blackhole@google.com

‎activity/activity-compose-lint/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* modifying its settings.
2323
*/
2424
import androidx.build.BundleInsideHelper
25-
import androidx.build.LibraryType
25+
import androidx.build.SoftwareType
2626

2727
plugins {
2828
id("AndroidXPlugin")
@@ -52,7 +52,7 @@ dependencies {
5252

5353
androidx {
5454
name = "Activity Compose Lint"
55-
type = LibraryType.LINT
55+
type = SoftwareType.LINT
5656
inceptionYear = "2021"
5757
description = "Lint checks for Activity Compose"
5858
}

‎activity/activity-compose-lint/src/test/java/androidx/activity/compose/lint/LocalContextCastIssueDetectorTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class LocalContextCastIssueDetectorTest : LintDetectorTest() {
144144
lint()
145145
.files(
146146
kotlin(
147-
"""
147+
"""
148148
package com.example
149149
150150
import android.app.Activity
@@ -160,8 +160,8 @@ class LocalContextCastIssueDetectorTest : LintDetectorTest() {
160160
val activity3 = LocalContext.current as? MyActivity
161161
}
162162
"""
163-
.trimIndent()
164-
),
163+
)
164+
.indented(),
165165
Stubs.Composable,
166166
Stubs.CompositionLocal,
167167
LocalContextStub,
@@ -190,7 +190,7 @@ class LocalContextCastIssueDetectorTest : LintDetectorTest() {
190190
lint()
191191
.files(
192192
kotlin(
193-
"""
193+
"""
194194
package com.example
195195
196196
import android.app.Activity
@@ -206,8 +206,8 @@ class LocalContextCastIssueDetectorTest : LintDetectorTest() {
206206
val activity2 = LocalContext.current as ComponentActivity
207207
}
208208
"""
209-
.trimIndent()
210-
),
209+
)
210+
.indented(),
211211
Stubs.Composable,
212212
Stubs.CompositionLocal,
213213
LocalActivityStub,

‎activity/activity-compose/api/current.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@ package androidx.activity.compose {
1515

1616
public final class LocalActivityKt {
1717
method public static androidx.compose.runtime.ProvidableCompositionLocal<android.app.Activity?> getLocalActivity();
18-
property public static final androidx.compose.runtime.ProvidableCompositionLocal<android.app.Activity?> LocalActivity;
18+
property public static androidx.compose.runtime.ProvidableCompositionLocal<android.app.Activity?> LocalActivity;
1919
}
2020

2121
public final class LocalActivityResultRegistryOwner {
2222
method @androidx.compose.runtime.Composable public androidx.activity.result.ActivityResultRegistryOwner? getCurrent();
2323
method public infix androidx.compose.runtime.ProvidedValue<androidx.activity.result.ActivityResultRegistryOwner?> provides(androidx.activity.result.ActivityResultRegistryOwner registryOwner);
24-
property @androidx.compose.runtime.Composable public final androidx.activity.result.ActivityResultRegistryOwner? current;
24+
property @androidx.compose.runtime.Composable public androidx.activity.result.ActivityResultRegistryOwner? current;
2525
field public static final androidx.activity.compose.LocalActivityResultRegistryOwner INSTANCE;
2626
}
2727

2828
public final class LocalFullyDrawnReporterOwner {
2929
method @androidx.compose.runtime.Composable public androidx.activity.FullyDrawnReporterOwner? getCurrent();
3030
method public infix androidx.compose.runtime.ProvidedValue<androidx.activity.FullyDrawnReporterOwner?> provides(androidx.activity.FullyDrawnReporterOwner fullyDrawnReporterOwner);
31-
property @androidx.compose.runtime.Composable public final androidx.activity.FullyDrawnReporterOwner? current;
31+
property @androidx.compose.runtime.Composable public androidx.activity.FullyDrawnReporterOwner? current;
3232
field public static final androidx.activity.compose.LocalFullyDrawnReporterOwner INSTANCE;
3333
}
3434

3535
public final class LocalOnBackPressedDispatcherOwner {
3636
method @androidx.compose.runtime.Composable public androidx.activity.OnBackPressedDispatcherOwner? getCurrent();
3737
method public infix androidx.compose.runtime.ProvidedValue<androidx.activity.OnBackPressedDispatcherOwner?> provides(androidx.activity.OnBackPressedDispatcherOwner dispatcherOwner);
38-
property @androidx.compose.runtime.Composable public final androidx.activity.OnBackPressedDispatcherOwner? current;
38+
property @androidx.compose.runtime.Composable public androidx.activity.OnBackPressedDispatcherOwner? current;
3939
field public static final androidx.activity.compose.LocalOnBackPressedDispatcherOwner INSTANCE;
4040
}
4141

‎activity/activity-compose/api/restricted_current.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@ package androidx.activity.compose {
1515

1616
public final class LocalActivityKt {
1717
method public static androidx.compose.runtime.ProvidableCompositionLocal<android.app.Activity?> getLocalActivity();
18-
property public static final androidx.compose.runtime.ProvidableCompositionLocal<android.app.Activity?> LocalActivity;
18+
property public static androidx.compose.runtime.ProvidableCompositionLocal<android.app.Activity?> LocalActivity;
1919
}
2020

2121
public final class LocalActivityResultRegistryOwner {
2222
method @androidx.compose.runtime.Composable public androidx.activity.result.ActivityResultRegistryOwner? getCurrent();
2323
method public infix androidx.compose.runtime.ProvidedValue<androidx.activity.result.ActivityResultRegistryOwner?> provides(androidx.activity.result.ActivityResultRegistryOwner registryOwner);
24-
property @androidx.compose.runtime.Composable public final androidx.activity.result.ActivityResultRegistryOwner? current;
24+
property @androidx.compose.runtime.Composable public androidx.activity.result.ActivityResultRegistryOwner? current;
2525
field public static final androidx.activity.compose.LocalActivityResultRegistryOwner INSTANCE;
2626
}
2727

2828
public final class LocalFullyDrawnReporterOwner {
2929
method @androidx.compose.runtime.Composable public androidx.activity.FullyDrawnReporterOwner? getCurrent();
3030
method public infix androidx.compose.runtime.ProvidedValue<androidx.activity.FullyDrawnReporterOwner?> provides(androidx.activity.FullyDrawnReporterOwner fullyDrawnReporterOwner);
31-
property @androidx.compose.runtime.Composable public final androidx.activity.FullyDrawnReporterOwner? current;
31+
property @androidx.compose.runtime.Composable public androidx.activity.FullyDrawnReporterOwner? current;
3232
field public static final androidx.activity.compose.LocalFullyDrawnReporterOwner INSTANCE;
3333
}
3434

3535
public final class LocalOnBackPressedDispatcherOwner {
3636
method @androidx.compose.runtime.Composable public androidx.activity.OnBackPressedDispatcherOwner? getCurrent();
3737
method public infix androidx.compose.runtime.ProvidedValue<androidx.activity.OnBackPressedDispatcherOwner?> provides(androidx.activity.OnBackPressedDispatcherOwner dispatcherOwner);
38-
property @androidx.compose.runtime.Composable public final androidx.activity.OnBackPressedDispatcherOwner? current;
38+
property @androidx.compose.runtime.Composable public androidx.activity.OnBackPressedDispatcherOwner? current;
3939
field public static final androidx.activity.compose.LocalOnBackPressedDispatcherOwner INSTANCE;
4040
}
4141

‎activity/activity-compose/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Please use that script when creating a new project, rather than copying an existing project and
2222
* modifying its settings.
2323
*/
24-
import androidx.build.LibraryType
24+
import androidx.build.SoftwareType
2525

2626
plugins {
2727
id("AndroidXPlugin")
@@ -71,7 +71,7 @@ dependencies {
7171

7272
androidx {
7373
name = "Activity Compose"
74-
type = LibraryType.PUBLISHED_LIBRARY_ONLY_USED_BY_KOTLIN_CONSUMERS
74+
type = SoftwareType.PUBLISHED_LIBRARY_ONLY_USED_BY_KOTLIN_CONSUMERS
7575
inceptionYear = "2020"
7676
description = "Compose integration with Activity"
7777
legacyDisableKotlinStrictApiMode = true

‎activity/activity-compose/samples/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Please use that script when creating a new project, rather than copying an existing project and
2222
* modifying its settings.
2323
*/
24-
import androidx.build.LibraryType
24+
import androidx.build.SoftwareType
2525

2626
plugins {
2727
id("AndroidXPlugin")
@@ -55,7 +55,7 @@ dependencies {
5555

5656
androidx {
5757
name = "Compose UI Activity Integration Samples"
58-
type = LibraryType.SAMPLES
58+
type = SoftwareType.SAMPLES
5959
inceptionYear = "2020"
6060
description = "Samples for Compose integration with Activity"
6161
}

‎activity/activity-ktx/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Please use that script when creating a new project, rather than copying an existing project and
2222
* modifying its settings.
2323
*/
24-
import androidx.build.LibraryType
24+
import androidx.build.SoftwareType
2525
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2626

2727
plugins {
@@ -43,7 +43,7 @@ dependencies {
4343

4444
androidx {
4545
name = "Activity Kotlin Extensions"
46-
type = LibraryType.PUBLISHED_LIBRARY_ONLY_USED_BY_KOTLIN_CONSUMERS
46+
type = SoftwareType.PUBLISHED_LIBRARY_ONLY_USED_BY_KOTLIN_CONSUMERS
4747
inceptionYear = "2018"
4848
description = "Kotlin extensions for 'activity' artifact"
4949
}

‎activity/activity-lint/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Please use that script when creating a new project, rather than copying an existing project and
2222
* modifying its settings.
2323
*/
24-
import androidx.build.LibraryType
24+
import androidx.build.SoftwareType
2525

2626
plugins {
2727
id("AndroidXPlugin")
@@ -46,7 +46,7 @@ dependencies {
4646

4747
androidx {
4848
name = "Activity Lint Checks"
49-
type = LibraryType.LINT
49+
type = SoftwareType.LINT
5050
inceptionYear = "2020"
5151
description = "Android Activity Lint Checks"
5252
}

0 commit comments

Comments
 (0)