Skip to content

Commit b77b654

Browse files
jsjeonGerrit Code Review
jsjeon
authored and
Gerrit Code Review
committed
Merge "Update current API w/ Metalava update" into androidx-main
2 parents 8f100c1 + 948977a commit b77b654

15 files changed

+56
-56
lines changed

Diff for: ‎collection/collection/api/current.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ package androidx.collection {
6363
method public void addLast(E element);
6464
method public void clear();
6565
method public operator E get(int index);
66-
method public E! getFirst();
67-
method public E! getLast();
66+
method public E getFirst();
67+
method public E getLast();
6868
method public boolean isEmpty();
6969
method public E popFirst();
7070
method public E popLast();
7171
method public void removeFromEnd(int count);
7272
method public void removeFromStart(int count);
7373
method public int size();
74-
property public final E! first;
75-
property public final E! last;
74+
property public final E first;
75+
property public final E last;
7676
}
7777

7878
public final class CircularIntArray {

Diff for: ‎collection/collection/api/public_plus_experimental_current.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ package androidx.collection {
6363
method public void addLast(E element);
6464
method public void clear();
6565
method public operator E get(int index);
66-
method public E! getFirst();
67-
method public E! getLast();
66+
method public E getFirst();
67+
method public E getLast();
6868
method public boolean isEmpty();
6969
method public E popFirst();
7070
method public E popLast();
7171
method public void removeFromEnd(int count);
7272
method public void removeFromStart(int count);
7373
method public int size();
74-
property public final E! first;
75-
property public final E! last;
74+
property public final E first;
75+
property public final E last;
7676
}
7777

7878
public final class CircularIntArray {

Diff for: ‎collection/collection/api/restricted_current.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ package androidx.collection {
6363
method public void addLast(E element);
6464
method public void clear();
6565
method public operator E get(int index);
66-
method public E! getFirst();
67-
method public E! getLast();
66+
method public E getFirst();
67+
method public E getLast();
6868
method public boolean isEmpty();
6969
method public E popFirst();
7070
method public E popLast();
7171
method public void removeFromEnd(int count);
7272
method public void removeFromStart(int count);
7373
method public int size();
74-
property public final E! first;
75-
property public final E! last;
74+
property public final E first;
75+
property public final E last;
7676
}
7777

7878
public final class CircularIntArray {

Diff for: ‎compose/animation/animation-core/api/current.txt

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ package androidx.compose.animation.core {
1212
method public T getTargetValue();
1313
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
1414
method public T? getUpperBound();
15-
method public T! getValue();
16-
method public T! getVelocity();
15+
method public T getValue();
16+
method public T getVelocity();
1717
method public V getVelocityVector();
1818
method public boolean isRunning();
1919
method public suspend Object? snapTo(T targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -25,8 +25,8 @@ package androidx.compose.animation.core {
2525
property public final T targetValue;
2626
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
2727
property public final T? upperBound;
28-
property public final T! value;
29-
property public final T! velocity;
28+
property public final T value;
29+
property public final T velocity;
3030
property public final V velocityVector;
3131
}
3232

@@ -104,7 +104,7 @@ package androidx.compose.animation.core {
104104
method public T getTargetValue();
105105
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
106106
method public T getValue();
107-
method public T! getVelocity();
107+
method public T getVelocity();
108108
method public V getVelocityVector();
109109
method public boolean isRunning();
110110
method public androidx.compose.animation.core.AnimationState<T,V> toAnimationState();
@@ -115,7 +115,7 @@ package androidx.compose.animation.core {
115115
property public final T targetValue;
116116
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
117117
property public final T value;
118-
property public final T! velocity;
118+
property public final T velocity;
119119
property public final V velocityVector;
120120
}
121121

@@ -140,15 +140,15 @@ package androidx.compose.animation.core {
140140
method public long getLastFrameTimeNanos();
141141
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
142142
method public T getValue();
143-
method public T! getVelocity();
143+
method public T getVelocity();
144144
method public V getVelocityVector();
145145
method public boolean isRunning();
146146
property public final long finishedTimeNanos;
147147
property public final boolean isRunning;
148148
property public final long lastFrameTimeNanos;
149149
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
150150
property public T value;
151-
property public final T! velocity;
151+
property public final T velocity;
152152
property public final V velocityVector;
153153
}
154154

@@ -567,15 +567,15 @@ package androidx.compose.animation.core {
567567

568568
@androidx.compose.runtime.Stable public final class Transition<S> {
569569
method public java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> getAnimations();
570-
method public S! getCurrentState();
570+
method public S getCurrentState();
571571
method public String? getLabel();
572572
method public androidx.compose.animation.core.Transition.Segment<S> getSegment();
573573
method public S getTargetState();
574574
method public long getTotalDurationNanos();
575575
method public java.util.List<androidx.compose.animation.core.Transition<?>> getTransitions();
576576
method public boolean isRunning();
577577
property public final java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> animations;
578-
property public final S! currentState;
578+
property public final S currentState;
579579
property public final boolean isRunning;
580580
property public final String? label;
581581
property public final androidx.compose.animation.core.Transition.Segment<S> segment;

Diff for: ‎compose/animation/animation-core/api/public_plus_experimental_current.txt

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ package androidx.compose.animation.core {
1212
method public T getTargetValue();
1313
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
1414
method public T? getUpperBound();
15-
method public T! getValue();
16-
method public T! getVelocity();
15+
method public T getValue();
16+
method public T getVelocity();
1717
method public V getVelocityVector();
1818
method public boolean isRunning();
1919
method public suspend Object? snapTo(T targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -25,8 +25,8 @@ package androidx.compose.animation.core {
2525
property public final T targetValue;
2626
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
2727
property public final T? upperBound;
28-
property public final T! value;
29-
property public final T! velocity;
28+
property public final T value;
29+
property public final T velocity;
3030
property public final V velocityVector;
3131
}
3232

@@ -104,7 +104,7 @@ package androidx.compose.animation.core {
104104
method public T getTargetValue();
105105
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
106106
method public T getValue();
107-
method public T! getVelocity();
107+
method public T getVelocity();
108108
method public V getVelocityVector();
109109
method public boolean isRunning();
110110
method public androidx.compose.animation.core.AnimationState<T,V> toAnimationState();
@@ -115,7 +115,7 @@ package androidx.compose.animation.core {
115115
property public final T targetValue;
116116
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
117117
property public final T value;
118-
property public final T! velocity;
118+
property public final T velocity;
119119
property public final V velocityVector;
120120
}
121121

@@ -140,15 +140,15 @@ package androidx.compose.animation.core {
140140
method public long getLastFrameTimeNanos();
141141
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
142142
method public T getValue();
143-
method public T! getVelocity();
143+
method public T getVelocity();
144144
method public V getVelocityVector();
145145
method public boolean isRunning();
146146
property public final long finishedTimeNanos;
147147
property public final boolean isRunning;
148148
property public final long lastFrameTimeNanos;
149149
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
150150
property public T value;
151-
property public final T! velocity;
151+
property public final T velocity;
152152
property public final V velocityVector;
153153
}
154154

@@ -573,15 +573,15 @@ package androidx.compose.animation.core {
573573

574574
@androidx.compose.runtime.Stable public final class Transition<S> {
575575
method public java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> getAnimations();
576-
method public S! getCurrentState();
576+
method public S getCurrentState();
577577
method public String? getLabel();
578578
method public androidx.compose.animation.core.Transition.Segment<S> getSegment();
579579
method public S getTargetState();
580580
method public long getTotalDurationNanos();
581581
method public java.util.List<androidx.compose.animation.core.Transition<?>> getTransitions();
582582
method public boolean isRunning();
583583
property public final java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> animations;
584-
property public final S! currentState;
584+
property public final S currentState;
585585
property public final boolean isRunning;
586586
property public final String? label;
587587
property public final androidx.compose.animation.core.Transition.Segment<S> segment;

Diff for: ‎compose/animation/animation-core/api/restricted_current.txt

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ package androidx.compose.animation.core {
1212
method public T getTargetValue();
1313
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
1414
method public T? getUpperBound();
15-
method public T! getValue();
16-
method public T! getVelocity();
15+
method public T getValue();
16+
method public T getVelocity();
1717
method public V getVelocityVector();
1818
method public boolean isRunning();
1919
method public suspend Object? snapTo(T targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -25,8 +25,8 @@ package androidx.compose.animation.core {
2525
property public final T targetValue;
2626
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
2727
property public final T? upperBound;
28-
property public final T! value;
29-
property public final T! velocity;
28+
property public final T value;
29+
property public final T velocity;
3030
property public final V velocityVector;
3131
}
3232

@@ -104,7 +104,7 @@ package androidx.compose.animation.core {
104104
method public T getTargetValue();
105105
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
106106
method public T getValue();
107-
method public T! getVelocity();
107+
method public T getVelocity();
108108
method public V getVelocityVector();
109109
method public boolean isRunning();
110110
method public androidx.compose.animation.core.AnimationState<T,V> toAnimationState();
@@ -115,7 +115,7 @@ package androidx.compose.animation.core {
115115
property public final T targetValue;
116116
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
117117
property public final T value;
118-
property public final T! velocity;
118+
property public final T velocity;
119119
property public final V velocityVector;
120120
}
121121

@@ -140,15 +140,15 @@ package androidx.compose.animation.core {
140140
method public long getLastFrameTimeNanos();
141141
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
142142
method public T getValue();
143-
method public T! getVelocity();
143+
method public T getVelocity();
144144
method public V getVelocityVector();
145145
method public boolean isRunning();
146146
property public final long finishedTimeNanos;
147147
property public final boolean isRunning;
148148
property public final long lastFrameTimeNanos;
149149
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
150150
property public T value;
151-
property public final T! velocity;
151+
property public final T velocity;
152152
property public final V velocityVector;
153153
}
154154

@@ -568,15 +568,15 @@ package androidx.compose.animation.core {
568568
@androidx.compose.runtime.Stable public final class Transition<S> {
569569
ctor @kotlin.PublishedApi internal Transition(androidx.compose.animation.core.MutableTransitionState<S> transitionState, optional String? label);
570570
method public java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> getAnimations();
571-
method public S! getCurrentState();
571+
method public S getCurrentState();
572572
method public String? getLabel();
573573
method public androidx.compose.animation.core.Transition.Segment<S> getSegment();
574574
method public S getTargetState();
575575
method public long getTotalDurationNanos();
576576
method public java.util.List<androidx.compose.animation.core.Transition<?>> getTransitions();
577577
method public boolean isRunning();
578578
property public final java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> animations;
579-
property public final S! currentState;
579+
property public final S currentState;
580580
property public final boolean isRunning;
581581
property public final String? label;
582582
property public final androidx.compose.animation.core.Transition.Segment<S> segment;

Diff for: ‎compose/material/material/api/public_plus_experimental_current.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ package androidx.compose.material {
777777
method public final androidx.compose.runtime.State<java.lang.Float> getOffset();
778778
method public final androidx.compose.runtime.State<java.lang.Float> getOverflow();
779779
method public final androidx.compose.material.SwipeProgress<T> getProgress();
780-
method public final T! getTargetValue();
780+
method public final T getTargetValue();
781781
method public final boolean isAnimationRunning();
782782
method public final float performDrag(float delta);
783783
method public final suspend Object? performFling(float velocity, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -788,7 +788,7 @@ package androidx.compose.material {
788788
property public final androidx.compose.runtime.State<java.lang.Float> offset;
789789
property public final androidx.compose.runtime.State<java.lang.Float> overflow;
790790
property @androidx.compose.material.ExperimentalMaterialApi public final androidx.compose.material.SwipeProgress<T> progress;
791-
property @androidx.compose.material.ExperimentalMaterialApi public final T! targetValue;
791+
property @androidx.compose.material.ExperimentalMaterialApi public final T targetValue;
792792
field public static final androidx.compose.material.SwipeableState.Companion Companion;
793793
}
794794

Diff for: ‎compose/runtime/runtime/api/current.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ package androidx.compose.runtime {
200200
}
201201

202202
@androidx.compose.runtime.Stable public abstract sealed class CompositionLocal<T> {
203-
method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! getCurrent();
204-
property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! current;
203+
method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T getCurrent();
204+
property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T current;
205205
}
206206

207207
@androidx.compose.runtime.Stable public final class CompositionLocalContext {

Diff for: ‎compose/runtime/runtime/api/public_plus_experimental_current.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ package androidx.compose.runtime {
218218
}
219219

220220
@androidx.compose.runtime.Stable public abstract sealed class CompositionLocal<T> {
221-
method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! getCurrent();
222-
property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! current;
221+
method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T getCurrent();
222+
property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T current;
223223
}
224224

225225
@androidx.compose.runtime.Stable public final class CompositionLocalContext {

Diff for: ‎compose/runtime/runtime/api/restricted_current.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ package androidx.compose.runtime {
218218
}
219219

220220
@androidx.compose.runtime.Stable public abstract sealed class CompositionLocal<T> {
221-
method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! getCurrent();
222-
property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! current;
221+
method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T getCurrent();
222+
property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T current;
223223
}
224224

225225
@androidx.compose.runtime.Stable public final class CompositionLocalContext {

Diff for: ‎compose/ui/ui/api/current.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2229,7 +2229,7 @@ package androidx.compose.ui.modifier {
22292229
}
22302230

22312231
public interface ModifierLocalNode extends androidx.compose.ui.modifier.ModifierLocalReadScope androidx.compose.ui.node.DelegatableNode {
2232-
method public default <T> T! getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
2232+
method public default <T> T getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
22332233
method public default androidx.compose.ui.modifier.ModifierLocalMap getProvidedValues();
22342234
method public default <T> void provide(androidx.compose.ui.modifier.ModifierLocal<T> key, T value);
22352235
property public default androidx.compose.ui.modifier.ModifierLocalMap providedValues;

Diff for: ‎compose/ui/ui/api/public_plus_experimental_current.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2440,7 +2440,7 @@ package androidx.compose.ui.modifier {
24402440
}
24412441

24422442
public interface ModifierLocalNode extends androidx.compose.ui.modifier.ModifierLocalReadScope androidx.compose.ui.node.DelegatableNode {
2443-
method public default <T> T! getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
2443+
method public default <T> T getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
24442444
method public default androidx.compose.ui.modifier.ModifierLocalMap getProvidedValues();
24452445
method public default <T> void provide(androidx.compose.ui.modifier.ModifierLocal<T> key, T value);
24462446
property public default androidx.compose.ui.modifier.ModifierLocalMap providedValues;

Diff for: ‎compose/ui/ui/api/restricted_current.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2236,7 +2236,7 @@ package androidx.compose.ui.modifier {
22362236
}
22372237

22382238
public interface ModifierLocalNode extends androidx.compose.ui.modifier.ModifierLocalReadScope androidx.compose.ui.node.DelegatableNode {
2239-
method public default <T> T! getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
2239+
method public default <T> T getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
22402240
method public default androidx.compose.ui.modifier.ModifierLocalMap getProvidedValues();
22412241
method public default <T> void provide(androidx.compose.ui.modifier.ModifierLocal<T> key, T value);
22422242
property public default androidx.compose.ui.modifier.ModifierLocalMap providedValues;

Diff for: ‎playground-common/playground.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ kotlin.code.style=official
2626
# Disable docs
2727
androidx.enableDocumentation=false
2828
androidx.playground.snapshotBuildId=9971607
29-
androidx.playground.metalavaBuildId=9975079
29+
androidx.playground.metalavaBuildId=10009114
3030
androidx.studio.type=playground

0 commit comments

Comments
 (0)