Skip to content

Commit 3328a6e

Browse files
MatkovIvanMatkovIvan
committed
Merge branch 'release/1.9' into integration-release/compose-ui/1.9
# Conflicts: # compose/material/material-navigation/build.gradle # compose/material3/adaptive/adaptive-layout/build.gradle # compose/material3/adaptive/adaptive-navigation3/build.gradle # compose/material3/adaptive/adaptive/build.gradle # compose/runtime/runtime-saveable/build.gradle # compose/ui/ui/build.gradle # gradle.properties # libraryversions.toml
2 parents 8e16773 + 15dc931 commit 3328a6e

242 files changed

Lines changed: 7571 additions & 1620 deletions

File tree

Some content is hidden

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

‎compose/material3/adaptive/adaptive-layout/api/adaptive-layout.klib.api‎

Lines changed: 53 additions & 82 deletions
Large diffs are not rendered by default.

‎compose/material3/adaptive/adaptive-layout/api/api_lint.ignore‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Baseline format: 1.0
2+
TypeParameterName: androidx.compose.material3.adaptive.layout.AnimatedPaneOverride#AnimatedPane(androidx.compose.material3.adaptive.layout.AnimatedPaneOverrideScope<Role,ScaffoldValue>):
3+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
4+
TypeParameterName: androidx.compose.material3.adaptive.layout.AnimatedPaneOverrideScope:
5+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
6+
TypeParameterName: androidx.compose.material3.adaptive.layout.ExtendedPaneScaffoldPaneScope:
7+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
8+
TypeParameterName: androidx.compose.material3.adaptive.layout.ExtendedPaneScaffoldScope:
9+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
10+
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneKt#AnimatedPane(androidx.compose.material3.adaptive.layout.ExtendedPaneScaffoldPaneScope<Role,ScaffoldValue>, androidx.compose.ui.Modifier, androidx.compose.animation.EnterTransition, androidx.compose.animation.ExitTransition, androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntRect>, kotlin.jvm.functions.Function1<androidx.compose.material3.adaptive.layout.AnimatedPaneScope,kotlin.Unit>):
11+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
12+
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneMotionKt#calculateDefaultEnterTransition(androidx.compose.material3.adaptive.layout.PaneScaffoldMotionDataProvider<Role>, Role):
13+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
14+
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneMotionKt#calculateDefaultExitTransition(androidx.compose.material3.adaptive.layout.PaneScaffoldMotionDataProvider<Role>, Role):
15+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
16+
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneMotionKt#forEach(androidx.compose.material3.adaptive.layout.PaneScaffoldMotionDataProvider<Role>, kotlin.jvm.functions.Function2<? super Role,? super androidx.compose.material3.adaptive.layout.PaneMotionData,kotlin.Unit>):
17+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
18+
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneMotionKt#forEachReversed(androidx.compose.material3.adaptive.layout.PaneScaffoldMotionDataProvider<Role>, kotlin.jvm.functions.Function2<? super Role,? super androidx.compose.material3.adaptive.layout.PaneMotionData,kotlin.Unit>):
19+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
20+
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneScaffoldHorizontalOrder:
21+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
22+
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneScaffoldMotionDataProvider:
23+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
24+
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneScaffoldPaneScope:
25+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
26+
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneScaffoldTransitionScope:
27+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
28+
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneScaffoldValue:
29+
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names

‎compose/material3/adaptive/adaptive-layout/api/current.ignore‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,5 @@
11
// Baseline format: 1.0
2-
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#getSaveableStateHolder():
3-
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.getSaveableStateHolder()
4-
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#paneExpansionDraggable-TDGSqEk(androidx.compose.ui.Modifier, androidx.compose.material3.adaptive.layout.PaneExpansionState, float, androidx.compose.foundation.interaction.MutableInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit>):
5-
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.paneExpansionDraggable-TDGSqEk(androidx.compose.ui.Modifier,androidx.compose.material3.adaptive.layout.PaneExpansionState,float,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit>)
6-
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#preferredHeight(androidx.compose.ui.Modifier, float):
7-
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.preferredHeight(androidx.compose.ui.Modifier,float)
8-
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#preferredHeight(androidx.compose.ui.Modifier, int):
9-
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.preferredHeight(androidx.compose.ui.Modifier,int)
10-
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#preferredHeight-3ABfNKs(androidx.compose.ui.Modifier, float):
11-
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.preferredHeight-3ABfNKs(androidx.compose.ui.Modifier,float)
12-
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#preferredWidth(androidx.compose.ui.Modifier, int):
13-
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.preferredWidth(androidx.compose.ui.Modifier,int)
14-
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#preferredWidth-3ABfNKs(androidx.compose.ui.Modifier, float):
15-
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.preferredWidth-3ABfNKs(androidx.compose.ui.Modifier,float)
16-
17-
18-
RemovedMethod: androidx.compose.material3.adaptive.layout.HingePolicy.Companion#getAlwaysAvoid():
19-
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.HingePolicy.Companion.getAlwaysAvoid()
20-
RemovedMethod: androidx.compose.material3.adaptive.layout.HingePolicy.Companion#getAvoidOccluding():
21-
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.HingePolicy.Companion.getAvoidOccluding()
22-
RemovedMethod: androidx.compose.material3.adaptive.layout.HingePolicy.Companion#getAvoidSeparating():
23-
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.HingePolicy.Companion.getAvoidSeparating()
24-
RemovedMethod: androidx.compose.material3.adaptive.layout.HingePolicy.Companion#getNeverAvoid():
25-
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.HingePolicy.Companion.getNeverAvoid()
26-
RemovedMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldDirective#PaneScaffoldDirective(int, float, int, float, float, java.util.List<androidx.compose.ui.geometry.Rect>):
27-
Binary breaking change: Removed constructor androidx.compose.material3.adaptive.layout.PaneScaffoldDirective(int,float,int,float,float,java.util.List<androidx.compose.ui.geometry.Rect>)
28-
RemovedMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldDirective#getDefaultPanePreferredWidth():
29-
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.PaneScaffoldDirective.getDefaultPanePreferredWidth()
30-
RemovedMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldDirective#getHorizontalPartitionSpacerSize():
31-
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.PaneScaffoldDirective.getHorizontalPartitionSpacerSize()
32-
RemovedMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldDirective#getVerticalPartitionSpacerSize():
33-
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.PaneScaffoldDirective.getVerticalPartitionSpacerSize()
2+
RemovedMethod: androidx.compose.material3.adaptive.layout.PaneExpansionAnchor#getDescription():
3+
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.PaneExpansionAnchor.getDescription()
4+
RemovedMethod: androidx.compose.material3.adaptive.layout.PaneExpansionAnchor.Proportion#getDescription():
5+
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.PaneExpansionAnchor.Proportion.getDescription()

0 commit comments

Comments
 (0)