Add lint rule for primitive collections
Bug: 285143619
With collections specifically designed for primitives, we no longer
need standard collections containing primitives, at least internally.
By using the specialized collections we can avoid autoboxing the
primitives.
This CL adds a lint rule to remind developers to use the primitive
collections.
Test: new test
Change-Id: Iab97f6e401f41d35a48387c2be2cc2a382e1121a
diff --git a/camera/integration-tests/avsynctestapp/lint-baseline.xml b/camera/integration-tests/avsynctestapp/lint-baseline.xml
index 2f3251e..46e7ea5 100644
--- a/camera/integration-tests/avsynctestapp/lint-baseline.xml
+++ b/camera/integration-tests/avsynctestapp/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.3.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha02)" variant="all" version="8.3.0-alpha02">
<issue
id="RestrictedApiAndroidX"
@@ -568,4 +568,58 @@
file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
</issue>
+ <issue
+ id="PrimitiveInCollection"
+ message="variable waveData with type List<? extends Double>: replace with FloatList"
+ errorLine1=" val waveData = generateSineData(frequency, beepLengthInSec, sampleRate)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable samples with type List<? extends Byte>: replace with IntList"
+ errorLine1=" val samples = toSamples(waveData, sampleWidth)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable res with type List<Double>: replace with FloatList"
+ errorLine1=" val res = mutableListOf<Double>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method toSamples has parameter data with type List<Double>: replace with FloatList"
+ errorLine1=" data: List<Double>,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Byte> of toBytes: replace with IntList"
+ errorLine1=" fun Int.toBytes(sampleWidth: Int): List<Byte> {"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable res with type List<Byte>: replace with IntList"
+ errorLine1=" val res = mutableListOf<Byte>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
+ </issue>
+
</issues>
diff --git a/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml b/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
index e080df6..7649702 100644
--- a/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
+++ b/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.3.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha02)" variant="all" version="8.3.0-alpha02">
<issue
id="RestrictedApiAndroidX"
@@ -218,6 +218,15 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="field VALID_FLASH_MODES with type List<Integer>: replace with IntList"
+ errorLine1=" private val VALID_FLASH_MODES = listOf("
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/camera/integration/uiwidgets/compose/ui/screen/imagecapture/ImageCaptureScreenState.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method ImageCaptureScreen has parameter 'onLinearZoomChange' with type Function1<? super Float, Unit>."
errorLine1=" onLinearZoomChange: (Float) -> Unit,"
diff --git a/compose/animation/animation-core/lint-baseline.xml b/compose/animation/animation-core/lint-baseline.xml
index 6302da6..f02a3f7 100644
--- a/compose/animation/animation-core/lint-baseline.xml
+++ b/compose/animation/animation-core/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha14" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
<issue
id="BanSuppressTag"
@@ -83,6 +83,60 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="field keyframes with type Map<Integer, KeyframeEntity<T>>: replace with IntObjectMap"
+ errorLine1=" internal val keyframes = mutableMapOf<Int, KeyframeEntity<T>>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/animation/core/AnimationSpec.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Integer, KeyframeEntity<T>> of getKeyframes$lint_module: replace with IntObjectMap"
+ errorLine1=" internal val keyframes = mutableMapOf<Int, KeyframeEntity<T>>()"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/animation/core/AnimationSpec.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor VectorizedKeyframesSpec has parameter keyframes with type Map<Integer, ? extends Pair<? extends V, ? extends Easing>>: replace with IntObjectMap"
+ errorLine1=" private val keyframes: Map<Int, Pair<V, Easing>>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/animation/core/VectorizedAnimationSpec.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field keyframes with type Map<Integer, Pair<V, Easing>>: replace with IntObjectMap"
+ errorLine1=" private val keyframes: Map<Int, Pair<V, Easing>>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/animation/core/VectorizedAnimationSpec.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field visibilityThresholdMap with type Map<TwoWayConverter<?, ?>, Float>: replace with ObjectFloatMap"
+ errorLine1="internal val visibilityThresholdMap: Map<TwoWayConverter<*, *>, Float> = mapOf("
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/animation/core/VisibilityThresholds.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<TwoWayConverter<?, ?>, Float> of getVisibilityThresholdMap: replace with ObjectFloatMap"
+ errorLine1="internal val visibilityThresholdMap: Map<TwoWayConverter<*, *>, Float> = mapOf("
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/animation/core/VisibilityThresholds.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateFloatAsState has parameter 'finishedListener' with type Function1<? super Float, Unit>."
errorLine1=" finishedListener: ((Float) -> Unit)? = null"
diff --git a/compose/animation/animation-graphics/lint-baseline.xml b/compose/animation/animation-graphics/lint-baseline.xml
index 59092e0..0208a7d 100644
--- a/compose/animation/animation-graphics/lint-baseline.xml
+++ b/compose/animation/animation-graphics/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
<issue
id="RestrictedApiAndroidX"
@@ -10,4 +10,13 @@
file="src/androidMain/kotlin/androidx/compose/animation/graphics/vector/compat/XmlAnimatorParser.android.kt"/>
</issue>
+ <issue
+ id="PrimitiveInCollection"
+ message="field builtinInterpolators with type HashMap<Integer, Easing>: replace with IntObjectMap"
+ errorLine1="private val builtinInterpolators = hashMapOf("
+ errorLine2="^">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/animation/graphics/res/AnimatorResources.android.kt"/>
+ </issue>
+
</issues>
diff --git a/compose/animation/animation/integration-tests/animation-demos/lint-baseline.xml b/compose/animation/animation/integration-tests/animation-demos/lint-baseline.xml
index cb4c4c7..ddd6c8b 100644
--- a/compose/animation/animation/integration-tests/animation-demos/lint-baseline.xml
+++ b/compose/animation/animation/integration-tests/animation-demos/lint-baseline.xml
@@ -1,5 +1,176 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<issues format="6" by="lint 8.3.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha02)" variant="all" version="8.3.0-alpha02">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1="private val colors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/layoutanimation/AnimateEnterExitDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable itemList with type List<? extends Integer>: replace with IntList"
+ errorLine1=" val itemList = itemListState.value"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/visualinspection/AnimatedVisibilityContentSizeChange.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field turquoiseColors with type List<Color>: replace with LongList"
+ errorLine1="internal val turquoiseColors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/layoutanimation/AnimatedVisiblilityLazyColumnDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Color> of getTurquoiseColors: replace with LongList"
+ errorLine1="internal val turquoiseColors = listOf("
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/layoutanimation/AnimatedVisiblilityLazyColumnDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable sizeMap with type Map<T, IntSize>: replace with ObjectLongMap"
+ errorLine1=" val sizeMap = remember { mutableMapOf<T, IntSize>() }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/lookahead/CraneDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable offsetMap with type Map<T, Offset>: replace with ObjectLongMap"
+ errorLine1=" val offsetMap = remember { mutableMapOf<T, Offset>() }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/lookahead/CraneDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1="private val colors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/gesture/FancyScrollingDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1="private val colors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithFlowRowDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1="private val colors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithIntrinsicsDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field res with type List<Integer>: replace with IntList"
+ errorLine1="val res = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithLazyColumn.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of getRes: replace with IntList"
+ errorLine1="val res = listOf("
+ errorLine2=" ~~~">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithLazyColumn.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1="private val colors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithMovableContentDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1="private val colors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithScaffold.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1="private val colors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithSubcompose.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1="private val colors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/visualinspection/SeekingDebugging.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1="private val colors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/gesture/SpringBackScrollingDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field vibrantColors with type List<Color>: replace with LongList"
+ errorLine1="private val vibrantColors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/fancy/SpringChainDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field pastelColors with type List<Color>: replace with LongList"
+ errorLine1="internal val pastelColors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/gesture/SwipeToDismissDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Color> of getPastelColors: replace with LongList"
+ errorLine1="internal val pastelColors = listOf("
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/animation/demos/gesture/SwipeToDismissDemo.kt"/>
+ </issue>
<issue
id="PrimitiveInLambda"
diff --git a/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/visualinspection/AnimatedVisibiltyContentSizeChange.kt b/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/visualinspection/AnimatedVisibilityContentSizeChange.kt
similarity index 100%
rename from compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/visualinspection/AnimatedVisibiltyContentSizeChange.kt
rename to compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/visualinspection/AnimatedVisibilityContentSizeChange.kt
diff --git a/compose/animation/animation/lint-baseline.xml b/compose/animation/animation/lint-baseline.xml
index 76c606a..d82d361 100644
--- a/compose/animation/animation/lint-baseline.xml
+++ b/compose/animation/animation/lint-baseline.xml
@@ -1,5 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha14" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable constraintsMap with type Map<S, Constraints>: replace with ObjectLongMap"
+ errorLine1=" val constraintsMap = remember { mutableMapOf<S, Constraints>() }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/animation/AnimatedContent.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor AnimatedContentMeasurePolicy has parameter constraintsMap with type Map<S, Constraints>: replace with ObjectLongMap"
+ errorLine1=" val constraintsMap: MutableMap<S, Constraints>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/animation/AnimatedContent.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field constraintsMap with type Map<S, Constraints>: replace with ObjectLongMap"
+ errorLine1=" val constraintsMap: MutableMap<S, Constraints>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/animation/AnimatedContent.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<S, Constraints> of getConstraintsMap: replace with ObjectLongMap"
+ errorLine1=" val constraintsMap: MutableMap<S, Constraints>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/animation/AnimatedContent.kt"/>
+ </issue>
<issue
id="PrimitiveInLambda"
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/lint-baseline.xml b/compose/foundation/foundation/integration-tests/foundation-demos/lint-baseline.xml
index 652b3f1..970e842d 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/lint-baseline.xml
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/lint-baseline.xml
@@ -20,6 +20,213 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="field RainbowColors with type List<Color>: replace with LongList"
+ errorLine1="private val RainbowColors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/text/BrushDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field RainbowStops with type List<Float>: replace with FloatList"
+ errorLine1="private val RainbowStops = listOf(0f, 0.2f, 0.4f, 0.6f, 0.8f, 1f)"
+ errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/text/BrushDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable options with type List<? extends Alignment>: replace with FloatList"
+ errorLine1=" val options = listOf("
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/text/ComposeLineHeight.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable options with type List<? extends Trim>: replace with IntList"
+ errorLine1=" val options = listOf("
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/text/ComposeLineHeight.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field overflowOptions with type List<TextOverflow>: replace with IntList"
+ errorLine1="private val overflowOptions = listOf(TextOverflow.Visible, TextOverflow.Ellipsis, TextOverflow.Clip)"
+ errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/text/ComposeText.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable colorList with type List<? extends Color>: replace with LongList"
+ errorLine1=" val colorList = listOf("
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/text/ComposeTextSelection.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field blendModes with type List<BlendMode>: replace with IntList"
+ errorLine1="private val blendModes = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/text/DrawTextDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field values with type SnapshotStateList<Long>: replace with LongList"
+ errorLine1=" private val values = mutableStateListOf<Long>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/text/DrawTextDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field RainbowColors with type List<Color>: replace with LongList"
+ errorLine1="private val RainbowColors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/text/DrawTextDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable list with type List<? extends Integer>: replace with IntList"
+ errorLine1=" var list by remember { mutableStateOf(List(50) { it }) }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/LazyColumnDragAndDropDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable list with type List<? extends Integer>: replace with IntList"
+ errorLine1=" var list by remember { mutableStateOf(List(50) { it }) }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/LazyGridDragAndDropDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field PagesSizes with type List<Dp>: replace with FloatList"
+ errorLine1="private val PagesSizes = (0..ItemNumber).toList().map { (50..500).random().dp }"
+ errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/snapping/LazyListSnappingDemos.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable pages with type List<? extends Color>: replace with LongList"
+ errorLine1=" val pages = listOf(Color.LightGray, Color.White, Color.DarkGray)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1="private val colors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable items with type List<? extends Color>: replace with LongList"
+ errorLine1=" val items = listOf(Color.Cyan, Color.Blue, Color.Magenta)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable heights with type List<? extends Dp>: replace with FloatList"
+ errorLine1=" val heights = remember {"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable colors with type List<? extends Color>: replace with LongList"
+ errorLine1=" val colors = remember {"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable items with type SnapshotStateList<Integer>: replace with IntList"
+ errorLine1=" val items = remember { mutableStateListOf<Int>().apply {"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable selectedIndexes with type SnapshotStateMap<Integer, Boolean>: replace with IntObjectMap"
+ errorLine1=" val selectedIndexes = remember { mutableStateMapOf<Int, Boolean>() }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable magnifierOffsets with type SnapshotStateMap<PointerId, MutableState<Offset>>: replace with LongObjectMap"
+ errorLine1=" val magnifierOffsets = remember { mutableStateMapOf<PointerId, MutableState<Offset>>() }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/MagnifierDemos.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field offsetList with type List<Integer>: replace with IntList"
+ errorLine1=" // start, middle, end of the layout"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/snapping/NonItemBasedSnapping.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field Rainbow with type List<Color>: replace with LongList"
+ errorLine1="private val Rainbow = listOf(Orange, Yellow, Green, Blue, Purple, Red)"
+ errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/text/TextFieldCursorBlinkingDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field modifierKeys with type Set<Integer>: replace with IntSet"
+ errorLine1="private val modifierKeys = setOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/foundation/demos/text/TextFieldFocusDemo.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method SnappingSlider has parameter 'onValueChange' with type Function1<? super Float, Unit>."
errorLine1=" onValueChange: (Float) -> Unit,"
diff --git a/compose/foundation/foundation/lint-baseline.xml b/compose/foundation/foundation/lint-baseline.xml
index 40e6813..9b81d37 100644
--- a/compose/foundation/foundation/lint-baseline.xml
+++ b/compose/foundation/foundation/lint-baseline.xml
@@ -47,6 +47,609 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="field anchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1=" internal val anchors = mutableMapOf<T, Float>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/gestures/AnchoredDraggable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<T, Float> of getAnchors$lint_module: replace with ObjectFloatMap"
+ errorLine1=" internal val anchors = mutableMapOf<T, Float>()"
+ errorLine2=" ~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/gestures/AnchoredDraggable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor MapDraggableAnchors has parameter anchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1="private class MapDraggableAnchors<T>(private val anchors: Map<T, Float>) : DraggableAnchors<T> {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/gestures/AnchoredDraggable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field anchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1="private class MapDraggableAnchors<T>(private val anchors: Map<T, Float>) : DraggableAnchors<T> {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/gestures/AnchoredDraggable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method genericClickableWithoutGesture has parameter currentKeyPressInteractions with type Map<Key, Press>: replace with LongObjectMap"
+ errorLine1=" currentKeyPressInteractions: MutableMap<Key, PressInteraction.Press>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field currentKeyPressInteractions with type Map<Key, Press>: replace with LongObjectMap"
+ errorLine1=" val currentKeyPressInteractions = mutableMapOf<Key, PressInteraction.Press>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Key, Press> of getCurrentKeyPressInteractions: replace with LongObjectMap"
+ errorLine1=" val currentKeyPressInteractions = mutableMapOf<Key, PressInteraction.Press>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable pinnedItems with type List<? extends Integer>: replace with IntList"
+ errorLine1=" val pinnedItems = itemProvider.calculateLazyLayoutPinnedIndices("
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGrid.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of calculateCrossAxisCellSizes: replace with IntList"
+ errorLine1=" fun Density.calculateCrossAxisCellSizes(availableSize: Int, spacing: Int): List<Int>"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridDsl.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of calculateCellsCrossAxisSizeImpl: replace with IntList"
+ errorLine1="): List<Int> {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridDsl.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method measureLazyGrid has parameter pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedItems: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method calculateExtraItems has parameter pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedItems: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor LazyGridMeasuredLine has parameter spans with type List<GridItemSpan>: replace with LongList"
+ errorLine1=" private val spans: List<GridItemSpan>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasuredLine.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field spans with type List<GridItemSpan>: replace with LongList"
+ errorLine1=" private val spans: List<GridItemSpan>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasuredLine.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method createLine has parameter spans with type List<GridItemSpan>: replace with LongList"
+ errorLine1=" spans: List<GridItemSpan>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasuredLineProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor LineConfiguration has parameter spans with type List<GridItemSpan>: replace with LongList"
+ errorLine1=" class LineConfiguration(val firstItemIndex: Int, val spans: List<GridItemSpan>)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field spans with type List<GridItemSpan>: replace with LongList"
+ errorLine1=" class LineConfiguration(val firstItemIndex: Int, val spans: List<GridItemSpan>)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<GridItemSpan> of getSpans: replace with LongList"
+ errorLine1=" class LineConfiguration(val firstItemIndex: Int, val spans: List<GridItemSpan>)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field cachedBucket with type List<Integer>: replace with IntList"
+ errorLine1=" /**"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field previousDefaultSpans with type List<GridItemSpan>: replace with LongList"
+ errorLine1=" /**"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<GridItemSpan> of getDefaultSpans: replace with LongList"
+ errorLine1=" private fun getDefaultSpans(currentSlotsPerLine: Int) ="
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable spans with type List<GridItemSpan>: replace with LongList"
+ errorLine1=" val spans = mutableListOf<GridItemSpan>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field countPerType with type Map<Object, Integer>: replace with ObjectIntMap"
+ errorLine1=" private val countPerType = mutableMapOf<Any?, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of calculateLazyLayoutPinnedIndices: replace with IntList"
+ errorLine1="): List<Int> {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutBeyondBoundsState.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" val pinnedItems = mutableListOf<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutBeyondBoundsState.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field map with type Map<Object, Integer>: replace with ObjectIntMap"
+ errorLine1=" private val map: Map<Any, Int>"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutKeyIndexMap.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field placeablesCache with type HashMap<Integer, List<Placeable>>: replace with IntObjectMap"
+ errorLine1=" /**"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutMeasureScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable pinnedItems with type List<? extends Integer>: replace with IntList"
+ errorLine1=" val pinnedItems = itemProvider.calculateLazyLayoutPinnedIndices("
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyList.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method findOrComposeLazyListHeader has parameter headerIndexes with type List<Integer>: replace with IntList"
+ errorLine1=" headerIndexes: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListHeaders.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field _headerIndexes with type List<Integer>: replace with IntList"
+ errorLine1=" private var _headerIndexes: MutableList<Int>? = null"
+ errorLine2=" ~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of getHeaderIndexes: replace with IntList"
+ errorLine1=" val headerIndexes: List<Int> get() = _headerIndexes ?: emptyList()"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable varb332e573 with type List<Integer>: replace with IntList"
+ errorLine1=" val headerIndexes: List<Int> get() = _headerIndexes ?: emptyList()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable headersIndexes with type List<Integer>: replace with IntList"
+ errorLine1=" val headersIndexes = _headerIndexes ?: mutableListOf<Int>().also {"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable varb3338ae4 with type List<Integer>: replace with IntList"
+ errorLine1=" val headersIndexes = _headerIndexes ?: mutableListOf<Int>().also {"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of getHeaderIndexes: replace with IntList"
+ errorLine1=" val headerIndexes: List<Int>"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListItemProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method measureLazyList has parameter headerIndexes with type List<Integer>: replace with IntList"
+ errorLine1=" headerIndexes: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method measureLazyList has parameter pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedItems: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method createItemsAfterList has parameter pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedItems: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method createItemsBeforeList has parameter pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedItems: List<Int>"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method measureStaggeredGrid has parameter pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedItems: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor LazyStaggeredGridMeasureContext has parameter pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" val pinnedItems: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" val pinnedItems: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of getPinnedItems: replace with IntList"
+ errorLine1=" val pinnedItems: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable pinnedItems with type List<? extends Integer>: replace with IntList"
+ errorLine1=" val pinnedItems = itemProvider.calculateLazyLayoutPinnedIndices("
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasurePolicy.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field currentItemPrefetchHandles with type Map<Integer, PrefetchHandle>: replace with IntObjectMap"
+ errorLine1=" private val currentItemPrefetchHandles = mutableMapOf<Int, PrefetchHandle>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridState.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable prefetchHandlesUsed with type Set<Integer>: replace with IntSet"
+ errorLine1=" val prefetchHandlesUsed = mutableSetOf<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridState.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method clearLeftoverPrefetchHandles has parameter prefetchHandlesUsed with type Set<Integer>: replace with IntSet"
+ errorLine1=" private fun clearLeftoverPrefetchHandles(prefetchHandlesUsed: Set<Int>) {"
+ errorLine2=" ~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridState.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method measurePager has parameter pinnedPages with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedPages: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/pager/PagerMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method createPagesAfterList has parameter pinnedPages with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedPages: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/pager/PagerMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method createPagesBeforeList has parameter pinnedPages with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedPages: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/pager/PagerMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable pinnedPages with type List<? extends Integer>: replace with IntList"
+ errorLine1=" val pinnedPages = itemProvider.calculateLazyLayoutPinnedIndices("
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/pager/PagerMeasurePolicy.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Long, Selection> of createSubSelections: replace with LongObjectMap"
+ errorLine1=" fun createSubSelections(selection: Selection): Map<Long, Selection>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor MultiSelectionLayout has parameter selectableIdToInfoListIndex with type Map<Long, Integer>: replace with LongIntMap"
+ errorLine1=" val selectableIdToInfoListIndex: Map<Long, Int>,"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field selectableIdToInfoListIndex with type Map<Long, Integer>: replace with LongIntMap"
+ errorLine1=" val selectableIdToInfoListIndex: Map<Long, Int>,"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Long, Integer> of getSelectableIdToInfoListIndex: replace with LongIntMap"
+ errorLine1=" val selectableIdToInfoListIndex: Map<Long, Int>,"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method createAndPutSubSelection has parameter $this$createAndPutSubSelection with type Map<Long, Selection>: replace with LongObjectMap"
+ errorLine1=" private fun MutableMap<Long, Selection>.createAndPutSubSelection("
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field selectableIdToInfoListIndex with type Map<Long, Integer>: replace with LongIntMap"
+ errorLine1=" private val selectableIdToInfoListIndex: MutableMap<Long, Int> = mutableMapOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable newSubselection with type Map<Long, ? extends Selection>: replace with LongObjectMap"
+ errorLine1=" val (newSelection, newSubselection) = selectAll("
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionManager.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable subselections with type Map<Long, Selection>: replace with LongObjectMap"
+ errorLine1=" val subselections = mutableMapOf<Long, Selection>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionManager.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable idToIndexMap with type Map<Long, Integer>: replace with LongIntMap"
+ errorLine1=" val idToIndexMap = mutableMapOf<Long, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionManager.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Long, Selection> of getSubselections: replace with LongObjectMap"
+ errorLine1=" val subselections: Map<Long, Selection>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrar.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field _selectableMap with type Map<Long, Selectable>: replace with LongObjectMap"
+ errorLine1=" private val _selectableMap = mutableMapOf<Long, Selectable>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImpl.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Long, Selectable> of getSelectableMap$lint_module: replace with LongObjectMap"
+ errorLine1=" internal val selectableMap: Map<Long, Selectable>"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImpl.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method setSubselections has parameter <set-?> with type Map<Long, Selection>: replace with LongObjectMap"
+ errorLine1=" override var subselections: Map<Long, Selection> by mutableStateOf(emptyMap())"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImpl.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field baselineCache with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" private var baselineCache: Map<AlignmentLine, Int>? = null"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringNode.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field baselineCache with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" private var baselineCache: MutableMap<AlignmentLine, Int>? = null"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNode.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable cache with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" var cache = baselineCache"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNode.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter 'positionalThreshold' with type Function1<? super Float, Float>."
errorLine1=" internal val positionalThreshold: (totalDistance: Float) -> Float,"
diff --git a/compose/lint/internal-lint-checks/src/main/java/androidx/compose/lint/ComposeIssueRegistry.kt b/compose/lint/internal-lint-checks/src/main/java/androidx/compose/lint/ComposeIssueRegistry.kt
index f13628f..2d45800 100644
--- a/compose/lint/internal-lint-checks/src/main/java/androidx/compose/lint/ComposeIssueRegistry.kt
+++ b/compose/lint/internal-lint-checks/src/main/java/androidx/compose/lint/ComposeIssueRegistry.kt
@@ -35,6 +35,7 @@
UnnecessaryLambdaCreationDetector.ISSUE,
PlatformReferenceInCommonModuleDetector.IMPORT_ISSUE,
PlatformReferenceInCommonModuleDetector.REFERENCE_ISSUE,
+ PrimitiveInCollectionDetector.ISSUE,
PrimitiveInLambdaDetector.ISSUE,
)
}
diff --git a/compose/lint/internal-lint-checks/src/main/java/androidx/compose/lint/PrimitiveInCollectionDetector.kt b/compose/lint/internal-lint-checks/src/main/java/androidx/compose/lint/PrimitiveInCollectionDetector.kt
new file mode 100644
index 0000000..aae7c9e
--- /dev/null
+++ b/compose/lint/internal-lint-checks/src/main/java/androidx/compose/lint/PrimitiveInCollectionDetector.kt
@@ -0,0 +1,250 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("UnstableApiUsage")
+
+package androidx.compose.lint
+
+import com.android.tools.lint.client.api.UElementHandler
+import com.android.tools.lint.detector.api.Category
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.Severity
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.intellij.lang.jvm.types.JvmType
+import com.intellij.psi.PsiPrimitiveType
+import com.intellij.psi.PsiWildcardType
+import com.intellij.psi.impl.source.PsiClassReferenceType
+import java.util.EnumSet
+import org.jetbrains.uast.UElement
+import org.jetbrains.uast.UField
+import org.jetbrains.uast.UMethod
+import org.jetbrains.uast.UVariable
+import org.jetbrains.uast.getContainingUClass
+
+/**
+ * This detects uses of Set, List, and Map with primitive type arguments. Internally, these
+ * should be replaced by the primitive-specific collections in androidx.
+ */
+class PrimitiveInCollectionDetector : Detector(), SourceCodeScanner {
+ override fun getApplicableUastTypes() = listOf<Class<out UElement>>(
+ UMethod::class.java,
+ UVariable::class.java
+ )
+
+ override fun createUastHandler(context: JavaContext) = object : UElementHandler() {
+ override fun visitMethod(node: UMethod) {
+ if (context.evaluator.isOverride(node) ||
+ node.isDataClassGeneratedMethod(context)
+ ) {
+ return
+ }
+
+ val primitiveCollection = node.returnType?.primitiveCollectionReplacement(context)
+ if (primitiveCollection != null) {
+ // The location doesn't appear to work with property types with getters rather than
+ // full fields. Target the property name instead if we don't have a location.
+ val target = if (context.getLocation(node.returnTypeReference).start == null) {
+ node
+ } else {
+ node.returnTypeReference
+ }
+ report(
+ context,
+ node,
+ target,
+ "return type ${node.returnType?.presentableText} of ${node.name}:" +
+ " replace with $primitiveCollection"
+ )
+ }
+ }
+
+ override fun visitVariable(node: UVariable) {
+ val primitiveCollection = node.type.primitiveCollectionReplacement(context) ?: return
+ if (node.isLambdaParameter()) {
+ // Don't notify for lambda parameters. We'll be notifying for the method
+ // that accepts the lambda, so we already have it flagged there. The
+ // person using it doesn't really have a choice about the parameters that
+ // are passed.
+ return
+ }
+ val parent = node.uastParent
+ val messageContext = if (parent is UMethod) {
+ // Data class constructor parameters are caught 4 times:
+ // 1) constructor method parameter
+ // 2) the field of the backing 'val'
+ // 3) the getter for the field
+ // 4) the generated copy() method.
+ // We can eliminate the copy() at least, even if we get duplicates for the
+ // other 3. It would be ideal to eliminate 2 of the other 3, but it isn't
+ // easy to do and still catch all uses.
+ if (context.evaluator.isOverride(parent) ||
+ (context.evaluator.isData(parent) && parent.name.startsWith("copy"))
+ ) {
+ return
+ }
+ val methodName = if (parent.isConstructor) {
+ "constructor ${parent.getContainingUClass()?.name}"
+ } else {
+ "method ${parent.name}"
+ }
+ "$methodName has parameter ${node.name} " +
+ "with type ${node.type.presentableText}: replace with $primitiveCollection"
+ } else {
+ val varOrField = if (node is UField) "field" else "variable"
+
+ "$varOrField ${node.name} with type ${node.type.presentableText}: replace" +
+ " with $primitiveCollection"
+ }
+ report(
+ context,
+ node,
+ node.typeReference,
+ messageContext
+ )
+ }
+ }
+
+ private fun report(context: JavaContext, node: UElement, target: Any?, message: String) {
+ val location = if (target == null) {
+ context.getLocation(node)
+ } else {
+ context.getLocation(target)
+ }
+ context.report(
+ issue = ISSUE,
+ scope = node,
+ location = location,
+ message = message
+ )
+ }
+
+ companion object {
+ private const val PrimitiveInCollectionId = "PrimitiveInCollection"
+
+ val ISSUE = Issue.create(
+ id = PrimitiveInCollectionId,
+ briefDescription = "A primitive (Short, Int, Long, Char, Float, Double) or " +
+ "a value class wrapping a primitive was used as in a collection. Primitive " +
+ "versions of collections exist.",
+ explanation = "Using a primitive type in a collection will autobox the primitive " +
+ "value, causing an allocation. To avoid the allocation, use one of the androidx " +
+ "collections designed for use with primitives. For example instead of Set<Int>, " +
+ "use IntSet.",
+ category = Category.PERFORMANCE, priority = 3, severity = Severity.ERROR,
+ implementation = Implementation(
+ PrimitiveInCollectionDetector::class.java,
+ EnumSet.of(Scope.JAVA_FILE)
+ )
+ )
+ }
+}
+
+private val SetType = java.util.Set::class.java.canonicalName
+private val ListType = java.util.List::class.java.canonicalName
+private val MapType = java.util.Map::class.java.canonicalName
+
+// Map from the kotlin type to the primitive type used in the collection
+// e.g. Set<Byte> -> IntSet
+private val BoxedTypeToSuggestedPrimitive = mapOf(
+ "java.lang.Byte" to "Int",
+ "java.lang.Character" to "Int",
+ "java.lang.Short" to "Int",
+ "java.lang.Integer" to "Int",
+ "java.lang.Long" to "Long",
+ "java.lang.Float" to "Float",
+ "java.lang.Double" to "Float",
+ "kotlin.UByte" to "Int",
+ "kotlin.UShort" to "Int",
+ "kotlin.UInt" to "Int",
+ "kotlin.ULong" to "Long",
+)
+
+private fun JvmType.primitiveCollectionReplacement(context: JavaContext): String? {
+ if (this !is PsiClassReferenceType) return null
+ val resolved = resolve() ?: return null
+ val evaluator = context.evaluator
+ if (evaluator.inheritsFrom(resolved, SetType, false)) {
+ val typeArgument = typeArguments().firstOrNull() ?: return null
+ val elementPrimitive = typeArgument.primitiveName()
+ if (elementPrimitive != null) {
+ return "${elementPrimitive}Set"
+ }
+ } else if (evaluator.inheritsFrom(resolved, ListType, false)) {
+ val typeArgument = typeArguments().firstOrNull() ?: return null
+ val elementPrimitive = typeArgument.primitiveName()
+ if (elementPrimitive != null) {
+ return "${elementPrimitive}List"
+ }
+ } else if (evaluator.inheritsFrom(resolved, MapType, false)) {
+ val keyType = typeArguments().firstOrNull() ?: return null
+ val valueType = typeArguments().lastOrNull() ?: return null
+ val keyPrimitive = keyType.primitiveName()
+ val valuePrimitive = valueType.primitiveName()
+ if (keyPrimitive != null) {
+ return if (valuePrimitive != null) {
+ "$keyPrimitive${valuePrimitive}Map"
+ } else {
+ "${keyPrimitive}ObjectMap"
+ }
+ } else if (valuePrimitive != null) {
+ return "Object${valuePrimitive}Map"
+ }
+ }
+ return null
+}
+
+private fun JvmType.primitiveName(): String? = when (this) {
+ is PsiClassReferenceType -> toPrimitiveName()
+ is PsiWildcardType -> {
+ val bound = if (isBounded) {
+ bound!!
+ } else {
+ superBound
+ }
+ when (bound) {
+ is PsiClassReferenceType -> bound.toPrimitiveName()
+ is PsiPrimitiveType -> BoxedTypeToSuggestedPrimitive[bound.boxedTypeName]
+ else -> null
+ }
+ }
+
+ else -> null
+}
+
+private fun PsiClassReferenceType.toPrimitiveName(): String? {
+ val resolvedType = resolve() ?: return null
+ if (hasJvmInline(resolvedType)) {
+ val constructorParam =
+ resolvedType.constructors.firstOrNull { it.parameters.size == 1 }?.parameters?.first()
+ ?: resolvedType.methods.firstOrNull {
+ it.parameters.size == 1 && it.name == "constructor-impl"
+ }?.parameters?.first()
+ if (constructorParam != null) {
+ val type = constructorParam.type
+ if (type is PsiPrimitiveType) {
+ return BoxedTypeToSuggestedPrimitive[type.boxedTypeName]
+ }
+ if (type is PsiClassReferenceType) {
+ return type.toPrimitiveName()
+ }
+ }
+ }
+ return BoxedTypeToSuggestedPrimitive[resolvedType.qualifiedName]
+}
diff --git a/compose/lint/internal-lint-checks/src/main/java/androidx/compose/lint/PrimitiveInLambdaDetector.kt b/compose/lint/internal-lint-checks/src/main/java/androidx/compose/lint/PrimitiveInLambdaDetector.kt
index e60cb01..2d8eda3 100644
--- a/compose/lint/internal-lint-checks/src/main/java/androidx/compose/lint/PrimitiveInLambdaDetector.kt
+++ b/compose/lint/internal-lint-checks/src/main/java/androidx/compose/lint/PrimitiveInLambdaDetector.kt
@@ -256,7 +256,7 @@
return resolvedType.qualifiedName in BoxedPrimitives
}
-private fun hasJvmInline(type: PsiClass): Boolean {
+internal fun hasJvmInline(type: PsiClass): Boolean {
for (annotation in type.annotations) {
if (annotation.qualifiedName == JvmInlineAnnotation) {
return true
diff --git a/compose/lint/internal-lint-checks/src/test/java/androidx/compose/lint/PrimitiveInCollectionDetectorTest.kt b/compose/lint/internal-lint-checks/src/test/java/androidx/compose/lint/PrimitiveInCollectionDetectorTest.kt
new file mode 100644
index 0000000..251dd7d
--- /dev/null
+++ b/compose/lint/internal-lint-checks/src/test/java/androidx/compose/lint/PrimitiveInCollectionDetectorTest.kt
@@ -0,0 +1,496 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.lint
+
+import androidx.compose.lint.test.kotlinAndBytecodeStub
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Issue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+
+/* ktlint-disable max-line-length */
+@RunWith(Parameterized::class)
+class PrimitiveInCollectionDetectorTest(
+ parameters: Parameters
+) : LintDetectorTest() {
+
+ private val type = parameters.type
+ private val value = parameters.value
+ private val longType = parameters.longType
+ private val collectionType = parameters.collectionType
+
+ override fun getDetector(): Detector = PrimitiveInCollectionDetector()
+
+ override fun getIssues(): MutableList<Issue> =
+ mutableListOf(PrimitiveInCollectionDetector.ISSUE)
+
+ private val tild = "~".repeat(type.length)
+ private val vtild = "~".repeat(value.length)
+
+ @Test
+ fun functionWithSetReturnType() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo(): Set<$type>? = null
+ fun bar(): Set<String>? = null // no warning for this
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:4: Error: return type Set<$longType> of foo: replace with ${collectionType}Set [PrimitiveInCollection]
+ fun foo(): Set<$type>? = null
+ ~~~~$tild~~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun functionWithSetClassReturnType() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo(): HashSet<$type>? = null
+ fun bar(): HashSet<String>? = null // no warning for this
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:4: Error: return type HashSet<$longType> of foo: replace with ${collectionType}Set [PrimitiveInCollection]
+ fun foo(): HashSet<$type>? = null
+ ~~~~~~~~$tild~~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun functionWithListReturnType() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo(): List<$type>? = null
+ fun bar(): List<String>? = null // no warning for this
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:4: Error: return type List<$longType> of foo: replace with ${collectionType}List [PrimitiveInCollection]
+ fun foo(): List<$type>? = null
+ ~~~~$tild~~~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun functionWithListClassReturnType() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo(): ArrayList<$type>? = null
+ fun bar(): ArrayList<String>? = null // no warning for this
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:4: Error: return type ArrayList<$longType> of foo: replace with ${collectionType}List [PrimitiveInCollection]
+ fun foo(): ArrayList<$type>? = null
+ ~~~~~~~~~~$tild~~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun functionWithMapReturnType() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo(): Map<$type, Any>? = null
+ fun bar(): Map<String, Any>? = null // no warning for this
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:4: Error: return type Map<$longType, Object> of foo: replace with ${collectionType}ObjectMap [PrimitiveInCollection]
+ fun foo(): Map<$type, Any>? = null
+ ~~~~$tild~~~~~~~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun functionWithMapClassReturnType() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo(): HashMap<$type, Any>? = null
+ fun bar(): HashMap<String, Any>? = null // no warning for this
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:4: Error: return type HashMap<$longType, Object> of foo: replace with ${collectionType}ObjectMap [PrimitiveInCollection]
+ fun foo(): HashMap<$type, Any>? = null
+ ~~~~~~~~$tild~~~~~~~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun variableSet() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo() {
+ val s = mutableSetOf($value)
+ println(s)
+ }
+ fun bar() {
+ // no warning for this
+ val s = mutableSetOf("Hello", "World")
+ println(s)
+ }
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:5: Error: variable s with type Set<$longType>: replace with ${collectionType}Set [PrimitiveInCollection]
+ val s = mutableSetOf($value)
+ ~~~~~~~~~~~~~~~~~~~~~$vtild~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun variableHashSet() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo() {
+ val s = HashSet<$type>()
+ println(s)
+ }
+ fun bar() {
+ // no warning for this
+ val s = HashSet<String>()
+ println(s)
+ }
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:5: Error: variable s with type HashSet<$longType>: replace with ${collectionType}Set [PrimitiveInCollection]
+ val s = HashSet<$type>()
+ ~~~~~~~~~~~~~~~~$tild~~~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun variableList() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo() {
+ val s = mutableListOf($value)
+ println(s)
+ }
+ fun bar() {
+ // no warning for this
+ val s = mutableListOf("Hello", "World")
+ println(s)
+ }
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:5: Error: variable s with type List<$longType>: replace with ${collectionType}List [PrimitiveInCollection]
+ val s = mutableListOf($value)
+ ~~~~~~~~~~~~~~~~~~~~~~$vtild~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun variableArrayList() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo() {
+ val s = ArrayList<$type>()
+ println(s)
+ }
+ fun bar() {
+ // no warning for this
+ val s = ArrayList<String>()
+ println(s)
+ }
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:5: Error: variable s with type ArrayList<$longType>: replace with ${collectionType}List [PrimitiveInCollection]
+ val s = ArrayList<$type>()
+ ~~~~~~~~~~~~~~~~~~$tild~~~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun variableHashMap() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo() {
+ val s = mutableMapOf("Hello" to $value)
+ println(s)
+ }
+ fun bar() {
+ // no warning for this
+ val s = mutableMapOf("Hello" to "World")
+ println(s)
+ }
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:5: Error: variable s with type Map<String, $longType>: replace with Object${collectionType}Map [PrimitiveInCollection]
+ val s = mutableMapOf("Hello" to $value)
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~$vtild~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun variableMap() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo() {
+ val s = HashMap<$type, String>()
+ println(s)
+ }
+ fun bar() {
+ // no warning for this
+ val s = HashMap<String, String>()
+ println(s)
+ }
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:5: Error: variable s with type HashMap<$longType, String>: replace with ${collectionType}ObjectMap [PrimitiveInCollection]
+ val s = HashMap<$type, String>()
+ ~~~~~~~~~~~~~~~~$tild~~~~~~~~~~~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun variablePrimitivePrimitiveMap() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ fun foo() {
+ val s = HashMap<$type, $type>()
+ println(s)
+ }
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/test.kt:5: Error: variable s with type HashMap<$longType, $longType>: replace with ${collectionType}${collectionType}Map [PrimitiveInCollection]
+ val s = HashMap<$type, $type>()
+ ~~~~~~~~~~~~~~~~$tild~~$tild~~~
+1 errors, 0 warnings
+ """
+ )
+ }
+
+ @Test
+ fun dataClassConstructor() {
+ lint().files(
+ ContainsIntClass,
+ SimpleValueClass.bytecode,
+ kotlin(
+ """
+ package androidx.compose.lint
+
+ data class Foo(val foo: Set<$type>)
+ """
+ )
+ ).run().expect(
+ """
+src/androidx/compose/lint/Foo.kt:4: Error: constructor Foo has parameter foo with type Set<$longType>: replace with ${collectionType}Set [PrimitiveInCollection]
+ data class Foo(val foo: Set<$type>)
+ ~~~~$tild~
+src/androidx/compose/lint/Foo.kt:4: Error: field foo with type Set<$longType>: replace with ${collectionType}Set [PrimitiveInCollection]
+ data class Foo(val foo: Set<$type>)
+ ~~~~$tild~
+src/androidx/compose/lint/Foo.kt:4: Error: return type Set<$longType> of getFoo: replace with ${collectionType}Set [PrimitiveInCollection]
+ data class Foo(val foo: Set<$type>)
+ ~~~~$tild~
+3 errors, 0 warnings
+ """
+ )
+ }
+
+ data class Parameters(
+ val type: String,
+ val value: String,
+ val longType: String,
+ val collectionType: String
+ )
+
+ companion object {
+ @JvmStatic
+ @Parameterized.Parameters(name = "{0}")
+ fun initParameters() = listOf(
+ Parameters("Char", "'a'", "Character", "Int"),
+ Parameters("Byte", "0.toByte()", "Byte", "Int"),
+ Parameters("UByte", "0u.toUByte()", "UByte", "Int"),
+ Parameters("Short", "0.toShort()", "Short", "Int"),
+ Parameters("UShort", "0u.toUShort()", "UShort", "Int"),
+ Parameters("Int", "1", "Integer", "Int"),
+ Parameters("UInt", "1u", "UInt", "Int"),
+ Parameters("Long", "1L", "Long", "Long"),
+ Parameters("ULong", "1uL", "ULong", "Long"),
+ Parameters("Float", "1f", "Float", "Float"),
+ Parameters("Double", "1.0", "Double", "Float"),
+ Parameters("ContainsInt", "ContainsInt(0)", "ContainsInt", "Int"),
+ Parameters("test.SimpleValueClass", "test.SimpleValueClass(0)", "SimpleValueClass", "Int")
+ )
+
+ val ContainsIntClass = kotlin(
+ """
+ package androidx.compose.lint
+
+ @JvmInline value class ContainsInt(val value: Int)
+ """.trimIndent()
+ )
+
+ val SimpleValueClass = kotlinAndBytecodeStub(
+ filename = "SimpleValueClass.kt",
+ filepath = "test",
+ checksum = 0xc2548512,
+ source = """
+ package test
+
+ @JvmInline
+ value class SimpleValueClass(val value: Int)
+ """.trimIndent(),
+ """
+ META-INF/main.kotlin_module:
+ H4sIAAAAAAAA/2NgYGBmYGBgBGIOBihQYtBiAABw+ypgGAAAAA==
+ """,
+ """
+ test/SimpleValueClass.class:
+ H4sIAAAAAAAA/31U31MbVRT+7s2vzWaBTaBAFtT+0DbhR5NirVUKUtDapaGt
+ UKMUfVjCTlhINpjdZOob44v+BT74ouOLfeBBZxTQzjhI3/ybHMdzN5uEWTLO
+ ZPbee+75zvnOd87N3//+8SeAm/ic4YJrOm5uzaruVcyiUWmYSxXDcWJgDOqO
+ 0TRyFcMu5x5t7pglN4YQg1Q2Xc+RIZTJ6gyRZuvEdAUxSHFwxBnC7rblMIwU
+ esafZehza2tu3bLL0+KOiGT0bKGbsXVHfiNB22LDqmyZ9RgGGKJ3LNty5z0q
+ RQVJpGSoGCRUMGPGYzkn4QKhjL09095imM6cz3iehJ9wVsEIRkX8NMN4L7Zn
+ HceE47hwXPp/x1eF42uka1sPhqFMDyUUXMJl4XuFxDXq5byCPvTLpPZVEnPb
+ cLaXalumL2aY6FFrkt0ouu2aZaHaBKVqeyuYQlbGJKYVZMSOI8eQML9oGBXH
+ DzWc0QvBQZjNPmWQG/Zm7ZnnpeBNRAX6Jo1Dzd026wyp8yhSvhVadLtXUAU3
+ MCPivNsqoSgjLLqplmq249YbJbdW92lJ7dwMmuhF7zETI3FHBLxL89lkUM6U
+ lieuGV0XpfC9G+IzQ9UWdmtuxbJzO81qbrlZ1W06mMQ82b5YMV1jy3ANsvFq
+ M0TviImPJD6gLLtkf2aJEyXgWxT495P9yzIf5TJXT/Zl+nFVkrkUoTVBa5TW
+ flpD0unXC6Mn+zM8zxZTqajKNZ4PvTxmJ/unP0bDUliNLGuqRMb4jKTKWniU
+ 5dn9l9+GvNuEqiyrap+AkI15tn5CqOoA2dSOLammVpOt0HSWiI4WlqJq7PQb
+ xlu5vuJhYpM+fR4dFAWQKFSW+sCr/nHF+LJcrzXE4xkMqn1916W2ibliGCiQ
+ bA8b1U2z/sTYrJhiHmolo1I06pY4+8a+Ndco7a4Ye/5ZXqs16iXzniUO6dWG
+ 7VpVs2g5Ft3ete2aa7gWjQKNCafJEMRS4j+HdqLTEUTJ8gmdcqITtEYmfoV8
+ QBuOT+kb9YyDWPcAngMStAPi4jH54LfJW9ylX0BdP8JQavgQmnaIV9TsIS4e
+ 4vWfvczdIGm84XFg4on6Qa76DCTB4BjXghipk5geno+50matHeP6QQAQ6SSZ
+ 6pQZSJIPYrpJ6F35mEdUnZhObfIv8O8QCR1MnoAf4q05bfx7cQy39HpK3xh4
+ /B/0t0IOk5FgPg2xu0VSCQK38Y4fXPRFeMUFocljzHYZteBxn5HYeXCViyfq
+ w+d9uDxxhLmJsd8g/9Kzd61YcieW7A0Bo5jzHTEv+tpwLagKb42MmsZ7WPC9
+ r5Em4i7+AnxdO8JisF9xLHmgpPirC/arPWWsx2Sl8T4+CNSX0MZ+QCz8E8Kh
+ rtgREnvhrFYJ3POlTuBDrz6ODc+9iM9o3aXdfVp1gi5vIKTjgY6CjhU8pC0e
+ 6XiMjzbAHKxibQNDDhQHTxzEvO+8g6yDiIOog9ue5Ra9KwczDqYcZBxc8ox9
+ DvodfPwfuO9oETMIAAA=
+ """
+ )
+ }
+}
diff --git a/compose/material/material/integration-tests/material-catalog/lint-baseline.xml b/compose/material/material/integration-tests/material-catalog/lint-baseline.xml
index 9bb779f..f25613e 100644
--- a/compose/material/material/integration-tests/material-catalog/lint-baseline.xml
+++ b/compose/material/material/integration-tests/material-catalog/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta02" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta02)" variant="all" version="8.1.0-beta02">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
<issue
id="PrimitiveInLambda"
diff --git a/compose/material/material/integration-tests/material-demos/lint-baseline.xml b/compose/material/material/integration-tests/material-demos/lint-baseline.xml
index d63f46c..4df099c 100644
--- a/compose/material/material/integration-tests/material-demos/lint-baseline.xml
+++ b/compose/material/material/integration-tests/material-demos/lint-baseline.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field elevations with type List<Dp>: replace with FloatList"
+ errorLine1="private val elevations = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/material/demos/ElevationDemo.kt"/>
+ </issue>
<issue
id="PrimitiveInLambda"
diff --git a/compose/material/material/lint-baseline.xml b/compose/material/material/lint-baseline.xml
index 9b47bc3..e970d35 100644
--- a/compose/material/material/lint-baseline.xml
+++ b/compose/material/material/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
<issue
id="BanThreadSleep"
@@ -137,6 +137,267 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="variable crossAxisSizes with type List<Integer>: replace with IntList"
+ errorLine1=" val crossAxisSizes = mutableListOf<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/AlertDialog.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable crossAxisPositions with type List<Integer>: replace with IntList"
+ errorLine1=" val crossAxisPositions = mutableListOf<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/AlertDialog.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field anchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1=" internal val anchors = mutableMapOf<T, Float>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<T, Float> of getAnchors$lint_module: replace with ObjectFloatMap"
+ errorLine1=" internal val anchors = mutableMapOf<T, Float>()"
+ errorLine2=" ~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor MapDraggableAnchors has parameter anchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1="private class MapDraggableAnchors<T>(private val anchors: Map<T, Float>) : DraggableAnchors<T> {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field anchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1="private class MapDraggableAnchors<T>(private val anchors: Map<T, Float>) : DraggableAnchors<T> {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method BaselinesOffsetColumn has parameter offsets with type List<Dp>: replace with FloatList"
+ errorLine1=" offsets: List<Dp>,"
+ errorLine2=" ~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/ListItem.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable tickFractions with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val tickFractions = remember(steps) {"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable tickFractions with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val tickFractions = remember(steps) {"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method SliderImpl has parameter tickFractions with type List<Float>: replace with FloatList"
+ errorLine1=" tickFractions: List<Float>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method RangeSliderImpl has parameter tickFractions with type List<Float>: replace with FloatList"
+ errorLine1=" tickFractions: List<Float>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method Track has parameter tickFractions with type List<Float>: replace with FloatList"
+ errorLine1=" tickFractions: List<Float>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method snapValueToTick has parameter tickFractions with type List<Float>: replace with FloatList"
+ errorLine1=" tickFractions: List<Float>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Float> of stepsToTickFractions: replace with FloatList"
+ errorLine1="private fun stepsToTickFractions(steps: Int): List<Float> {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable anchors with type Map<Float, DismissValue>: replace with FloatObjectMap"
+ errorLine1=" val anchors = mutableMapOf(0f to Default)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/SwipeToDismiss.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method setAnchors$lint_module has parameter <set-?> with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" internal var anchors by mutableStateOf(emptyMap<Float, T>())"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Float, T> of getAnchors$lint_module: replace with FloatObjectMap"
+ errorLine1=" internal var anchors by mutableStateOf(emptyMap<Float, T>())"
+ errorLine2=" ~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ensureInit$lint_module has parameter newAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" internal fun ensureInit(newAnchors: Map<Float, T>) {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method processNewAnchors$lint_module has parameter oldAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" oldAnchors: Map<Float, T>,"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method processNewAnchors$lint_module has parameter newAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" newAnchors: Map<Float, T>"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable bounds with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val bounds = findBounds(offset.value, anchors.keys)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method swipeable has parameter anchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" anchors: Map<Float, T>,"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable oldAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" val oldAnchors = state.anchors"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method findBounds has parameter anchors with type Set<Float>: replace with FloatSet"
+ errorLine1=" anchors: Set<Float>"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Float> of findBounds: replace with FloatList"
+ errorLine1="): List<Float> {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method computeTarget has parameter anchors with type Set<Float>: replace with FloatSet"
+ errorLine1=" anchors: Set<Float>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable bounds with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val bounds = findBounds(offset, anchors)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method getOffset has parameter $this$getOffset with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1="private fun <T> Map<Float, T>.getOffset(state: T): Float? {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method resistanceConfig has parameter anchors with type Set<Float>: replace with FloatSet"
+ errorLine1=" anchors: Set<Float>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter 'positionalThreshold' with type Function1<? super Float, Float>."
errorLine1=" internal val positionalThreshold: (totalDistance: Float) -> Float,"
diff --git a/compose/material3/material3-window-size-class/lint-baseline.xml b/compose/material3/material3-window-size-class/lint-baseline.xml
new file mode 100644
index 0000000..41ded8f
--- /dev/null
+++ b/compose/material3/material3-window-size-class/lint-baseline.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method calculateFromSize has parameter supportedWidthSizeClasses with type Set<WindowWidthSizeClass>: replace with IntSet"
+ errorLine1=" supportedWidthSizeClasses: Set<WindowWidthSizeClass> ="
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/windowsizeclass/WindowSizeClass.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method calculateFromSize has parameter supportedHeightSizeClasses with type Set<WindowHeightSizeClass>: replace with IntSet"
+ errorLine1=" supportedHeightSizeClasses: Set<WindowHeightSizeClass> ="
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/windowsizeclass/WindowSizeClass.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field DefaultSizeClasses with type Set<WindowWidthSizeClass>: replace with IntSet"
+ errorLine1=" /**"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/windowsizeclass/WindowSizeClass.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Set<WindowWidthSizeClass> of getDefaultSizeClasses: replace with IntSet"
+ errorLine1=" val DefaultSizeClasses = setOf(Compact, Medium, Expanded)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/windowsizeclass/WindowSizeClass.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Set<WindowWidthSizeClass> of getStandardSizeClasses: replace with IntSet"
+ errorLine1=" val StandardSizeClasses get() = DefaultSizeClasses"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/windowsizeclass/WindowSizeClass.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method fromWidth$lint_module has parameter supportedSizeClasses with type Set<WindowWidthSizeClass>: replace with IntSet"
+ errorLine1=" supportedSizeClasses: Set<WindowWidthSizeClass>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/windowsizeclass/WindowSizeClass.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable sortedSizeClasses with type List<? extends WindowWidthSizeClass>: replace with IntList"
+ errorLine1=" val sortedSizeClasses = supportedSizeClasses.sortedDescending()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/windowsizeclass/WindowSizeClass.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field DefaultSizeClasses with type Set<WindowHeightSizeClass>: replace with IntSet"
+ errorLine1=" /**"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/windowsizeclass/WindowSizeClass.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Set<WindowHeightSizeClass> of getDefaultSizeClasses: replace with IntSet"
+ errorLine1=" val DefaultSizeClasses = setOf(Compact, Medium, Expanded)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/windowsizeclass/WindowSizeClass.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Set<WindowHeightSizeClass> of getStandardSizeClasses: replace with IntSet"
+ errorLine1=" val StandardSizeClasses get() = DefaultSizeClasses"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/windowsizeclass/WindowSizeClass.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method fromHeight$lint_module has parameter supportedSizeClasses with type Set<WindowHeightSizeClass>: replace with IntSet"
+ errorLine1=" supportedSizeClasses: Set<WindowHeightSizeClass>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/windowsizeclass/WindowSizeClass.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable sortedSizeClasses with type List<? extends WindowHeightSizeClass>: replace with IntList"
+ errorLine1=" val sortedSizeClasses = supportedSizeClasses.sortedDescending()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/windowsizeclass/WindowSizeClass.kt"/>
+ </issue>
+
+</issues>
diff --git a/compose/material3/material3/integration-tests/material3-catalog/lint-baseline.xml b/compose/material3/material3/integration-tests/material3-catalog/lint-baseline.xml
index 8c7461b..98d1a1f 100644
--- a/compose/material3/material3/integration-tests/material3-catalog/lint-baseline.xml
+++ b/compose/material3/material3/integration-tests/material3-catalog/lint-baseline.xml
@@ -1,5 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta02" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta02)" variant="all" version="8.1.0-beta02">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor Theme has parameter map with type Map<String, Float>: replace with ObjectFloatMap"
+ errorLine1=" constructor(map: Map<String, Float>) : this("
+ errorLine2=" ~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/material3/catalog/library/model/Themes.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<String, Float> of toMap: replace with ObjectFloatMap"
+ errorLine1=" fun toMap() = mapOf("
+ errorLine2=" ~~~~~">
+ <location
+ file="src/main/java/androidx/compose/material3/catalog/library/model/Themes.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable themeMap with type Map<String, ? extends Float>: replace with ObjectFloatMap"
+ errorLine1=" val themeMap = themeString.substring(1, themeString.length - 1)"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/material3/catalog/library/data/UserPreferencesRepository.kt"/>
+ </issue>
<issue
id="PrimitiveInLambda"
diff --git a/compose/material3/material3/lint-baseline.xml b/compose/material3/material3/lint-baseline.xml
index bf09410..a698498 100644
--- a/compose/material3/material3/lint-baseline.xml
+++ b/compose/material3/material3/lint-baseline.xml
@@ -173,6 +173,267 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="variable crossAxisSizes with type List<Integer>: replace with IntList"
+ errorLine1=" val crossAxisSizes = mutableListOf<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/AlertDialog.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable crossAxisPositions with type List<Integer>: replace with IntList"
+ errorLine1=" val crossAxisPositions = mutableListOf<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/AlertDialog.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field anchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1=" internal val anchors = mutableMapOf<T, Float>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/AnchoredDraggable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<T, Float> of getAnchors$lint_module: replace with ObjectFloatMap"
+ errorLine1=" internal val anchors = mutableMapOf<T, Float>()"
+ errorLine2=" ~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/AnchoredDraggable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor MapDraggableAnchors has parameter anchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1="private class MapDraggableAnchors<T>(private val anchors: Map<T, Float>) : DraggableAnchors<T> {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/AnchoredDraggable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field anchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1="private class MapDraggableAnchors<T>(private val anchors: Map<T, Float>) : DraggableAnchors<T> {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/AnchoredDraggable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable xCandidates with type List<? extends Integer>: replace with IntList"
+ errorLine1=" val xCandidates = listOf("
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/MenuPosition.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable yCandidates with type List<? extends Integer>: replace with IntList"
+ errorLine1=" val yCandidates = listOf("
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/MenuPosition.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable anchors with type Map<Float, ? extends DrawerValue>: replace with FloatObjectMap"
+ errorLine1=" val anchors = mapOf(minValue to DrawerValue.Closed, maxValue to DrawerValue.Open)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/NavigationDrawer.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable anchors with type Map<Float, ? extends DrawerValue>: replace with FloatObjectMap"
+ errorLine1=" val anchors = mapOf(minValue to DrawerValue.Closed, maxValue to DrawerValue.Open)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/NavigationDrawer.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method setAnchors$lint_module has parameter <set-?> with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" internal var anchors by mutableStateOf(emptyMap<Float, T>())"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Float, T> of getAnchors$lint_module: replace with FloatObjectMap"
+ errorLine1=" internal var anchors by mutableStateOf(emptyMap<Float, T>())"
+ errorLine2=" ~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ensureInit$lint_module has parameter newAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" internal fun ensureInit(newAnchors: Map<Float, T>) {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method processNewAnchors$lint_module has parameter oldAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" oldAnchors: Map<Float, T>,"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method processNewAnchors$lint_module has parameter newAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" newAnchors: Map<Float, T>"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable bounds with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val bounds = findBounds(offset.floatValue, anchors.keys)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method swipeable has parameter anchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" anchors: Map<Float, T>,"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable oldAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" val oldAnchors = state.anchors"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method findBounds has parameter anchors with type Set<Float>: replace with FloatSet"
+ errorLine1=" anchors: Set<Float>"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Float> of findBounds: replace with FloatList"
+ errorLine1="): List<Float> {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method computeTarget has parameter anchors with type Set<Float>: replace with FloatSet"
+ errorLine1=" anchors: Set<Float>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable bounds with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val bounds = findBounds(offset, anchors)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method getOffset has parameter $this$getOffset with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1="private fun <T> Map<Float, T>.getOffset(state: T): Float? {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method resistanceConfig$lint_module has parameter anchors with type Set<Float>: replace with FloatSet"
+ errorLine1=" anchors: Set<Float>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable tabContentWidths with type List<Dp>: replace with FloatList"
+ errorLine1=" val tabContentWidths = mutableListOf<Dp>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/TabRow.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of getValues$lint_module: replace with IntList"
+ errorLine1=" internal val values get() = if (selection == Selection.Minute) Minutes else Hours"
+ errorLine2=" ~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/TimePicker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field Minutes with type List<Integer>: replace with IntList"
+ errorLine1="private val Minutes = listOf(0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55)"
+ errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/TimePicker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field Hours with type List<Integer>: replace with IntList"
+ errorLine1="private val Hours = listOf(12, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)"
+ errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/TimePicker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field ExtraHours with type List<Integer>: replace with IntList"
+ errorLine1="private val ExtraHours = Hours.fastMap { (it % 12 + 12) }"
+ errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/material3/TimePicker.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheetScaffoldLayout has parameter 'bottomSheet' with type Function1<? super Integer, Unit>."
errorLine1=" bottomSheet: @Composable (layoutHeight: Int) -> Unit,"
diff --git a/compose/runtime/runtime/lint-baseline.xml b/compose/runtime/runtime/lint-baseline.xml
index 9776ca0..5684201 100644
--- a/compose/runtime/runtime/lint-baseline.xml
+++ b/compose/runtime/runtime/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0)" variant="all" version="8.1.0">
+<issues format="6" by="lint 8.3.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha02)" variant="all" version="8.3.0-alpha02">
<issue
id="BanSuppressTag"
@@ -56,6 +56,303 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="variable useDefault with type List<? extends Integer>: replace with IntList"
+ errorLine1=" val useDefault ="
+ errorLine2=" ^">
+ <location
+ file="src/jvmMain/kotlin/androidx/compose/runtime/reflect/ComposableMethod.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field groupInfos with type HashMap<Integer, GroupInfo>: replace with IntObjectMap"
+ errorLine1=" private val groupInfos = run {"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/Composer.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable result with type HashMap<Integer, GroupInfo>: replace with IntObjectMap"
+ errorLine1=" val result = hashMapOf<Int, GroupInfo>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/Composer.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field nodeCountVirtualOverrides with type HashMap<Integer, Integer>: replace with IntIntMap"
+ errorLine1=" private var nodeCountVirtualOverrides: HashMap<Int, Int>? = null"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/Composer.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable var6316285d with type HashMap<Integer, Integer>: replace with IntIntMap"
+ errorLine1=" val virtualCounts = nodeCountVirtualOverrides ?: run {"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/Composer.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable virtualCounts with type HashMap<Integer, Integer>: replace with IntIntMap"
+ errorLine1=" val virtualCounts = nodeCountVirtualOverrides ?: run {"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/Composer.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable newCounts with type HashMap<Integer, Integer>: replace with IntIntMap"
+ errorLine1=" val newCounts = HashMap<Int, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/Composer.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field intParams with type List<IntParameter>: replace with IntList"
+ errorLine1=" val intParams = List(ints) { index -> IntParameter(index) }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/changelist/Operation.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<IntParameter> of getIntParams: replace with IntList"
+ errorLine1=" val intParams = List(ints) { index -> IntParameter(index) }"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/changelist/Operation.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field objParams with type List<ObjectParameter<Object>>: replace with IntList"
+ errorLine1=" val objParams = List(objects) { index -> ObjectParameter<Any?>(index) }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/changelist/Operation.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<ObjectParameter<Object>> of getObjParams: replace with IntList"
+ errorLine1=" val objParams = List(objects) { index -> ObjectParameter<Any?>(index) }"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/changelist/Operation.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of keys: replace with IntList"
+ errorLine1=" private fun keys() = groups.keys(groupsSize * Group_Fields_Size)"
+ errorLine2=" ~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of nodes: replace with IntList"
+ errorLine1=" private fun nodes() = groups.nodeCounts(groupsSize * Group_Fields_Size)"
+ errorLine2=" ~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of parentIndexes: replace with IntList"
+ errorLine1=" private fun parentIndexes() = groups.parentAnchors(groupsSize * Group_Fields_Size)"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of dataIndexes: replace with IntList"
+ errorLine1=" private fun dataIndexes() = groups.dataAnchors(groupsSize * Group_Fields_Size)"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of groupSizes: replace with IntList"
+ errorLine1=" private fun groupSizes() = groups.groupSizes(groupsSize * Group_Fields_Size)"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of dataIndexes: replace with IntList"
+ errorLine1=" private fun IntArray.dataIndexes() = groups.dataAnchors().let {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of keys: replace with IntList"
+ errorLine1=" private fun keys() = groups.keys().fastFilterIndexed { index, _ ->"
+ errorLine2=" ~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of keys: replace with IntList"
+ errorLine1="private fun IntArray.keys(len: Int = size) ="
+ errorLine2=" ~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of nodeCounts: replace with IntList"
+ errorLine1="private fun IntArray.nodeCounts(len: Int = size) ="
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of parentAnchors: replace with IntList"
+ errorLine1="private fun IntArray.parentAnchors(len: Int = size) ="
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of slice: replace with IntList"
+ errorLine1="private fun IntArray.slice(indices: Iterable<Int>): List<Int> {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable list with type List<Integer>: replace with IntList"
+ errorLine1=" val list = mutableListOf<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of groupSizes: replace with IntList"
+ errorLine1="private fun IntArray.groupSizes(len: Int = size) ="
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of dataAnchors: replace with IntList"
+ errorLine1="private fun IntArray.dataAnchors(len: Int = size) ="
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor PrioritySet has parameter list with type List<Integer>: replace with IntList"
+ errorLine1="internal class PrioritySet(private val list: MutableList<Int> = mutableListOf()) {"
+ errorLine2=" ~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field list with type List<Integer>: replace with IntList"
+ errorLine1="internal class PrioritySet(private val list: MutableList<Int> = mutableListOf()) {"
+ errorLine2=" ~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable newBelowBound with type List<Integer>: replace with IntList"
+ errorLine1=" var newBelowBound: MutableList<Int>? = null"
+ errorLine2=" ~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/snapshots/SnapshotIdSet.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type ImmutableList<Character> of toImmutableList: replace with IntList"
+ errorLine1="internal fun CharSequence.toImmutableList(): ImmutableList<Char> = toPersistentList()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/external/kotlinx/collections/immutable/extensions.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type PersistentList<Character> of toPersistentList: replace with IntList"
+ errorLine1="internal fun CharSequence.toPersistentList(): PersistentList<Char> ="
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/external/kotlinx/collections/immutable/extensions.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type PersistentSet<Character> of toImmutableSet: replace with IntSet"
+ errorLine1="internal fun CharSequence.toImmutableSet(): PersistentSet<Char> = toPersistentSet()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/external/kotlinx/collections/immutable/extensions.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type PersistentSet<Character> of toPersistentSet: replace with IntSet"
+ errorLine1="internal fun CharSequence.toPersistentSet(): PersistentSet<Char> ="
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/external/kotlinx/collections/immutable/extensions.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type PersistentSet<Character> of toPersistentHashSet: replace with IntSet"
+ errorLine1="internal fun CharSequence.toPersistentHashSet(): PersistentSet<Char> ="
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/runtime/external/kotlinx/collections/immutable/extensions.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable 'realFn' with type Function2<? super Composer, ? super Integer, ? extends Unit>."
errorLine1=" @Suppress("UNCHECKED_CAST")"
diff --git a/compose/ui/ui-graphics/lint-baseline.xml b/compose/ui/ui-graphics/lint-baseline.xml
index 51329f0..29ec2f9c 100644
--- a/compose/ui/ui-graphics/lint-baseline.xml
+++ b/compose/ui/ui-graphics/lint-baseline.xml
@@ -1,5 +1,473 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method drawPoints has parameter points with type List<Offset>: replace with LongList"
+ errorLine1=" private fun drawPoints(points: List<Offset>, paint: Paint) {"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidCanvas.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method drawLines has parameter points with type List<Offset>: replace with LongList"
+ errorLine1=" private fun drawLines(points: List<Offset>, paint: Paint, stepBy: Int) {"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidCanvas.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ActualLinearGradientShader has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidShader.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ActualLinearGradientShader has parameter colorStops with type List<Float>: replace with FloatList"
+ errorLine1=" colorStops: List<Float>?,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidShader.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ActualRadialGradientShader has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidShader.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ActualRadialGradientShader has parameter colorStops with type List<Float>: replace with FloatList"
+ errorLine1=" colorStops: List<Float>?,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidShader.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ActualSweepGradientShader has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidShader.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ActualSweepGradientShader has parameter colorStops with type List<Float>: replace with FloatList"
+ errorLine1=" colorStops: List<Float>?"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidShader.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method countTransparentColors has parameter colors with type List<Color>: replace with LongList"
+ errorLine1="internal fun countTransparentColors(colors: List<Color>): Int {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidShader.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method makeTransparentColors has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidShader.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method makeTransparentStops has parameter stops with type List<Float>: replace with FloatList"
+ errorLine1=" stops: List<Float>?,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidShader.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method makeTransparentStops has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidShader.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method validateColorStops has parameter colorStops with type List<Float>: replace with FloatList"
+ errorLine1="private fun validateColorStops(colors: List<Color>, colorStops: List<Float>?) {"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidShader.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method validateColorStops has parameter colors with type List<Color>: replace with LongList"
+ errorLine1="private fun validateColorStops(colors: List<Color>, colorStops: List<Float>?) {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidShader.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method linearGradient has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method horizontalGradient has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method verticalGradient has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method radialGradient has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method sweepGradient has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor LinearGradient has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" private val colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1=" private val colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor LinearGradient has parameter stops with type List<Float>: replace with FloatList"
+ errorLine1=" private val stops: List<Float>? = null,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field stops with type List<Float>: replace with FloatList"
+ errorLine1=" private val stops: List<Float>? = null,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor RadialGradient has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" private val colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1=" private val colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor RadialGradient has parameter stops with type List<Float>: replace with FloatList"
+ errorLine1=" private val stops: List<Float>? = null,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field stops with type List<Float>: replace with FloatList"
+ errorLine1=" private val stops: List<Float>? = null,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor SweepGradient has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" private val colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1=" private val colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor SweepGradient has parameter stops with type List<Float>: replace with FloatList"
+ errorLine1=" private val stops: List<Float>? = null"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field stops with type List<Float>: replace with FloatList"
+ errorLine1=" private val stops: List<Float>? = null"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Brush.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method drawPoints has parameter points with type List<Offset>: replace with LongList"
+ errorLine1=" fun drawPoints(pointMode: PointMode, points: List<Offset>, paint: Paint)"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Canvas.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method drawPoints has parameter points with type List<Offset>: replace with LongList"
+ errorLine1=" points: List<Offset>,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method drawPoints has parameter points with type List<Offset>: replace with LongList"
+ errorLine1=" points: List<Offset>,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method LinearGradientShader has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Shader.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method LinearGradientShader has parameter colorStops with type List<Float>: replace with FloatList"
+ errorLine1=" colorStops: List<Float>? = null,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Shader.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ActualLinearGradientShader has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Shader.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ActualLinearGradientShader has parameter colorStops with type List<Float>: replace with FloatList"
+ errorLine1=" colorStops: List<Float>?,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Shader.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method RadialGradientShader has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Shader.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method RadialGradientShader has parameter colorStops with type List<Float>: replace with FloatList"
+ errorLine1=" colorStops: List<Float>? = null,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Shader.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ActualRadialGradientShader has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Shader.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ActualRadialGradientShader has parameter colorStops with type List<Float>: replace with FloatList"
+ errorLine1=" colorStops: List<Float>?,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Shader.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method SweepGradientShader has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Shader.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method SweepGradientShader has parameter colorStops with type List<Float>: replace with FloatList"
+ errorLine1=" colorStops: List<Float>? = null"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Shader.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ActualSweepGradientShader has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Shader.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ActualSweepGradientShader has parameter colorStops with type List<Float>: replace with FloatList"
+ errorLine1=" colorStops: List<Float>?,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Shader.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor Vertices has parameter positions with type List<Offset>: replace with LongList"
+ errorLine1=" positions: List<Offset>,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Vertices.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor Vertices has parameter textureCoordinates with type List<Offset>: replace with LongList"
+ errorLine1=" textureCoordinates: List<Offset>,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Vertices.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor Vertices has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Vertices.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor Vertices has parameter indices with type List<Integer>: replace with IntList"
+ errorLine1=" indices: List<Int>"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Vertices.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method encodeColorList has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" private fun encodeColorList(colors: List<Color>): IntArray {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Vertices.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method encodePointList has parameter points with type List<Offset>: replace with LongList"
+ errorLine1=" private fun encodePointList(points: List<Offset>): FloatArray {"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/graphics/Vertices.kt"/>
+ </issue>
<issue
id="PrimitiveInLambda"
diff --git a/compose/ui/ui-inspection/lint-baseline.xml b/compose/ui/ui-inspection/lint-baseline.xml
new file mode 100644
index 0000000..f313a40
--- /dev/null
+++ b/compose/ui/ui-inspection/lint-baseline.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field anchorLookup with type Map<Integer, Object>: replace with IntObjectMap"
+ errorLine1=" private val anchorLookup = mutableMapOf<Int, Any>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/util/AnchorMap.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field idLookup with type IdentityHashMap<Object, Integer>: replace with ObjectIntMap"
+ errorLine1=" private val idLookup = IdentityHashMap<Any, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/util/AnchorMap.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field viewsToSkip with type List<Long>: replace with LongList"
+ errorLine1=" val viewsToSkip: List<Long> ="
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/compose/AndroidComposeViewWrapper.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Long> of getViewsToSkip: replace with LongList"
+ errorLine1=" val viewsToSkip: List<Long> ="
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/compose/AndroidComposeViewWrapper.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Long, InspectorNode> of getLookup: replace with LongObjectMap"
+ errorLine1=" val lookup: Map<Long, InspectorNode>"
+ errorLine2=" ~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/ComposeLayoutInspector.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable var785951a with type Map<Long, ? extends InspectorNode>: replace with LongObjectMap"
+ errorLine1=" get() = _lookup ?: trees.flatMap { it.nodes }"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/ComposeLayoutInspector.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field _lookup with type Map<Long, InspectorNode>: replace with LongObjectMap"
+ errorLine1=" private var _lookup: Map<Long, InspectorNode>? = null"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/ComposeLayoutInspector.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor CacheTree has parameter viewsToSkip with type List<Long>: replace with LongList"
+ errorLine1=" val viewsToSkip: List<Long>"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/ComposeLayoutInspector.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field viewsToSkip with type List<Long>: replace with LongList"
+ errorLine1=" val viewsToSkip: List<Long>"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/ComposeLayoutInspector.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Long> of getViewsToSkip: replace with LongList"
+ errorLine1=" val viewsToSkip: List<Long>"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/ComposeLayoutInspector.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field _cachedNodes with type Map<Long, CacheData>: replace with LongObjectMap"
+ errorLine1=" private val _cachedNodes = mutableMapOf<Long, CacheData>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/ComposeLayoutInspector.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Long, CacheData> of getCachedNodes: replace with LongObjectMap"
+ errorLine1=" private val cachedNodes: MutableMap<Long, CacheData>"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/ComposeLayoutInspector.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable data with type Map<Long, ? extends CacheData>: replace with LongObjectMap"
+ errorLine1=" val data = ThreadUtils.runOnMainThread {"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/ComposeLayoutInspector.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable composeViewsByRoot with type Map<Long, ? extends List<? extends AndroidComposeViewWrapper>>: replace with LongObjectMap"
+ errorLine1=" val composeViewsByRoot = composeViews.groupBy { it.rootView.uniqueDrawingId }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/ComposeLayoutInspector.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable data with type Map<Long, ? extends CacheData>: replace with LongObjectMap"
+ errorLine1=" val data = composeViewsByRoot.mapValues { (_, composeViews) ->"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/ComposeLayoutInspector.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method asIntArray has parameter $this$asIntArray with type List<Integer>: replace with IntList"
+ errorLine1="fun List<Int>.asIntArray() ="
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/util/IntArray.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field semanticsMap with type Map<Integer, List<RawParameter>>: replace with IntObjectMap"
+ errorLine1=" /** Map from semantics id to a list of merged semantics information */"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/inspector/LayoutInspectorTree.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field unmergedSemanticsMap with type Map<Integer, List<RawParameter>>: replace with IntObjectMap"
+ errorLine1=" /* Map of seemantics id to a list of unmerged semantics information */"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/inspector/LayoutInspectorTree.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field found with type Map<Long, InspectorNode>: replace with LongObjectMap"
+ errorLine1=" /**"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/inspector/LayoutInspectorTree.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor NodeParameterReference has parameter indices with type List<Integer>: replace with IntList"
+ errorLine1=" indices: List<Int>"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/inspector/NodeParameterReference.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field systemPackages with type Set<Integer>: replace with IntSet"
+ errorLine1="val systemPackages = setOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/inspector/PackageHashes.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Set<Integer> of getSystemPackages: replace with IntSet"
+ errorLine1="val systemPackages = setOf("
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/inspector/PackageHashes.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field valueIndex with type List<Integer>: replace with IntList"
+ errorLine1=" private val valueIndex = mutableListOf<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/inspector/ParameterFactory.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field rootValueIndexCache with type Map<Long, IdentityHashMap<Object, NodeParameterReference>>: replace with LongObjectMap"
+ errorLine1=" private val rootValueIndexCache ="
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/inspector/ParameterFactory.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field innerMap with type Map<String, Integer>: replace with ObjectIntMap"
+ errorLine1=" private val innerMap = mutableMapOf<String, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/inspection/proto/StringTable.kt"/>
+ </issue>
+
+</issues>
diff --git a/compose/ui/ui-test/lint-baseline.xml b/compose/ui/ui-test/lint-baseline.xml
index 1fa3f35..3f92e10 100644
--- a/compose/ui/ui-test/lint-baseline.xml
+++ b/compose/ui/ui-test/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
<issue
id="BanThreadSleep"
@@ -11,6 +11,240 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="field MouseAsTouchEvents with type List<Integer>: replace with IntList"
+ errorLine1="private val MouseAsTouchEvents = listOf(ACTION_DOWN, ACTION_MOVE, ACTION_UP)"
+ errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/test/AndroidInputDispatcher.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable absoluteHistoricalTimes with type List<? extends Long>: replace with LongList"
+ errorLine1=" val absoluteHistoricalTimes = relativeHistoricalTimes.map { currentTime + it }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/test/AndroidInputDispatcher.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method enqueueTouchEvent has parameter pointerIds with type List<Integer>: replace with IntList"
+ errorLine1=" pointerIds: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/test/AndroidInputDispatcher.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method enqueueTouchEvent has parameter eventTimes with type List<Long>: replace with LongList"
+ errorLine1=" eventTimes: List<Long>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/test/AndroidInputDispatcher.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method enqueueTouchMoves has parameter relativeHistoricalTimes with type List<Long>: replace with LongList"
+ errorLine1=" relativeHistoricalTimes: List<Long>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/InputDispatcher.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method enqueueMoves has parameter relativeHistoricalTimes with type List<Long>: replace with LongList"
+ errorLine1=" relativeHistoricalTimes: List<Long>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/InputDispatcher.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field lastPositions with type Map<Integer, Offset>: replace with IntLongMap"
+ errorLine1=" val lastPositions = mutableMapOf(Pair(pointerId, startPosition))"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/InputDispatcher.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Integer, Offset> of getLastPositions: replace with IntLongMap"
+ errorLine1=" val lastPositions = mutableMapOf(Pair(pointerId, startPosition))"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/InputDispatcher.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field pressedButtons with type Set<Integer>: replace with IntSet"
+ errorLine1=" val pressedButtons: MutableSet<Int> = mutableSetOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/InputDispatcher.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Set<Integer> of getPressedButtons: replace with IntSet"
+ errorLine1=" val pressedButtons: MutableSet<Int> = mutableSetOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/InputDispatcher.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field downKeys with type HashSet<Key>: replace with LongSet"
+ errorLine1=" private val downKeys: HashSet<Key> = hashSetOf()"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/InputDispatcher.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method withKeysDown has parameter keys with type List<Key>: replace with LongList"
+ errorLine1="fun KeyInjectionScope.withKeysDown(keys: List<Key>, block: KeyInjectionScope.() -> Unit) {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/KeyInjectionScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method withKeysToggled has parameter keys with type List<Key>: replace with LongList"
+ errorLine1="fun KeyInjectionScope.withKeysToggled(keys: List<Key>, block: KeyInjectionScope.() -> Unit) {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/KeyInjectionScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method pressKeys has parameter keys with type List<Key>: replace with LongList"
+ errorLine1="private fun KeyInjectionScope.pressKeys(keys: List<Key>) ="
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/KeyInjectionScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field nodeIds with type List<Integer>: replace with IntList"
+ errorLine1=" private var nodeIds: List<Int>? = null"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/SemanticsNodeInteraction.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field states with type Map<Integer, InputDispatcherState>: replace with IntObjectMap"
+ errorLine1=" /**"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/TestOwner.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Integer, InputDispatcherState> of getStates$lint_module: replace with IntObjectMap"
+ errorLine1=" internal val states = mutableMapOf<Int, InputDispatcherState>()"
+ errorLine2=" ~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/TestOwner.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method moveWithHistoryMultiPointer has parameter relativeHistoricalTimes with type List<Long>: replace with LongList"
+ errorLine1=" relativeHistoricalTimes: List<Long>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/TouchInjectionScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method moveWithHistory has parameter relativeHistoricalTimes with type List<Long>: replace with LongList"
+ errorLine1=" relativeHistoricalTimes: List<Long>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/TouchInjectionScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method moveWithHistory has parameter historicalCoordinates with type List<Offset>: replace with LongList"
+ errorLine1=" historicalCoordinates: List<Offset>,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/TouchInjectionScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method swipe has parameter keyTimes with type List<Long>: replace with LongList"
+ errorLine1=" keyTimes: List<Long> = emptyList()"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/TouchInjectionScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method multiTouchSwipe has parameter keyTimes with type List<Long>: replace with LongList"
+ errorLine1=" keyTimes: List<Long> = emptyList()"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/test/TouchInjectionScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method isMonotonicBetween has parameter $this$isMonotonicBetween with type List<Float>: replace with FloatList"
+ errorLine1="fun List<Float>.isMonotonicBetween(a: Float, b: Float, tolerance: Float = 1e-3f) {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/androidCommonTest/kotlin/androidx/compose/ui/test/util/Verifications.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method isMonotonicBetween has parameter $this$isMonotonicBetween with type List<Float>: replace with FloatList"
+ errorLine1="fun List<Float>.isMonotonicBetween(a: Float, b: Float, tolerance: Float = 1e-3f) {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/androidCommonTest/kotlin/androidx/compose/ui/test/util/Verifications.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method assertSame has parameter $this$assertSame with type List<Float>: replace with FloatList"
+ errorLine1="fun List<Float>.assertSame(tolerance: Float = 0f) {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/androidCommonTest/kotlin/androidx/compose/ui/test/util/Verifications.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method assertSame has parameter $this$assertSame with type List<Float>: replace with FloatList"
+ errorLine1="fun List<Float>.assertSame(tolerance: Float = 0f) {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/androidCommonTest/kotlin/androidx/compose/ui/test/util/Verifications.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable 'scrollDelta' with type Function2<? super Float, ? super Float, ? extends Float>."
errorLine1=" // Given the desired scroll value to align either side of the target with the"
diff --git a/compose/ui/ui-text/lint-baseline.xml b/compose/ui/ui-text/lint-baseline.xml
index a0b00ff..27dbe25 100644
--- a/compose/ui/ui-text/lint-baseline.xml
+++ b/compose/ui/ui-text/lint-baseline.xml
@@ -92,6 +92,132 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="return type List<FontStyle> of values: replace with IntList"
+ errorLine1=" fun values(): List<FontStyle> = listOf(Normal, Italic)"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/text/font/FontStyle.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable transitions with type TreeSet<Integer>: replace with IntSet"
+ errorLine1=" val transitions = sortedSetOf(0, text.length)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/jvmMain/kotlin/androidx/compose/ui/text/JvmAnnotatedString.jvm.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable offsetMap with type Map<Integer, Integer>: replace with IntIntMap"
+ errorLine1=" val offsetMap = mutableMapOf(0 to 0)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/jvmMain/kotlin/androidx/compose/ui/text/JvmAnnotatedString.jvm.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method collectRangeTransitions has parameter target with type SortedSet<Integer>: replace with IntSet"
+ errorLine1=" target: SortedSet<Int>"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="src/jvmMain/kotlin/androidx/compose/ui/text/JvmAnnotatedString.jvm.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field paragraphEnds with type List<Integer>: replace with IntList"
+ errorLine1=" private val paragraphEnds: List<Int>"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="../../../text/text/src/main/java/androidx/compose/ui/text/android/LayoutHelper.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable lineFeeds with type List<Integer>: replace with IntList"
+ errorLine1=" val lineFeeds = mutableListOf<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="../../../text/text/src/main/java/androidx/compose/ui/text/android/LayoutHelper.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable list with type List<? extends Float>: replace with FloatList"
+ errorLine1=" @Suppress("UNCHECKED_CAST")"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/text/Savers.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of breakInWords: replace with IntList"
+ errorLine1=" private fun breakInWords(layoutHelper: LayoutHelper): List<Int> {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="../../../text/text/src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable words with type List<? extends Integer>: replace with IntList"
+ errorLine1=" val words = breakWithBreakIterator(text, BreakIterator.getLineInstance(Locale.getDefault()))"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="../../../text/text/src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable set with type TreeSet<Integer>: replace with IntSet"
+ errorLine1=" val set = TreeSet<Int>().apply {"
+ errorLine2=" ^">
+ <location
+ file="../../../text/text/src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of breakWithBreakIterator: replace with IntList"
+ errorLine1=" private fun breakWithBreakIterator(text: CharSequence, breaker: BreakIterator): List<Int> {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="../../../text/text/src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable res with type List<Integer>: replace with IntList"
+ errorLine1=" val res = mutableListOf(0)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="../../../text/text/src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of breakOffsets: replace with IntList"
+ errorLine1=" fun breakOffsets(layoutHelper: LayoutHelper, segmentType: SegmentType): List<Int> {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="../../../text/text/src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<TextAlign> of values: replace with IntList"
+ errorLine1=" fun values(): List<TextAlign> = listOf(Left, Right, Center, Justify, Start, End)"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/text/style/TextAlign.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method createCharSequence has parameter 'resolveTypeface' with type Function4<? super FontFamily, ? super FontWeight, ? super FontStyle, ? super FontSynthesis, ? extends Typeface>."
errorLine1=" resolveTypeface: (FontFamily?, FontWeight, FontStyle, FontSynthesis) -> Typeface,"
diff --git a/compose/ui/ui-tooling-data/lint-baseline.xml b/compose/ui/ui-tooling-data/lint-baseline.xml
index fb91051..43863c3 100644
--- a/compose/ui/ui-tooling-data/lint-baseline.xml
+++ b/compose/ui/ui-tooling-data/lint-baseline.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable expectedSortedIndex with type List<Integer>: replace with IntList"
+ errorLine1=" val expectedSortedIndex = mutableListOf(0, 1, 2, 3)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/jvmMain/kotlin/androidx/compose/ui/tooling/data/SlotTree.kt"/>
+ </issue>
<issue
id="PrimitiveInLambda"
diff --git a/compose/ui/ui-tooling/lint-baseline.xml b/compose/ui/ui-tooling/lint-baseline.xml
index 2191869..5dc3c6e 100644
--- a/compose/ui/ui-tooling/lint-baseline.xml
+++ b/compose/ui/ui-tooling/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
<issue
id="BanThreadSleep"
@@ -20,6 +20,60 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="method setClockTimes has parameter animationTimeMillis with type Map<ComposeAnimation, Long>: replace with ObjectLongMap"
+ errorLine1=" fun setClockTimes(animationTimeMillis: Map<ComposeAnimation, Long>) {"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/tooling/animation/PreviewAnimationClock.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field states with type Set<Integer>: replace with IntSet"
+ errorLine1=" override val states = emptySet<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/tooling/animation/UnsupportedComposeAnimation.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable values with type Map<Long, ? extends T>: replace with LongObjectMap"
+ errorLine1=" val values: Map<Long, T> by lazy {"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/tooling/animation/clock/Utils.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable values with type Map<Long, T>: replace with LongObjectMap"
+ errorLine1=" val values: MutableMap<Long, T> = mutableMapOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/tooling/animation/clock/Utils.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable values with type Map<Long, ? extends T>: replace with LongObjectMap"
+ errorLine1=" val values: Map<Long, T> by lazy {"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/tooling/animation/clock/Utils.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable values with type Map<Long, T>: replace with LongObjectMap"
+ errorLine1=" val values: MutableMap<Long, T> = mutableMapOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/tooling/animation/clock/Utils.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor InfiniteTransitionClock has parameter 'maxDuration' with type Function0<Long>."
errorLine1=" private val maxDuration: () -> Long = { 0 }"
diff --git a/compose/ui/ui/integration-tests/ui-demos/lint-baseline.xml b/compose/ui/ui/integration-tests/ui-demos/lint-baseline.xml
index af83a0a5..06cee02 100644
--- a/compose/ui/ui/integration-tests/ui-demos/lint-baseline.xml
+++ b/compose/ui/ui/integration-tests/ui-demos/lint-baseline.xml
@@ -1,5 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field Colors with type List<Color>: replace with LongList"
+ errorLine1="internal val Colors = listOf("
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/compose/ui/demos/gestures/Colors.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Color> of getColors: replace with LongList"
+ errorLine1="internal val Colors = listOf("
+ errorLine2=" ~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/demos/gestures/Colors.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method random has parameter $this$random with type List<Color>: replace with LongList"
+ errorLine1="private fun List<Color>.random(exclude: Color?): Color {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/demos/gestures/Colors.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method inOrder has parameter $this$inOrder with type List<Color>: replace with LongList"
+ errorLine1="private fun List<Color>.inOrder(current: Color?, forward: Boolean): Color {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/demos/gestures/Colors.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field rowStates with type Map<Integer, LazyListState>: replace with IntObjectMap"
+ errorLine1=" private val rowStates = mutableMapOf<Int, LazyListState>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/demos/recyclerview/RecyclerViewInteropDemoFragment.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable checkedItems with type Set<? extends Integer>: replace with IntSet"
+ errorLine1=" var checkedItems by remember { mutableStateOf(emptySet<Int>()) }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/demos/viewinterop/ScrollingAndroidViewsDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method RecyclingAndroidViewLazyColumn has parameter checkedItems with type Set<Integer>: replace with IntSet"
+ errorLine1=" checkedItems: Set<Int>,"
+ errorLine2=" ~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/demos/viewinterop/ScrollingAndroidViewsDemo.kt"/>
+ </issue>
<issue
id="PrimitiveInLambda"
diff --git a/compose/ui/ui/lint-baseline.xml b/compose/ui/ui/lint-baseline.xml
index 8dadbf5..0a78a98 100644
--- a/compose/ui/ui/lint-baseline.xml
+++ b/compose/ui/ui/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha02" type="baseline" client="cli" dependencies="false" name="AGP (8.3.0-alpha02)" variant="all" version="8.3.0-alpha02">
+<issues format="6" by="lint 8.3.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha02)" variant="all" version="8.3.0-alpha02">
<issue
id="BanHideTag"
@@ -56,6 +56,537 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="field pendingHorizontalScrollEvents with type HashMap<Integer, ScrollAxisRange>: replace with IntObjectMap"
+ errorLine1=" private val pendingHorizontalScrollEvents = HashMap<Int, ScrollAxisRange>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field pendingVerticalScrollEvents with type HashMap<Integer, ScrollAxisRange>: replace with IntObjectMap"
+ errorLine1=" private val pendingVerticalScrollEvents = HashMap<Int, ScrollAxisRange>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field bufferedContentCaptureAppearedNodes with type ArrayMap<Integer, ViewStructureCompat>: replace with IntObjectMap"
+ errorLine1=" internal val bufferedContentCaptureAppearedNodes = ArrayMap<Int, ViewStructureCompat>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type ArrayMap<Integer, ViewStructureCompat> of getBufferedContentCaptureAppearedNodes$lint_module: replace with IntObjectMap"
+ errorLine1=" internal val bufferedContentCaptureAppearedNodes = ArrayMap<Int, ViewStructureCompat>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field bufferedContentCaptureDisappearedNodes with type ArraySet<Integer>: replace with IntSet"
+ errorLine1=" internal val bufferedContentCaptureDisappearedNodes = ArraySet<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type ArraySet<Integer> of getBufferedContentCaptureDisappearedNodes$lint_module: replace with IntSet"
+ errorLine1=" internal val bufferedContentCaptureDisappearedNodes = ArraySet<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method setCurrentSemanticsNodes$lint_module has parameter <set-?> with type Map<Integer, SemanticsNodeWithAdjustedBounds>: replace with IntObjectMap"
+ errorLine1=" /**"
+ errorLine2=" ^">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field currentSemanticsNodes with type Map<Integer, SemanticsNodeWithAdjustedBounds>: replace with IntObjectMap"
+ errorLine1=" internal var currentSemanticsNodes: Map<Int, SemanticsNodeWithAdjustedBounds> = mapOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Integer, SemanticsNodeWithAdjustedBounds> of getCurrentSemanticsNodes$lint_module: replace with IntObjectMap"
+ errorLine1=" internal var currentSemanticsNodes: Map<Int, SemanticsNodeWithAdjustedBounds> = mapOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field paneDisplayed with type ArraySet<Integer>: replace with IntSet"
+ errorLine1=" private var paneDisplayed = ArraySet<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field idToBeforeMap with type HashMap<Integer, Integer>: replace with IntIntMap"
+ errorLine1=" internal var idToBeforeMap = HashMap<Int, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method setIdToBeforeMap$lint_module has parameter <set-?> with type HashMap<Integer, Integer>: replace with IntIntMap"
+ errorLine1=" internal var idToBeforeMap = HashMap<Int, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type HashMap<Integer, Integer> of getIdToBeforeMap$lint_module: replace with IntIntMap"
+ errorLine1=" internal var idToBeforeMap = HashMap<Int, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field idToAfterMap with type HashMap<Integer, Integer>: replace with IntIntMap"
+ errorLine1=" internal var idToAfterMap = HashMap<Int, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method setIdToAfterMap$lint_module has parameter <set-?> with type HashMap<Integer, Integer>: replace with IntIntMap"
+ errorLine1=" internal var idToAfterMap = HashMap<Int, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type HashMap<Integer, Integer> of getIdToAfterMap$lint_module: replace with IntIntMap"
+ errorLine1=" internal var idToAfterMap = HashMap<Int, Int>()"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor SemanticsNodeCopy has parameter currentSemanticsNodes with type Map<Integer, SemanticsNodeWithAdjustedBounds>: replace with IntObjectMap"
+ errorLine1=" currentSemanticsNodes: Map<Int, SemanticsNodeWithAdjustedBounds>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field children with type Set<Integer>: replace with IntSet"
+ errorLine1=" val children: MutableSet<Int> = mutableSetOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Set<Integer> of getChildren: replace with IntSet"
+ errorLine1=" val children: MutableSet<Int> = mutableSetOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method setPreviousSemanticsNodes$lint_module has parameter <set-?> with type Map<Integer, SemanticsNodeCopy>: replace with IntObjectMap"
+ errorLine1=" // previousSemanticsNodes holds the previous pruned semantics tree so that we can compare the"
+ errorLine2=" ^">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field previousSemanticsNodes with type Map<Integer, SemanticsNodeCopy>: replace with IntObjectMap"
+ errorLine1=" internal var previousSemanticsNodes: MutableMap<Int, SemanticsNodeCopy> = mutableMapOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Integer, SemanticsNodeCopy> of getPreviousSemanticsNodes$lint_module: replace with IntObjectMap"
+ errorLine1=" internal var previousSemanticsNodes: MutableMap<Int, SemanticsNodeCopy> = mutableMapOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method sortByGeometryGroupings has parameter containerChildrenMapping with type Map<Integer, List<SemanticsNode>>: replace with IntObjectMap"
+ errorLine1=" containerChildrenMapping: MutableMap<Int, MutableList<SemanticsNode>> = mutableMapOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method geometryDepthFirstSearch has parameter containerMapToChildren with type Map<Integer, List<SemanticsNode>>: replace with IntObjectMap"
+ errorLine1=" containerMapToChildren: MutableMap<Int, MutableList<SemanticsNode>>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable containerMapToChildren with type Map<Integer, List<SemanticsNode>>: replace with IntObjectMap"
+ errorLine1=" val containerMapToChildren = mutableMapOf<Int, MutableList<SemanticsNode>>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable currentLabelToActionId with type Map<CharSequence, Integer>: replace with ObjectIntMap"
+ errorLine1=" val currentLabelToActionId = mutableMapOf<CharSequence, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable oldLabelToActionId with type Map<CharSequence, ? extends Integer>: replace with ObjectIntMap"
+ errorLine1=" val oldLabelToActionId = labelToActionId[virtualViewId]"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable availableIds with type List<Integer>: replace with IntList"
+ errorLine1=" val availableIds = AccessibilityActionsResourceIds.toMutableList()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable subtreeChangedSemanticsNodesIds with type ArraySet<Integer>: replace with IntSet"
+ errorLine1=" val subtreeChangedSemanticsNodesIds = ArraySet<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method sendSubtreeChangeAccessibilityEvents has parameter subtreeChangedSemanticsNodesIds with type ArraySet<Integer>: replace with IntSet"
+ errorLine1=" subtreeChangedSemanticsNodesIds: ArraySet<Int>"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable toRemove with type ArraySet<Integer>: replace with IntSet"
+ errorLine1=" val toRemove = ArraySet<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method sendSemanticsPropertyChangeEvents$lint_module has parameter newSemanticsNodes with type Map<Integer, SemanticsNodeWithAdjustedBounds>: replace with IntObjectMap"
+ errorLine1=" newSemanticsNodes: Map<Int, SemanticsNodeWithAdjustedBounds>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable newChildren with type Set<Integer>: replace with IntSet"
+ errorLine1=" val newChildren: MutableSet<Int> = mutableSetOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Integer, SemanticsNodeWithAdjustedBounds> of getAllUncoveredSemanticsNodesToMap: replace with IntObjectMap"
+ errorLine1=" Map<Int, SemanticsNodeWithAdjustedBounds> {"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable nodes with type Map<Integer, SemanticsNodeWithAdjustedBounds>: replace with IntObjectMap"
+ errorLine1=" val nodes = mutableMapOf<Int, SemanticsNodeWithAdjustedBounds>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/AndroidComposeViewAccessibilityDelegateCompat.android.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field children with type Map<Integer, AutofillNode>: replace with IntObjectMap"
+ errorLine1=" val children: MutableMap<Int, AutofillNode> = mutableMapOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillTree.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Integer, AutofillNode> of getChildren: replace with IntObjectMap"
+ errorLine1=" val children: MutableMap<Int, AutofillNode> = mutableMapOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillTree.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable deltas with type List<? extends Offset>: replace with LongList"
+ errorLine1=" val deltas = items.fastZipWithNext { el1, el2 ->"
+ errorLine2=" ^">
+ <location
+ file="src/androidMain/kotlin/androidx/compose/ui/platform/accessibility/CollectionInfo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<LayoutNode, Integer> of getMapOfOriginalDepth: replace with ObjectIntMap"
+ errorLine1=" private val mapOfOriginalDepth by lazy(LazyThreadSafetyMode.NONE) {"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/DepthSortedSet.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<HapticFeedbackType> of values: replace with IntList"
+ errorLine1=" fun values(): List<HapticFeedbackType> = listOf(LongPress, TextHandleMove)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/hapticfeedback/HapticFeedbackType.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field alignmentLines with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" override val alignmentLines = alignmentLines"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/layout/IntermediateLayoutModifierNode.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field alignmentLineMap with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" private val alignmentLineMap: MutableMap<AlignmentLine, Int> = hashMapOf()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/LayoutNodeAlignmentLines.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<AlignmentLine, Integer> of getLastCalculation: replace with ObjectIntMap"
+ errorLine1=" fun getLastCalculation(): Map<AlignmentLine, Int> = alignmentLineMap"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/LayoutNodeAlignmentLines.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<AlignmentLine, Integer> of getAlignmentLinesMap: replace with ObjectIntMap"
+ errorLine1=" protected abstract val NodeCoordinator.alignmentLinesMap: Map<AlignmentLine, Int>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/LayoutNodeAlignmentLines.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<AlignmentLine, Integer> of calculateAlignmentLines: replace with ObjectIntMap"
+ errorLine1=" fun calculateAlignmentLines(): Map<AlignmentLine, Int>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/LayoutNodeLayoutDelegate.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field oldAlignmentLines with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" private var oldAlignmentLines: MutableMap<AlignmentLine, Int>? = null"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/LookaheadDelegate.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable oldLines with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" val oldLines = oldAlignmentLines"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/LookaheadDelegate.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable var4a364b23 with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" val oldLines = oldAlignmentLines"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/LookaheadDelegate.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field cachedAlignmentLinesMap with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" protected val cachedAlignmentLinesMap = mutableMapOf<AlignmentLine, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/LookaheadDelegate.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<AlignmentLine, Integer> of getCachedAlignmentLinesMap: replace with ObjectIntMap"
+ errorLine1=" protected val cachedAlignmentLinesMap = mutableMapOf<AlignmentLine, Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/LookaheadDelegate.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<AlignmentLine, Integer> of getAlignmentLines: replace with ObjectIntMap"
+ errorLine1=" val alignmentLines: Map<AlignmentLine, Int>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/layout/MeasureResult.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method layout has parameter alignmentLines with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" alignmentLines: Map<AlignmentLine, Int> = emptyMap(),"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/layout/MeasureScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field alignmentLines with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" override val alignmentLines = alignmentLines"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/layout/MeasureScope.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable oldLines with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" val oldLines = oldAlignmentLines"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/NodeCoordinator.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable var43bc1f85 with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" val oldLines = oldAlignmentLines"
+ errorLine2=" ^">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/NodeCoordinator.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field oldAlignmentLines with type Map<AlignmentLine, Integer>: replace with ObjectIntMap"
+ errorLine1=" private var oldAlignmentLines: MutableMap<AlignmentLine, Int>? = null"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/NodeCoordinator.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable alignmentLines with type Map<AlignmentLine, ? extends Integer>: replace with ObjectIntMap"
+ errorLine1=" val alignmentLines = coordinator._measureResult?.alignmentLines"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/node/NodeCoordinator.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Integer, SemanticsNode> of getAllSemanticsNodesToMap: replace with IntObjectMap"
+ errorLine1="): Map<Int, SemanticsNode> {"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/semantics/SemanticsOwner.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable nodes with type Map<Integer, SemanticsNode>: replace with IntObjectMap"
+ errorLine1=" val nodes = mutableMapOf<Int, SemanticsNode>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/commonMain/kotlin/androidx/compose/ui/semantics/SemanticsOwner.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AlignmentLine has parameter 'merger' with type Function2<? super Integer, ? super Integer, Integer>."
errorLine1=" internal val merger: (Int, Int) -> Int"
diff --git a/constraintlayout/constraintlayout-compose/integration-tests/demos/lint-baseline.xml b/constraintlayout/constraintlayout-compose/integration-tests/demos/lint-baseline.xml
new file mode 100644
index 0000000..e6cb82a
--- /dev/null
+++ b/constraintlayout/constraintlayout-compose/integration-tests/demos/lint-baseline.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable boxColors with type List<? extends Color>: replace with LongList"
+ errorLine1=" val boxColors = listOf(Color.Red, Color.Blue, Color.Green)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/constraintlayout/compose/demos/ChainsDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable boxColors with type List<? extends Color>: replace with LongList"
+ errorLine1=" val boxColors = listOf(Color.Red, Color.Blue, Color.Green)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/constraintlayout/compose/demos/ChainsDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable values with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val values = FloatArray(10) { Random.nextInt(100).toFloat() + 10f }.asList()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/constraintlayout/compose/demos/LazyListItemsDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method DynamicGraph has parameter values with type List<Float>: replace with FloatList"
+ errorLine1=" values: List<Float> = listOf<Float>(12f, 32f, 21f, 32f, 2f),"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/constraintlayout/compose/demos/LazyListItemsDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable scale with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val scale = values.map { (it * 0.8f) / max }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/constraintlayout/compose/demos/LazyListItemsDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable weights with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val weights = when (mode) {"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/constraintlayout/compose/demos/StaggeredDemo.kt"/>
+ </issue>
+
+</issues>
diff --git a/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/lint-baseline.xml b/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/lint-baseline.xml
new file mode 100644
index 0000000..39626b4
--- /dev/null
+++ b/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/lint-baseline.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable values with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val values = FloatArray(10) { Random.nextInt(100).toFloat() + 10f }.asList()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/constraintlayout/compose/integration/macrobenchmark/target/graphs/DynamicGraphs.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method DynamicGraph has parameter values with type List<Float>: replace with FloatList"
+ errorLine1=" values: List<Float> = listOf<Float>(12f, 32f, 21f, 32f, 2f),"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/constraintlayout/compose/integration/macrobenchmark/target/graphs/DynamicGraphs.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable scale with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val scale = values.map { (it * 0.8f) / max }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/constraintlayout/compose/integration/macrobenchmark/target/graphs/DynamicGraphs.kt"/>
+ </issue>
+
+</issues>
diff --git a/constraintlayout/constraintlayout-compose/lint-baseline.xml b/constraintlayout/constraintlayout-compose/lint-baseline.xml
index cacb99a..29c20b4 100644
--- a/constraintlayout/constraintlayout-compose/lint-baseline.xml
+++ b/constraintlayout/constraintlayout-compose/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha14" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
<issue
id="BanInlineOptIn"
@@ -47,6 +47,150 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="method setAnchors$lint_module has parameter <set-?> with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" internal var anchors by mutableStateOf(emptyMap<Float, T>())"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Float, T> of getAnchors$lint_module: replace with FloatObjectMap"
+ errorLine1=" internal var anchors by mutableStateOf(emptyMap<Float, T>())"
+ errorLine2=" ~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ensureInit$lint_module has parameter newAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" internal fun ensureInit(newAnchors: Map<Float, T>) {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method processNewAnchors$lint_module has parameter oldAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" oldAnchors: Map<Float, T>,"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method processNewAnchors$lint_module has parameter newAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" newAnchors: Map<Float, T>"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable bounds with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val bounds = findBounds(offset.floatValue, anchors.keys)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method carouselSwipeable has parameter anchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" anchors: Map<Float, T>,"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable oldAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" val oldAnchors = state.anchors"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method findBounds has parameter anchors with type Set<Float>: replace with FloatSet"
+ errorLine1=" anchors: Set<Float>"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Float> of findBounds: replace with FloatList"
+ errorLine1="): List<Float> {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method computeTarget has parameter anchors with type Set<Float>: replace with FloatSet"
+ errorLine1=" anchors: Set<Float>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable bounds with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val bounds = findBounds(offset, anchors)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method getOffset has parameter $this$getOffset with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1="private fun <T> Map<Float, T>.getOffset(state: T): Float? {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method resistanceConfig has parameter anchors with type Set<Float>: replace with FloatSet"
+ errorLine1=" anchors: Set<Float>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field overridedVariables with type HashMap<String, Float>: replace with ObjectFloatMap"
+ errorLine1=" private val overridedVariables = HashMap<String, Float>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/JSONConstraintSet.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable anchors with type Map<Float, ? extends String>: replace with FloatObjectMap"
+ errorLine1=" val anchors = if (currentIndex == 0) {"
+ errorLine2=" ^">
+ <location
+ file="src/androidMain/kotlin/androidx/constraintlayout/compose/MotionCarousel.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method setThresholds$lint_module has parameter '<set-?>' with type Function2<? super Float, ? super Float, Float>."
errorLine1=" internal var thresholds: (Float, Float) -> Float by mutableStateOf({ _, _ -> 0f })"
diff --git a/glance/glance-appwidget/integration-tests/demos/lint-baseline.xml b/glance/glance-appwidget/integration-tests/demos/lint-baseline.xml
index bfe0ecc..cf3f685 100644
--- a/glance/glance-appwidget/integration-tests/demos/lint-baseline.xml
+++ b/glance/glance-appwidget/integration-tests/demos/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.3.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha02)" variant="all" version="8.3.0-alpha02">
<issue
id="RestrictedApiAndroidX"
@@ -28,4 +28,94 @@
file="src/main/java/androidx/glance/appwidget/demos/ProgressIndicatorAppWidget.kt"/>
</issue>
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor AppWidgetDesc has parameter sizes with type List<DpSize>: replace with LongList"
+ errorLine1=" val sizes: List<DpSize>,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/demos/GlanceAppWidgetDemoActivity.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field sizes with type List<DpSize>: replace with LongList"
+ errorLine1=" val sizes: List<DpSize>,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/demos/GlanceAppWidgetDemoActivity.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<DpSize> of getSizes: replace with LongList"
+ errorLine1=" val sizes: List<DpSize>,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/demos/GlanceAppWidgetDemoActivity.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field columnColors with type List<Color>: replace with LongList"
+ errorLine1="private val columnColors = listOf(Color(0xff70D689), Color(0xffB2E5BF))"
+ errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/demos/ResponsiveAppWidget.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field rowColors with type List<Color>: replace with LongList"
+ errorLine1="private val rowColors = listOf(Color(0xff5087EF), Color(0xffA2BDF2))"
+ errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/demos/ResponsiveAppWidget.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field boxColors with type List<Color>: replace with LongList"
+ errorLine1="private val boxColors = listOf(Color(0xffF7A998), Color(0xffFA5F3D))"
+ errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/demos/ResponsiveAppWidget.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field columnBgColorsA with type List<Color>: replace with LongList"
+ errorLine1=" private val columnBgColorsA = listOf(Color(0xffA2BDF2), Color(0xff5087EF))"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/demos/RippleAppWidget.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field columnBgColorsB with type List<Color>: replace with LongList"
+ errorLine1=" private val columnBgColorsB = listOf(Color(0xFFBD789C), Color(0xFF880E4F))"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/demos/RippleAppWidget.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field boxColors with type List<Color>: replace with LongList"
+ errorLine1=" private val boxColors = listOf(Color(0xffF7A998), Color(0xffFA5F3D))"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/demos/RippleAppWidget.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable columnBgColors with type List<? extends Color>: replace with LongList"
+ errorLine1=" var columnBgColors by remember { mutableStateOf(columnBgColorsA) }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/demos/RippleAppWidget.kt"/>
+ </issue>
+
</issues>
diff --git a/glance/glance-appwidget/lint-baseline.xml b/glance/glance-appwidget/lint-baseline.xml
index 79615c9..16b6c39 100644
--- a/glance/glance-appwidget/lint-baseline.xml
+++ b/glance/glance-appwidget/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.3.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha02)" variant="all" version="8.3.0-alpha02">
<issue
id="BanThreadSleep"
@@ -488,6 +488,213 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="return type List<DpSize> of extractAllSizes: replace with LongList"
+ errorLine1="internal fun Bundle.extractAllSizes(minSize: () -> DpSize): List<DpSize> {"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/AppWidgetUtils.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<DpSize> of estimateSizes: replace with LongList"
+ errorLine1="private fun Bundle.estimateSizes(minSize: () -> DpSize): List<DpSize> {"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/AppWidgetUtils.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<DpSize> of extractOrientationSizes: replace with LongList"
+ errorLine1="internal fun Bundle.extractOrientationSizes() ="
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/AppWidgetUtils.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<DpSize> of sortedBySize: replace with LongList"
+ errorLine1="internal fun Collection<DpSize>.sortedBySize() ="
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/AppWidgetUtils.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor InsertedViewInfo has parameter children with type Map<Integer, ? extends Map<SizeSelector, Integer>>: replace with IntObjectMap"
+ errorLine1=" val children: Map<Int, Map<SizeSelector, Int>> = emptyMap(),"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/LayoutSelection.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field children with type Map<Integer, Map<SizeSelector, Integer>>: replace with IntObjectMap"
+ errorLine1=" val children: Map<Int, Map<SizeSelector, Int>> = emptyMap(),"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/LayoutSelection.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Integer, Map<SizeSelector, Integer>> of getChildren: replace with IntObjectMap"
+ errorLine1=" val children: Map<Int, Map<SizeSelector, Int>> = emptyMap(),"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/LayoutSelection.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field LayoutMap with type Map<LayoutType, Integer>: replace with ObjectIntMap"
+ errorLine1="/** Mapping from layout type to fixed layout (if any). */"
+ errorLine2="^">
+ <location
+ file="src/main/java/androidx/glance/appwidget/LayoutSelection.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable children with type Map<SizeSelector, ? extends Integer>: replace with ObjectIntMap"
+ errorLine1=" val children = translationContext.parentContext.children[pos]"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/glance/appwidget/LayoutSelection.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable var6b5ab7c1 with type Map<SizeSelector, ? extends Integer>: replace with ObjectIntMap"
+ errorLine1=" val children = translationContext.parentContext.children[pos]"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/glance/appwidget/LayoutSelection.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable childrenMapping with type Map<Integer, ? extends Map<SizeSelector, ? extends Integer>>: replace with IntObjectMap"
+ errorLine1=" val childrenMapping = generatedChildren[type]"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/glance/appwidget/LayoutSelection.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable var405c8518 with type Map<Integer, ? extends Map<SizeSelector, ? extends Integer>>: replace with IntObjectMap"
+ errorLine1=" val childrenMapping = generatedChildren[type]"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/glance/appwidget/LayoutSelection.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field ids with type ArrayList<Long>: replace with LongList"
+ errorLine1=" private val ids = arrayListOf<Long>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/RemoteCollectionItems.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor Responsive has parameter sizes with type Set<DpSize>: replace with LongSet"
+ errorLine1=" class Responsive(val sizes: Set<DpSize>) : SizeMode {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/SizeMode.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field sizes with type Set<DpSize>: replace with LongSet"
+ errorLine1=" class Responsive(val sizes: Set<DpSize>) : SizeMode {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/SizeMode.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Set<DpSize> of getSizes: replace with LongSet"
+ errorLine1=" class Responsive(val sizes: Set<DpSize>) : SizeMode {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/SizeMode.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor LayoutConfiguration has parameter layoutConfig with type Map<LayoutNode, Integer>: replace with ObjectIntMap"
+ errorLine1=" private val layoutConfig: MutableMap<LayoutNode, Int>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/WidgetLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field layoutConfig with type Map<LayoutNode, Integer>: replace with ObjectIntMap"
+ errorLine1=" private val layoutConfig: MutableMap<LayoutNode, Int>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/WidgetLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor LayoutConfiguration has parameter usedLayoutIds with type Set<Integer>: replace with IntSet"
+ errorLine1=" private val usedLayoutIds: MutableSet<Int> = mutableSetOf(),"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/WidgetLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field usedLayoutIds with type Set<Integer>: replace with IntSet"
+ errorLine1=" private val usedLayoutIds: MutableSet<Int> = mutableSetOf(),"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/WidgetLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor LayoutConfiguration has parameter existingLayoutIds with type Set<Integer>: replace with IntSet"
+ errorLine1=" private val existingLayoutIds: MutableSet<Int> = mutableSetOf(),"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/WidgetLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field existingLayoutIds with type Set<Integer>: replace with IntSet"
+ errorLine1=" private val existingLayoutIds: MutableSet<Int> = mutableSetOf(),"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/appwidget/WidgetLayout.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable layouts with type Map<LayoutNode, Integer>: replace with ObjectIntMap"
+ errorLine1=" val layouts = config.layoutList.associate {"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/glance/appwidget/WidgetLayout.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method extractAllSizes has parameter 'minSize' with type Function0<DpSize>."
errorLine1="internal fun Bundle.extractAllSizes(minSize: () -> DpSize): List<DpSize> {"
diff --git a/glance/glance-wear-tiles/lint-baseline.xml b/glance/glance-wear-tiles/lint-baseline.xml
index 5a135eb..336a7a1 100644
--- a/glance/glance-wear-tiles/lint-baseline.xml
+++ b/glance/glance-wear-tiles/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.3.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha02)" variant="all" version="8.3.0-alpha02">
<issue
id="ListIterator"
@@ -127,4 +127,13 @@
file="src/main/java/androidx/glance/wear/tiles/WearCompositionTranslator.kt"/>
</issue>
+ <issue
+ id="PrimitiveInCollection"
+ message="variable toDelete with type List<Integer>: replace with IntList"
+ errorLine1=" val toDelete = mutableListOf<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/wear/tiles/NormalizeCompositionTree.kt"/>
+ </issue>
+
</issues>
diff --git a/glance/glance/lint-baseline.xml b/glance/glance/lint-baseline.xml
index 7b47edb..4a64687 100644
--- a/glance/glance/lint-baseline.xml
+++ b/glance/glance/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.3.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha02)" variant="all" version="8.3.0-alpha02">
<issue
id="RestrictedApiAndroidX"
@@ -101,6 +101,69 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="return type List<FontStyle> of values: replace with IntList"
+ errorLine1=" fun values(): List<FontStyle> = listOf(Normal, Italic)"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/text/FontStyle.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method toDp has parameter $this$toDp with type List<Integer>: replace with IntList"
+ errorLine1="private fun List<Int>.toDp(resources: Resources) ="
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/layout/Padding.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor PaddingDimension has parameter resourceIds with type List<Integer>: replace with IntList"
+ errorLine1=" val resourceIds: List<Int> = emptyList(),"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/layout/Padding.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field resourceIds with type List<Integer>: replace with IntList"
+ errorLine1=" val resourceIds: List<Int> = emptyList(),"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/layout/Padding.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of getResourceIds: replace with IntList"
+ errorLine1=" val resourceIds: List<Int> = emptyList(),"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/layout/Padding.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<TextAlign> of values: replace with IntList"
+ errorLine1=" fun values(): List<TextAlign> = listOf(Left, Right, Center, Start, End)"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/text/TextAlign.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method combine has parameter decorations with type List<TextDecoration>: replace with IntList"
+ errorLine1=" fun combine(decorations: List<TextDecoration>): TextDecoration {"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/glance/text/TextDecoration.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor InteractiveFrameClock has parameter 'nanoTime' with type Function0<Long>."
errorLine1=" private val nanoTime: () -> Long = { System.nanoTime() }"
diff --git a/graphics/integration-tests/testapp-compose/lint-baseline.xml b/graphics/integration-tests/testapp-compose/lint-baseline.xml
index 49e5f2e..e5a3396 100644
--- a/graphics/integration-tests/testapp-compose/lint-baseline.xml
+++ b/graphics/integration-tests/testapp-compose/lint-baseline.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable sizedShapes with type Map<Size, Sequence<? extends Cubic>>: replace with LongObjectMap"
+ errorLine1=" val sizedShapes = remember(polygon) { mutableMapOf<Size, Sequence<Cubic>>() }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/graphics/shapes/testcompose/MainActivity.kt"/>
+ </issue>
<issue
id="PrimitiveInLambda"
diff --git a/navigation/navigation-compose/lint-baseline.xml b/navigation/navigation-compose/lint-baseline.xml
new file mode 100644
index 0000000..4f16033
--- /dev/null
+++ b/navigation/navigation-compose/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable zIndices with type Map<String, Float>: replace with ObjectFloatMap"
+ errorLine1=" val zIndices = remember { mutableMapOf<String, Float>() }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/navigation/compose/NavHost.kt"/>
+ </issue>
+
+</issues>
diff --git a/text/text/lint-baseline.xml b/text/text/lint-baseline.xml
new file mode 100644
index 0000000..9d2be4d
--- /dev/null
+++ b/text/text/lint-baseline.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field paragraphEnds with type List<Integer>: replace with IntList"
+ errorLine1=" private val paragraphEnds: List<Int>"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/text/android/LayoutHelper.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable lineFeeds with type List<Integer>: replace with IntList"
+ errorLine1=" val lineFeeds = mutableListOf<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/text/android/LayoutHelper.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of breakInWords: replace with IntList"
+ errorLine1=" private fun breakInWords(layoutHelper: LayoutHelper): List<Int> {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable words with type List<? extends Integer>: replace with IntList"
+ errorLine1=" val words = breakWithBreakIterator(text, BreakIterator.getLineInstance(Locale.getDefault()))"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable set with type TreeSet<Integer>: replace with IntSet"
+ errorLine1=" val set = TreeSet<Int>().apply {"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of breakWithBreakIterator: replace with IntList"
+ errorLine1=" private fun breakWithBreakIterator(text: CharSequence, breaker: BreakIterator): List<Int> {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable res with type List<Integer>: replace with IntList"
+ errorLine1=" val res = mutableListOf(0)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of breakOffsets: replace with IntList"
+ errorLine1=" fun breakOffsets(layoutHelper: LayoutHelper, segmentType: SegmentType): List<Int> {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt"/>
+ </issue>
+
+</issues>
diff --git a/tv/tv-foundation/lint-baseline.xml b/tv/tv-foundation/lint-baseline.xml
index be63ad3..13e1e23 100644
--- a/tv/tv-foundation/lint-baseline.xml
+++ b/tv/tv-foundation/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.3.0-alpha02" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha02)" variant="all" version="8.3.0-alpha02">
<issue
id="BanThreadSleep"
@@ -38,6 +38,276 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of calculateLazyLayoutPinnedIndices: replace with IntList"
+ errorLine1="): List<Int> {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/LazyBeyondBoundsModifier.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" val pinnedItems = mutableListOf<Int>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/LazyBeyondBoundsModifier.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable pinnedItems with type List<? extends Integer>: replace with IntList"
+ errorLine1=" val pinnedItems = itemProvider.calculateLazyLayoutPinnedIndices("
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGrid.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of calculateCrossAxisCellSizes: replace with IntList"
+ errorLine1=" fun Density.calculateCrossAxisCellSizes(availableSize: Int, spacing: Int): List<Int>"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridDsl.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of calculateCellsCrossAxisSizeImpl: replace with IntList"
+ errorLine1="): List<Int> {"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridDsl.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method measureLazyGrid has parameter pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedItems: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method calculateExtraItems has parameter pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedItems: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method createLine has parameter spans with type List<TvGridItemSpan>: replace with LongList"
+ errorLine1=" spans: List<TvGridItemSpan>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor LazyGridMeasuredLine has parameter spans with type List<TvGridItemSpan>: replace with LongList"
+ errorLine1=" private val spans: List<TvGridItemSpan>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridMeasuredLine.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field spans with type List<TvGridItemSpan>: replace with LongList"
+ errorLine1=" private val spans: List<TvGridItemSpan>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridMeasuredLine.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor LineConfiguration has parameter spans with type List<TvGridItemSpan>: replace with LongList"
+ errorLine1=" class LineConfiguration(val firstItemIndex: Int, val spans: List<TvGridItemSpan>)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field spans with type List<TvGridItemSpan>: replace with LongList"
+ errorLine1=" class LineConfiguration(val firstItemIndex: Int, val spans: List<TvGridItemSpan>)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<TvGridItemSpan> of getSpans: replace with LongList"
+ errorLine1=" class LineConfiguration(val firstItemIndex: Int, val spans: List<TvGridItemSpan>)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field cachedBucket with type List<Integer>: replace with IntList"
+ errorLine1=" /**"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field previousDefaultSpans with type List<TvGridItemSpan>: replace with LongList"
+ errorLine1=" /**"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<TvGridItemSpan> of getDefaultSpans: replace with LongList"
+ errorLine1=" private fun getDefaultSpans(currentSlotsPerLine: Int) ="
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable spans with type List<TvGridItemSpan>: replace with LongList"
+ errorLine1=" val spans = mutableListOf<TvGridItemSpan>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field map with type Map<Object, Integer>: replace with ObjectIntMap"
+ errorLine1=" private val map: Map<Any, Int>"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/layout/LazyLayoutKeyIndexMap.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable pinnedItems with type List<? extends Integer>: replace with IntList"
+ errorLine1=" val pinnedItems = itemProvider.calculateLazyLayoutPinnedIndices("
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/LazyList.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method findOrComposeLazyListHeader has parameter headerIndexes with type List<Integer>: replace with IntList"
+ errorLine1=" headerIndexes: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/LazyListHeaders.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of getHeaderIndexes: replace with IntList"
+ errorLine1=" val headerIndexes: List<Int>"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/LazyListItemProvider.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method measureLazyList has parameter headerIndexes with type List<Integer>: replace with IntList"
+ errorLine1=" headerIndexes: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/LazyListMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method measureLazyList has parameter pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedItems: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/LazyListMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method createItemsAfterList has parameter pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedItems: List<Int>,"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/LazyListMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method createItemsBeforeList has parameter pinnedItems with type List<Integer>: replace with IntList"
+ errorLine1=" pinnedItems: List<Int>"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/LazyListMeasure.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field _headerIndexes with type List<Integer>: replace with IntList"
+ errorLine1=" private var _headerIndexes: MutableList<Int>? = null"
+ errorLine2=" ~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/TvLazyListIntervalContent.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Integer> of getHeaderIndexes: replace with IntList"
+ errorLine1=" val headerIndexes: List<Int> get() = _headerIndexes ?: emptyList()"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/TvLazyListIntervalContent.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable vard55442a7 with type List<Integer>: replace with IntList"
+ errorLine1=" val headerIndexes: List<Int> get() = _headerIndexes ?: emptyList()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/TvLazyListIntervalContent.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable headersIndexes with type List<Integer>: replace with IntList"
+ errorLine1=" val headersIndexes = _headerIndexes ?: mutableListOf<Int>().also {"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/TvLazyListIntervalContent.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable vard554f0be with type List<Integer>: replace with IntList"
+ errorLine1=" val headersIndexes = _headerIndexes ?: mutableListOf<Int>().also {"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/tv/foundation/lazy/list/TvLazyListIntervalContent.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method items has parameter 'key' with type Function1<? super Integer, ? extends Object>."
errorLine1=" key: ((index: Int) -> Any)? = null,"
diff --git a/wear/compose/compose-foundation/lint-baseline.xml b/wear/compose/compose-foundation/lint-baseline.xml
index 83c5cbf..3802915 100644
--- a/wear/compose/compose-foundation/lint-baseline.xml
+++ b/wear/compose/compose-foundation/lint-baseline.xml
@@ -1,5 +1,212 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta02" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta02)" variant="all" version="8.1.0-beta02">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable weights with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val weights = childrenInLayoutOrder.fastMap { node ->"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/CurvedColumn.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method radialGradientBackground has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/CurvedDraw.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method angularGradientBackground has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/CurvedDraw.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method colorsToColorStops has parameter colors with type List<Color>: replace with LongList"
+ errorLine1="private fun colorsToColorStops(colors: List<Color>): Array<Pair<Float, Color>> ="
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/CurvedDraw.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable weights with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val weights = childrenInLayoutOrder.fastMap { node ->"
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/CurvedRow.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<SwipeToDismissValue, Float> of anchors: replace with ObjectFloatMap"
+ errorLine1="private fun anchors(): Map<SwipeToDismissValue, Float> ="
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeToDismissBox.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<RevealValue, Float> of createAnchors: replace with IntFloatMap"
+ errorLine1="): Map<RevealValue, Float> {"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeToReveal.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor RevealState has parameter anchors with type Map<RevealValue, Float>: replace with IntFloatMap"
+ errorLine1=" internal val anchors: Map<RevealValue, Float>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeToReveal.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field anchors with type Map<RevealValue, Float>: replace with IntFloatMap"
+ errorLine1=" internal val anchors: Map<RevealValue, Float>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeToReveal.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<RevealValue, Float> of getAnchors$lint_module: replace with IntFloatMap"
+ errorLine1=" internal val anchors: Map<RevealValue, Float>,"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeToReveal.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<RevealValue, Float> of getSwipeAnchors: replace with IntFloatMap"
+ errorLine1=" public val swipeAnchors: Map<RevealValue, Float>"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeToReveal.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method rememberRevealState has parameter anchors with type Map<RevealValue, Float>: replace with IntFloatMap"
+ errorLine1=" anchors: Map<RevealValue, Float> = createAnchors(),"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeToReveal.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable previousAnchors with type Map<T, ? extends Float>: replace with ObjectFloatMap"
+ errorLine1=" val previousAnchors = state.anchors"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable newAnchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1=" val newAnchors = mutableMapOf<T, Float>()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method setAnchors$lint_module has parameter <set-?> with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1=" internal var anchors by mutableStateOf(emptyMap<T, Float>())"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<T, Float> of getAnchors$lint_module: replace with ObjectFloatMap"
+ errorLine1=" internal var anchors by mutableStateOf(emptyMap<T, Float>())"
+ errorLine2=" ~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method updateAnchors$lint_module has parameter newAnchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1=" internal fun updateAnchors(newAnchors: Map<T, Float>): Boolean {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable currentAnchors with type Map<T, ? extends Float>: replace with ObjectFloatMap"
+ errorLine1=" val currentAnchors = anchors"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method onAnchorsChanged has parameter previousAnchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1=" previousAnchors: Map<T, Float>,"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method onAnchorsChanged has parameter newAnchors with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1=" newAnchors: Map<T, Float>"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method closestAnchor has parameter $this$closestAnchor with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1="private fun <T> Map<T, Float>.closestAnchor("
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method minOrNull has parameter $this$minOrNull with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1="private fun <T> Map<T, Float>.minOrNull() = minOfOrNull { (_, offset) -> offset }"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method maxOrNull has parameter $this$maxOrNull with type Map<T, Float>: replace with ObjectFloatMap"
+ errorLine1="private fun <T> Map<T, Float>.maxOrNull() = maxOfOrNull { (_, offset) -> offset }"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
+ </issue>
<issue
id="PrimitiveInLambda"
diff --git a/wear/compose/compose-material/lint-baseline.xml b/wear/compose/compose-material/lint-baseline.xml
index 3ebc76a..4818b317 100644
--- a/wear/compose/compose-material/lint-baseline.xml
+++ b/wear/compose/compose-material/lint-baseline.xml
@@ -1,5 +1,221 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor FortyFiveDegreeLinearGradient has parameter colors with type List<Color>: replace with LongList"
+ errorLine1=" private val colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Card.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field colors with type List<Color>: replace with LongList"
+ errorLine1=" private val colors: List<Color>,"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Card.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="constructor FortyFiveDegreeLinearGradient has parameter stops with type List<Float>: replace with FloatList"
+ errorLine1=" private val stops: List<Float>? = null,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Card.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field stops with type List<Float>: replace with FloatList"
+ errorLine1=" private val stops: List<Float>? = null,"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Card.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable backgroundColors with type List<? extends Color>: replace with LongList"
+ errorLine1=" val backgroundColors: List<Color>"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Chip.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable disabledBackgroundColors with type List<? extends Color>: replace with LongList"
+ errorLine1=" val disabledBackgroundColors: List<Color>"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Chip.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method setAnchors$lint_module has parameter <set-?> with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" internal var anchors by mutableStateOf(emptyMap<Float, T>())"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type Map<Float, T> of getAnchors$lint_module: replace with FloatObjectMap"
+ errorLine1=" internal var anchors by mutableStateOf(emptyMap<Float, T>())"
+ errorLine2=" ~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method ensureInit$lint_module has parameter newAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" internal fun ensureInit(newAnchors: Map<Float, T>) {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method processNewAnchors$lint_module has parameter oldAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" oldAnchors: Map<Float, T>,"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method processNewAnchors$lint_module has parameter newAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" newAnchors: Map<Float, T>"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable bounds with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val bounds = findBounds(offset.value, anchors.keys)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method swipeable has parameter anchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" anchors: Map<Float, T>,"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable oldAnchors with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1=" val oldAnchors = state.anchors"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method findBounds has parameter anchors with type Set<Float>: replace with FloatSet"
+ errorLine1=" anchors: Set<Float>"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="return type List<Float> of findBounds: replace with FloatList"
+ errorLine1="): List<Float> {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method computeTarget has parameter anchors with type Set<Float>: replace with FloatSet"
+ errorLine1=" anchors: Set<Float>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable bounds with type List<? extends Float>: replace with FloatList"
+ errorLine1=" val bounds = findBounds(offset, anchors)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method getOffset has parameter $this$getOffset with type Map<Float, ? extends T>: replace with FloatObjectMap"
+ errorLine1="private fun <T> Map<Float, T>.getOffset(state: T): Float? {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="method resistanceConfig has parameter anchors with type Set<Float>: replace with FloatSet"
+ errorLine1=" anchors: Set<Float>,"
+ errorLine2=" ~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable checkedBackgroundColors with type List<? extends Color>: replace with LongList"
+ errorLine1=" val checkedBackgroundColors: List<Color>"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/ToggleChip.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable disabledCheckedBackgroundColors with type List<? extends Color>: replace with LongList"
+ errorLine1=" val disabledCheckedBackgroundColors: List<Color>"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/ToggleChip.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable uncheckedBackgroundColors with type List<? extends Color>: replace with LongList"
+ errorLine1=" val uncheckedBackgroundColors: List<Color>"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/ToggleChip.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable disabledUncheckedBackgroundColors with type List<? extends Color>: replace with LongList"
+ errorLine1=" val disabledUncheckedBackgroundColors: List<Color>"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/material/ToggleChip.kt"/>
+ </issue>
<issue
id="PrimitiveInLambda"
diff --git a/wear/compose/integration-tests/demos/lint-baseline.xml b/wear/compose/integration-tests/demos/lint-baseline.xml
index 6223fbbe..ad43514 100644
--- a/wear/compose/integration-tests/demos/lint-baseline.xml
+++ b/wear/compose/integration-tests/demos/lint-baseline.xml
@@ -11,6 +11,60 @@
</issue>
<issue
+ id="PrimitiveInCollection"
+ message="field map with type Map<Integer, FocusableElementsTimePicker>: replace with IntObjectMap"
+ errorLine1=" private val map = FocusableElementsTimePicker.values().associateBy { it.index }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/integration/demos/PickerDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field map with type Map<Integer, FocusableElement12Hour>: replace with IntObjectMap"
+ errorLine1=" private val map = FocusableElement12Hour.values().associateBy { it.index }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/integration/demos/PickerDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="field map with type Map<Integer, FocusableElementDatePicker>: replace with IntObjectMap"
+ errorLine1=" private val map = FocusableElementDatePicker.values().associateBy { it.index }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/integration/demos/PickerDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable alignmentValues with type List<? extends PositionIndicatorAlignment>: replace with IntList"
+ errorLine1=" val alignmentValues = listOf("
+ errorLine2=" ^">
+ <location
+ file="src/main/java/androidx/wear/compose/integration/demos/PositionIndicatorDemos.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable colors with type List<? extends Color>: replace with LongList"
+ errorLine1=" val colors = listOf(Color.Blue, Color.Red, Color.Green, Color.Cyan, Color.Magenta)"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/integration/demos/SwipeToDismissDemo.kt"/>
+ </issue>
+
+ <issue
+ id="PrimitiveInCollection"
+ message="variable items with type SnapshotStateList<Integer>: replace with IntList"
+ errorLine1=" val items = remember { mutableStateListOf(1, 2) }"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/compose/integration/demos/SwipeToDismissDemo.kt"/>
+ </issue>
+
+ <issue
id="PrimitiveInLambda"
message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable 'pickerOption' with type Function3<? super PickerScope, ? super Integer, ? super Boolean, ? extends Unit>."
errorLine1=" val pickerOption = pickerTextOption(textStyle) { "%02d".format(it) }"
