Skip to content

Commit 97177f5

Browse files
rock3rintellij-monorepo-bot
authored andcommitted
[JEWEL-1052] Cleanup deprecated APIs
This marks a bunch of deprecated APIs as hidden, solving several issues with deprecation notices appearing to users. There are no source level breakages (at least in our usages), and the binary compat is still guaranteed as the symbols are still in the class files. The other notable change is that we've un-deprecated Dropdown and marked it as experimental, since it still has uses that have no proper replacement. * DataProviderNode is now annotated as internal (and no longer deprecated) as it was always supposed to be * MenuItemColors styling APIs using the deprecated-to-hide MenuItemState APIs have been deprecated-to-hide, too * Many deprecated API with source compatible overloads have been hidden (note: source compat can always be broken in source, but I've only done it on a few cases where it should not be an issue for anyone, and on APIs deprecated since at least 0.29) * ColorExtensions' deprecated APIs have not been hidden since they have a different behaviour compared to the newer ones closes #3277 GitOrigin-RevId: 2c269ff8651f9605ce67fb579a2269107786b959
1 parent 9e7d94e commit 97177f5

File tree

22 files changed

+211
-98
lines changed

22 files changed

+211
-98
lines changed

platform/jewel/foundation/api-dump.txt

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,6 @@ f:org.jetbrains.jewel.foundation.TextColors$Companion
122122
org.jetbrains.jewel.foundation.actionSystem.DataProviderContext
123123
- a:lazy(java.lang.String,kotlin.jvm.functions.Function0):V
124124
- a:set(java.lang.String,java.lang.Object):V
125-
f:org.jetbrains.jewel.foundation.actionSystem.DataProviderNode
126-
- androidx.compose.ui.Modifier$Node
127-
- androidx.compose.ui.focus.FocusEventModifierNode
128-
- androidx.compose.ui.node.TraversableNode
129-
- sf:$stable:I
130-
- sf:TraverseKey:org.jetbrains.jewel.foundation.actionSystem.DataProviderNode$TraverseKey
131-
- <init>(kotlin.jvm.functions.Function1):V
132-
- f:getDataProvider():kotlin.jvm.functions.Function1
133-
- f:getHasFocus():Z
134-
- getTraverseKey():org.jetbrains.jewel.foundation.actionSystem.DataProviderNode$TraverseKey
135-
- onFocusEvent(androidx.compose.ui.focus.FocusState):V
136-
- f:setDataProvider(kotlin.jvm.functions.Function1):V
137-
- f:setHasFocus(Z):V
138-
f:org.jetbrains.jewel.foundation.actionSystem.DataProviderNode$TraverseKey
139125
f:org.jetbrains.jewel.foundation.actionSystem.ProvideDataKt
140126
- sf:provideData(androidx.compose.ui.Modifier,kotlin.jvm.functions.Function1):androidx.compose.ui.Modifier
141127
f:org.jetbrains.jewel.foundation.code.MimeType
@@ -284,7 +270,7 @@ org.jetbrains.jewel.foundation.lazy.SelectableColumnOnKeyEvent
284270
- onSelectPreviousItem(java.util.List,org.jetbrains.jewel.foundation.lazy.SelectableLazyListState):V
285271
f:org.jetbrains.jewel.foundation.lazy.SelectableLazyColumnKt
286272
- sf:SelectableLazyColumn(androidx.compose.ui.Modifier,org.jetbrains.jewel.foundation.lazy.SelectionMode,org.jetbrains.jewel.foundation.lazy.SelectableLazyListState,androidx.compose.foundation.layout.PaddingValues,Z,kotlin.jvm.functions.Function1,androidx.compose.foundation.layout.Arrangement$Vertical,androidx.compose.ui.Alignment$Horizontal,androidx.compose.foundation.gestures.FlingBehavior,org.jetbrains.jewel.foundation.lazy.tree.KeyActions,org.jetbrains.jewel.foundation.lazy.tree.PointerEventActions,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function1,androidx.compose.runtime.Composer,I,I,I):V
287-
- sf:SelectableLazyColumn(androidx.compose.ui.Modifier,org.jetbrains.jewel.foundation.lazy.SelectionMode,org.jetbrains.jewel.foundation.lazy.SelectableLazyListState,androidx.compose.foundation.layout.PaddingValues,Z,kotlin.jvm.functions.Function1,androidx.compose.foundation.layout.Arrangement$Vertical,androidx.compose.ui.Alignment$Horizontal,androidx.compose.foundation.gestures.FlingBehavior,org.jetbrains.jewel.foundation.lazy.tree.KeyActions,org.jetbrains.jewel.foundation.lazy.tree.PointerEventActions,kotlin.jvm.functions.Function1,androidx.compose.runtime.Composer,I,I,I):V
273+
- bsf:SelectableLazyColumn(androidx.compose.ui.Modifier,org.jetbrains.jewel.foundation.lazy.SelectionMode,org.jetbrains.jewel.foundation.lazy.SelectableLazyListState,androidx.compose.foundation.layout.PaddingValues,Z,kotlin.jvm.functions.Function1,androidx.compose.foundation.layout.Arrangement$Vertical,androidx.compose.ui.Alignment$Horizontal,androidx.compose.foundation.gestures.FlingBehavior,org.jetbrains.jewel.foundation.lazy.tree.KeyActions,org.jetbrains.jewel.foundation.lazy.tree.PointerEventActions,kotlin.jvm.functions.Function1,androidx.compose.runtime.Composer,I,I,I):V
288274
org.jetbrains.jewel.foundation.lazy.SelectableLazyItemScope
289275
- androidx.compose.foundation.lazy.LazyItemScope
290276
- a:isActive():Z
@@ -359,7 +345,7 @@ e:org.jetbrains.jewel.foundation.lazy.SelectionMode
359345
- s:values():org.jetbrains.jewel.foundation.lazy.SelectionMode[]
360346
f:org.jetbrains.jewel.foundation.lazy.tree.BasicLazyTreeKt
361347
- sf:BasicLazyTree-X48TzrA(org.jetbrains.jewel.foundation.lazy.tree.Tree,J,J,J,F,androidx.compose.foundation.shape.CornerSize,androidx.compose.foundation.layout.PaddingValues,androidx.compose.foundation.layout.PaddingValues,F,F,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function3,androidx.compose.ui.Modifier,org.jetbrains.jewel.foundation.lazy.SelectionMode,org.jetbrains.jewel.foundation.lazy.tree.TreeState,J,org.jetbrains.jewel.foundation.lazy.tree.KeyActions,org.jetbrains.jewel.foundation.lazy.tree.PointerEventActions,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function4,androidx.compose.runtime.Composer,I,I,I,I):V
362-
- sf:BasicLazyTree-orM9XXQ(org.jetbrains.jewel.foundation.lazy.tree.Tree,org.jetbrains.jewel.foundation.lazy.SelectionMode,kotlin.jvm.functions.Function1,J,J,J,F,androidx.compose.foundation.shape.CornerSize,androidx.compose.foundation.layout.PaddingValues,androidx.compose.foundation.layout.PaddingValues,F,F,org.jetbrains.jewel.foundation.lazy.tree.TreeState,androidx.compose.ui.Modifier,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,J,org.jetbrains.jewel.foundation.lazy.tree.KeyActions,org.jetbrains.jewel.foundation.lazy.tree.PointerEventActions,kotlin.jvm.functions.Function3,kotlin.jvm.functions.Function4,androidx.compose.runtime.Composer,I,I,I,I):V
348+
- bsf:BasicLazyTree-orM9XXQ(org.jetbrains.jewel.foundation.lazy.tree.Tree,org.jetbrains.jewel.foundation.lazy.SelectionMode,kotlin.jvm.functions.Function1,J,J,J,F,androidx.compose.foundation.shape.CornerSize,androidx.compose.foundation.layout.PaddingValues,androidx.compose.foundation.layout.PaddingValues,F,F,org.jetbrains.jewel.foundation.lazy.tree.TreeState,androidx.compose.ui.Modifier,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,J,org.jetbrains.jewel.foundation.lazy.tree.KeyActions,org.jetbrains.jewel.foundation.lazy.tree.PointerEventActions,kotlin.jvm.functions.Function3,kotlin.jvm.functions.Function4,androidx.compose.runtime.Composer,I,I,I,I):V
363349
f:org.jetbrains.jewel.foundation.lazy.tree.BuildTreeKt
364350
- sf:asTree(java.io.File,kotlin.jvm.functions.Function1):org.jetbrains.jewel.foundation.lazy.tree.Tree
365351
- sf:asTree(java.nio.file.Path,kotlin.jvm.functions.Function1):org.jetbrains.jewel.foundation.lazy.tree.Tree
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
// Baseline format: 1.0
2+
RemovedDeprecatedClass: org.jetbrains.jewel.foundation.actionSystem.DataProviderNode:
3+
Binary breaking change: Removed deprecated class org.jetbrains.jewel.foundation.actionSystem.DataProviderNode
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
// Baseline format: 1.0
2+
RemovedDeprecatedClass: org.jetbrains.jewel.foundation.actionSystem.DataProviderNode:
3+
Binary breaking change: Removed deprecated class org.jetbrains.jewel.foundation.actionSystem.DataProviderNode

platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/actionSystem/DataProviderNode.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ import androidx.compose.ui.Modifier
44
import androidx.compose.ui.focus.FocusEventModifierNode
55
import androidx.compose.ui.focus.FocusState
66
import androidx.compose.ui.node.TraversableNode
7+
import org.jetbrains.annotations.ApiStatus
8+
import org.jetbrains.jewel.foundation.InternalJewelApi
79

8-
@Deprecated(message = "Will be made internal in the future.")
10+
@InternalJewelApi
11+
@ApiStatus.Internal
912
public class DataProviderNode(@Suppress("DEPRECATION") public var dataProvider: DataProviderContext.() -> Unit) :
1013
Modifier.Node(), FocusEventModifierNode, TraversableNode {
1114
public var hasFocus: Boolean = false

platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyColumn.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import org.jetbrains.jewel.foundation.lazy.tree.KeyActions
4444
import org.jetbrains.jewel.foundation.lazy.tree.PointerEventActions
4545

4646
@Composable
47-
@Deprecated("Use SelectableLazyColumn with 'interactionSource' parameter instead")
47+
@Deprecated("Use SelectableLazyColumn with 'interactionSource' parameter instead", level = DeprecationLevel.HIDDEN)
4848
public fun SelectableLazyColumn(
4949
modifier: Modifier = Modifier,
5050
selectionMode: SelectionMode = SelectionMode.Multiple,

platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BasicLazyTree.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ import org.jetbrains.jewel.foundation.state.SelectableComponentState
7373
*/
7474
@Suppress("UNCHECKED_CAST", "ComposableParamOrder")
7575
@Composable
76-
@Deprecated("Use BasicLazyTree with 'interactionSource' parameter instead")
76+
@Deprecated("Use BasicLazyTree with 'interactionSource' parameter instead", level = DeprecationLevel.HIDDEN)
7777
public fun <T> BasicLazyTree(
7878
tree: Tree<T>,
7979
selectionMode: SelectionMode = SelectionMode.Multiple,
@@ -119,6 +119,7 @@ public fun <T> BasicLazyTree(
119119
pointerEventScopedActions = pointerEventScopedActions,
120120
chevronContent = chevronContent,
121121
nodeContent = nodeContent,
122+
interactionSource = remember { MutableInteractionSource() },
122123
)
123124
}
124125

0 commit comments

Comments
 (0)