Merge branch 'igor.demin/revert-material3-to-stable' into jb-main

JetBrains · Feb 25, 2025 · dedd291 · dedd291
2 parents 84e7b9b + 2586585
commit dedd291
Show file tree

Hide file tree

Showing 521 changed files with 17,569 additions and 60,049 deletions.
diff --git a/compose/material3/material3/api/1.3.0-beta03.txt b/compose/material3/material3/api/1.3.0-beta03.txt
@@ -693,9 +693,6 @@ package androidx.compose.material3 {
   @SuppressCompatibility @kotlin.RequiresOptIn(message="This material API is experimental and is likely to change or to be removed in" + " the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalMaterial3Api {
   }
 
-  @SuppressCompatibility @kotlin.RequiresOptIn(message="This material3 API is experimental and is likely to change or to be removed in the" + " future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalMaterial3ExpressiveApi {
-  }
-
   @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public abstract sealed class ExposedDropdownMenuBoxScope {
     method @androidx.compose.runtime.Composable public final void ExposedDropdownMenu(boolean expanded, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.ScrollState scrollState, optional boolean matchTextFieldWidth, optional androidx.compose.ui.graphics.Shape shape, optional long containerColor, optional float tonalElevation, optional float shadowElevation, optional androidx.compose.foundation.BorderStroke? border, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public final void ExposedDropdownMenu(boolean expanded, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.ScrollState scrollState, optional boolean focusable, optional boolean matchTextFieldWidth, optional androidx.compose.ui.graphics.Shape shape, optional long containerColor, optional float tonalElevation, optional float shadowElevation, optional androidx.compose.foundation.BorderStroke? border, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);

diff --git a/compose/material3/material3/api/1.3.0-beta04.txt b/compose/material3/material3/api/1.3.0-beta04.txt
diff --git a/compose/material3/material3/api/1.3.0-beta05.txt b/compose/material3/material3/api/1.3.0-beta05.txt
diff --git a/compose/material3/material3/api/api_lint.ignore b/compose/material3/material3/api/api_lint.ignore
@@ -3,8 +3,14 @@ AutoBoxing: androidx.compose.material3.DatePickerState#setSelectedDateMillis(Lon
     Must avoid boxed primitives (`java.lang.Long`)
 
 
-GetterSetterNames: androidx.compose.material3.ModalBottomSheetProperties#getShouldDismissOnBackPress():
-    Getter for boolean property `shouldDismissOnBackPress` is named `getShouldDismissOnBackPress` but should match the property name. Use `@get:JvmName` to rename.
+ExecutorRegistration: androidx.compose.material3.TextDefaults#Clickable(String, androidx.compose.ui.text.SpanStyle, androidx.compose.ui.text.SpanStyle, androidx.compose.ui.text.SpanStyle, androidx.compose.ui.text.LinkInteractionListener):
+    Registration methods should have overload that accepts delivery Executor: `Clickable`
+ExecutorRegistration: androidx.compose.material3.TextDefaults#Url(String, androidx.compose.ui.text.SpanStyle, androidx.compose.ui.text.SpanStyle, androidx.compose.ui.text.SpanStyle, androidx.compose.ui.text.LinkInteractionListener):
+    Registration methods should have overload that accepts delivery Executor: `Url`
+ExecutorRegistration: androidx.compose.material3.TextDefaults#fromHtml(String, androidx.compose.ui.text.SpanStyle, androidx.compose.ui.text.SpanStyle, androidx.compose.ui.text.SpanStyle, androidx.compose.ui.text.LinkInteractionListener):
+    Registration methods should have overload that accepts delivery Executor: `fromHtml`
+
+
 GetterSetterNames: androidx.compose.material3.SheetState#getHasExpandedState():
     Getter for boolean property `hasExpandedState` is named `getHasExpandedState` but should match the property name. Use `@get:JvmName` to rename.
 GetterSetterNames: androidx.compose.material3.SheetState#getHasPartiallyExpandedState():

diff --git a/compose/material3/material3/api/current.ignore b/compose/material3/material3/api/current.ignore
@@ -1,7 +1,3 @@
 // Baseline format: 1.0
-RemovedClass: androidx.compose.material3.ExposedDropdownMenu_androidKt:
-    Removed class androidx.compose.material3.ExposedDropdownMenu_androidKt
-RemovedClass: androidx.compose.material3.MenuAnchorType:
-    Removed class androidx.compose.material3.MenuAnchorType
-RemovedClass: androidx.compose.material3.SearchBar_androidKt:
-    Removed class androidx.compose.material3.SearchBar_androidKt
+AddedClass: androidx.compose.material3.ModalBottomSheetKt:
+    Added class androidx.compose.material3.ModalBottomSheetKt
diff --git a/compose/material3/material3/api/current.txt b/compose/material3/material3/api/current.txt
diff --git a/compose/material3/material3/api/desktop/material3.api b/compose/material3/material3/api/desktop/material3.api
diff --git a/compose/material3/material3/api/res-1.3.0-beta04.txt b/compose/material3/material3/api/res-1.3.0-beta04.txt
diff --git a/compose/material3/material3/api/res-1.3.0-beta05.txt b/compose/material3/material3/api/res-1.3.0-beta05.txt
diff --git a/compose/material3/material3/api/restricted_1.3.0-beta03.txt b/compose/material3/material3/api/restricted_1.3.0-beta03.txt
@@ -693,9 +693,6 @@ package androidx.compose.material3 {
   @SuppressCompatibility @kotlin.RequiresOptIn(message="This material API is experimental and is likely to change or to be removed in" + " the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalMaterial3Api {
   }
 
-  @SuppressCompatibility @kotlin.RequiresOptIn(message="This material3 API is experimental and is likely to change or to be removed in the" + " future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalMaterial3ExpressiveApi {
-  }
-
   @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public abstract sealed class ExposedDropdownMenuBoxScope {
     method @androidx.compose.runtime.Composable public final void ExposedDropdownMenu(boolean expanded, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.ScrollState scrollState, optional boolean matchTextFieldWidth, optional androidx.compose.ui.graphics.Shape shape, optional long containerColor, optional float tonalElevation, optional float shadowElevation, optional androidx.compose.foundation.BorderStroke? border, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public final void ExposedDropdownMenu(boolean expanded, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.ScrollState scrollState, optional boolean focusable, optional boolean matchTextFieldWidth, optional androidx.compose.ui.graphics.Shape shape, optional long containerColor, optional float tonalElevation, optional float shadowElevation, optional androidx.compose.foundation.BorderStroke? border, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);