Merge "Update ignore files" into androidx-main
diff --git a/benchmark/benchmark-common/api/current.ignore b/benchmark/benchmark-common/api/current.ignore
deleted file mode 100644
index 44a73f7..0000000
--- a/benchmark/benchmark-common/api/current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.benchmark.TraceCompatKt:
-    Removed class androidx.benchmark.TraceCompatKt
diff --git a/benchmark/benchmark-common/api/restricted_current.ignore b/benchmark/benchmark-common/api/restricted_current.ignore
deleted file mode 100644
index 44a73f7..0000000
--- a/benchmark/benchmark-common/api/restricted_current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.benchmark.TraceCompatKt:
-    Removed class androidx.benchmark.TraceCompatKt
diff --git a/benchmark/benchmark-macro/api/restricted_current.ignore b/benchmark/benchmark-macro/api/restricted_current.ignore
deleted file mode 100644
index 5782d9d..0000000
--- a/benchmark/benchmark-macro/api/restricted_current.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.benchmark.macro.AudioUnderrunMetric:
-    Removed class androidx.benchmark.macro.AudioUnderrunMetric
-
-
-RemovedMethod: androidx.benchmark.macro.BaselineProfilesKt#collectBaselineProfile(String, String, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit>, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit>):
-    Removed method androidx.benchmark.macro.BaselineProfilesKt.collectBaselineProfile(String,String,kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit>,kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit>)
diff --git a/camera/camera-core/api/current.ignore b/camera/camera-core/api/current.ignore
deleted file mode 100644
index f6bfd36..0000000
--- a/camera/camera-core/api/current.ignore
+++ /dev/null
@@ -1,11 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.camera.core.CameraControl#setExposureCompensationIndex(int):
-    Added method androidx.camera.core.CameraControl.setExposureCompensationIndex(int)
-AddedAbstractMethod: androidx.camera.core.CameraInfo#getCameraSelector():
-    Added method androidx.camera.core.CameraInfo.getCameraSelector()
-AddedAbstractMethod: androidx.camera.core.CameraInfo#getCameraState():
-    Added method androidx.camera.core.CameraInfo.getCameraState()
-AddedAbstractMethod: androidx.camera.core.CameraInfo#getExposureState():
-    Added method androidx.camera.core.CameraInfo.getExposureState()
-AddedAbstractMethod: androidx.camera.core.ImageInfo#getSensorToBufferTransformMatrix():
-    Added method androidx.camera.core.ImageInfo.getSensorToBufferTransformMatrix()
diff --git a/camera/camera-core/api/restricted_current.ignore b/camera/camera-core/api/restricted_current.ignore
deleted file mode 100644
index f6bfd36..0000000
--- a/camera/camera-core/api/restricted_current.ignore
+++ /dev/null
@@ -1,11 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.camera.core.CameraControl#setExposureCompensationIndex(int):
-    Added method androidx.camera.core.CameraControl.setExposureCompensationIndex(int)
-AddedAbstractMethod: androidx.camera.core.CameraInfo#getCameraSelector():
-    Added method androidx.camera.core.CameraInfo.getCameraSelector()
-AddedAbstractMethod: androidx.camera.core.CameraInfo#getCameraState():
-    Added method androidx.camera.core.CameraInfo.getCameraState()
-AddedAbstractMethod: androidx.camera.core.CameraInfo#getExposureState():
-    Added method androidx.camera.core.CameraInfo.getExposureState()
-AddedAbstractMethod: androidx.camera.core.ImageInfo#getSensorToBufferTransformMatrix():
-    Added method androidx.camera.core.ImageInfo.getSensorToBufferTransformMatrix()
diff --git a/compose/animation/animation-core/api/current.ignore b/compose/animation/animation-core/api/current.ignore
deleted file mode 100644
index 6c59d8c..0000000
--- a/compose/animation/animation-core/api/current.ignore
+++ /dev/null
@@ -1,19 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.compose.animation.core.AnimationSpecKt#infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T>, androidx.compose.animation.core.RepeatMode):
-    Attempted to remove @NonNull annotation from method androidx.compose.animation.core.AnimationSpecKt.infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T>,androidx.compose.animation.core.RepeatMode)
-InvalidNullConversion: androidx.compose.animation.core.AnimationSpecKt#repeatable(int, androidx.compose.animation.core.DurationBasedAnimationSpec<T>, androidx.compose.animation.core.RepeatMode):
-    Attempted to remove @NonNull annotation from method androidx.compose.animation.core.AnimationSpecKt.repeatable(int,androidx.compose.animation.core.DurationBasedAnimationSpec<T>,androidx.compose.animation.core.RepeatMode)
-
-
-RemovedInterface: androidx.compose.animation.core.InfiniteAnimationPolicy:
-    Removed class androidx.compose.animation.core.InfiniteAnimationPolicy
-
-
-RemovedMethod: androidx.compose.animation.core.InfiniteRepeatableSpec#InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T>, androidx.compose.animation.core.RepeatMode):
-    Removed constructor androidx.compose.animation.core.InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T>,androidx.compose.animation.core.RepeatMode)
-RemovedMethod: androidx.compose.animation.core.RepeatableSpec#RepeatableSpec(int, androidx.compose.animation.core.DurationBasedAnimationSpec<T>, androidx.compose.animation.core.RepeatMode):
-    Removed constructor androidx.compose.animation.core.RepeatableSpec(int,androidx.compose.animation.core.DurationBasedAnimationSpec<T>,androidx.compose.animation.core.RepeatMode)
-RemovedMethod: androidx.compose.animation.core.VectorizedInfiniteRepeatableSpec#VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V>, androidx.compose.animation.core.RepeatMode):
-    Removed constructor androidx.compose.animation.core.VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V>,androidx.compose.animation.core.RepeatMode)
-RemovedMethod: androidx.compose.animation.core.VectorizedRepeatableSpec#VectorizedRepeatableSpec(int, androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V>, androidx.compose.animation.core.RepeatMode):
-    Removed constructor androidx.compose.animation.core.VectorizedRepeatableSpec(int,androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V>,androidx.compose.animation.core.RepeatMode)
diff --git a/compose/animation/animation-core/api/restricted_current.ignore b/compose/animation/animation-core/api/restricted_current.ignore
deleted file mode 100644
index ce4555e..0000000
--- a/compose/animation/animation-core/api/restricted_current.ignore
+++ /dev/null
@@ -1,27 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.compose.animation.core.AnimationSpecKt#infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T>, androidx.compose.animation.core.RepeatMode):
-    Attempted to remove @NonNull annotation from method androidx.compose.animation.core.AnimationSpecKt.infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T>,androidx.compose.animation.core.RepeatMode)
-InvalidNullConversion: androidx.compose.animation.core.AnimationSpecKt#repeatable(int, androidx.compose.animation.core.DurationBasedAnimationSpec<T>, androidx.compose.animation.core.RepeatMode):
-    Attempted to remove @NonNull annotation from method androidx.compose.animation.core.AnimationSpecKt.repeatable(int,androidx.compose.animation.core.DurationBasedAnimationSpec<T>,androidx.compose.animation.core.RepeatMode)
-
-
-ParameterNameChange: androidx.compose.animation.core.TransitionKt#createChildTransitionInternal(androidx.compose.animation.core.Transition<S>, T, T, String) parameter #3:
-    Attempted to change parameter name from label to childLabel in method androidx.compose.animation.core.TransitionKt.createChildTransitionInternal
-
-
-RemovedField: androidx.compose.animation.core.Transition#isSeeking$delegate:
-    Removed field androidx.compose.animation.core.Transition.isSeeking$delegate
-
-
-RemovedInterface: androidx.compose.animation.core.InfiniteAnimationPolicy:
-    Removed class androidx.compose.animation.core.InfiniteAnimationPolicy
-
-
-RemovedMethod: androidx.compose.animation.core.InfiniteRepeatableSpec#InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T>, androidx.compose.animation.core.RepeatMode):
-    Removed constructor androidx.compose.animation.core.InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T>,androidx.compose.animation.core.RepeatMode)
-RemovedMethod: androidx.compose.animation.core.RepeatableSpec#RepeatableSpec(int, androidx.compose.animation.core.DurationBasedAnimationSpec<T>, androidx.compose.animation.core.RepeatMode):
-    Removed constructor androidx.compose.animation.core.RepeatableSpec(int,androidx.compose.animation.core.DurationBasedAnimationSpec<T>,androidx.compose.animation.core.RepeatMode)
-RemovedMethod: androidx.compose.animation.core.VectorizedInfiniteRepeatableSpec#VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V>, androidx.compose.animation.core.RepeatMode):
-    Removed constructor androidx.compose.animation.core.VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V>,androidx.compose.animation.core.RepeatMode)
-RemovedMethod: androidx.compose.animation.core.VectorizedRepeatableSpec#VectorizedRepeatableSpec(int, androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V>, androidx.compose.animation.core.RepeatMode):
-    Removed constructor androidx.compose.animation.core.VectorizedRepeatableSpec(int,androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V>,androidx.compose.animation.core.RepeatMode)
diff --git a/compose/material/material/api/current.ignore b/compose/material/material/api/current.ignore
deleted file mode 100644
index 4aae248..0000000
--- a/compose/material/material/api/current.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.compose.material.ButtonDefaults#elevation(float, float, float):
-    Attempted to remove @NonNull annotation from method androidx.compose.material.ButtonDefaults.elevation(float,float,float)
-InvalidNullConversion: androidx.compose.material.FloatingActionButtonDefaults#elevation(float, float):
-    Attempted to remove @NonNull annotation from method androidx.compose.material.FloatingActionButtonDefaults.elevation(float,float)
diff --git a/compose/material/material/api/restricted_current.ignore b/compose/material/material/api/restricted_current.ignore
deleted file mode 100644
index 4aae248..0000000
--- a/compose/material/material/api/restricted_current.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.compose.material.ButtonDefaults#elevation(float, float, float):
-    Attempted to remove @NonNull annotation from method androidx.compose.material.ButtonDefaults.elevation(float,float,float)
-InvalidNullConversion: androidx.compose.material.FloatingActionButtonDefaults#elevation(float, float):
-    Attempted to remove @NonNull annotation from method androidx.compose.material.FloatingActionButtonDefaults.elevation(float,float)
diff --git a/compose/runtime/runtime/api/current.ignore b/compose/runtime/runtime/api/current.ignore
index 182c28a..6c700d97 100644
--- a/compose/runtime/runtime/api/current.ignore
+++ b/compose/runtime/runtime/api/current.ignore
@@ -11,7 +11,3 @@
     Added method androidx.compose.runtime.ControlledComposition.changesApplied()
 AddedAbstractMethod: androidx.compose.runtime.ControlledComposition#delegateInvalidations(androidx.compose.runtime.ControlledComposition, int, kotlin.jvm.functions.Function0<? extends R>):
     Added method androidx.compose.runtime.ControlledComposition.delegateInvalidations(androidx.compose.runtime.ControlledComposition,int,kotlin.jvm.functions.Function0<? extends R>)
-AddedAbstractMethod: androidx.compose.runtime.ControlledComposition#disposeUnusedMovableContent(androidx.compose.runtime.MovableContentState):
-    Added method androidx.compose.runtime.ControlledComposition.disposeUnusedMovableContent(androidx.compose.runtime.MovableContentState)
-AddedAbstractMethod: androidx.compose.runtime.ControlledComposition#insertMovableContent(java.util.List<kotlin.Pair<androidx.compose.runtime.MovableContentStateReference,androidx.compose.runtime.MovableContentStateReference>>):
-    Added method androidx.compose.runtime.ControlledComposition.insertMovableContent(java.util.List<kotlin.Pair<androidx.compose.runtime.MovableContentStateReference,androidx.compose.runtime.MovableContentStateReference>>)
diff --git a/compose/runtime/runtime/api/restricted_current.ignore b/compose/runtime/runtime/api/restricted_current.ignore
index 182c28a..6c700d97 100644
--- a/compose/runtime/runtime/api/restricted_current.ignore
+++ b/compose/runtime/runtime/api/restricted_current.ignore
@@ -11,7 +11,3 @@
     Added method androidx.compose.runtime.ControlledComposition.changesApplied()
 AddedAbstractMethod: androidx.compose.runtime.ControlledComposition#delegateInvalidations(androidx.compose.runtime.ControlledComposition, int, kotlin.jvm.functions.Function0<? extends R>):
     Added method androidx.compose.runtime.ControlledComposition.delegateInvalidations(androidx.compose.runtime.ControlledComposition,int,kotlin.jvm.functions.Function0<? extends R>)
-AddedAbstractMethod: androidx.compose.runtime.ControlledComposition#disposeUnusedMovableContent(androidx.compose.runtime.MovableContentState):
-    Added method androidx.compose.runtime.ControlledComposition.disposeUnusedMovableContent(androidx.compose.runtime.MovableContentState)
-AddedAbstractMethod: androidx.compose.runtime.ControlledComposition#insertMovableContent(java.util.List<kotlin.Pair<androidx.compose.runtime.MovableContentStateReference,androidx.compose.runtime.MovableContentStateReference>>):
-    Added method androidx.compose.runtime.ControlledComposition.insertMovableContent(java.util.List<kotlin.Pair<androidx.compose.runtime.MovableContentStateReference,androidx.compose.runtime.MovableContentStateReference>>)
diff --git a/compose/ui/ui-graphics/api/current.ignore b/compose/ui/ui-graphics/api/current.ignore
deleted file mode 100644
index 3ccbf6c..0000000
--- a/compose/ui/ui-graphics/api/current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.compose.ui.graphics.drawscope.DrawScope#offsetSize(long, long):
-    Removed method androidx.compose.ui.graphics.drawscope.DrawScope.offsetSize(long,long)
diff --git a/compose/ui/ui-graphics/api/restricted_current.ignore b/compose/ui/ui-graphics/api/restricted_current.ignore
deleted file mode 100644
index 3ccbf6c..0000000
--- a/compose/ui/ui-graphics/api/restricted_current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.compose.ui.graphics.drawscope.DrawScope#offsetSize(long, long):
-    Removed method androidx.compose.ui.graphics.drawscope.DrawScope.offsetSize(long,long)
diff --git a/compose/ui/ui-test-junit4/api/current.ignore b/compose/ui/ui-test-junit4/api/current.ignore
deleted file mode 100644
index a21b2a6..0000000
--- a/compose/ui/ui-test-junit4/api/current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedSuperclass: androidx.compose.ui.test.junit4.android.ComposeNotIdleException:
-    Class androidx.compose.ui.test.junit4.android.ComposeNotIdleException superclass changed from java.lang.Throwable to java.lang.Exception
diff --git a/compose/ui/ui-test-junit4/api/restricted_current.ignore b/compose/ui/ui-test-junit4/api/restricted_current.ignore
deleted file mode 100644
index a21b2a6..0000000
--- a/compose/ui/ui-test-junit4/api/restricted_current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedSuperclass: androidx.compose.ui.test.junit4.android.ComposeNotIdleException:
-    Class androidx.compose.ui.test.junit4.android.ComposeNotIdleException superclass changed from java.lang.Throwable to java.lang.Exception
diff --git a/compose/ui/ui-test/api/current.ignore b/compose/ui/ui-test/api/current.ignore
deleted file mode 100644
index ee4027b..0000000
--- a/compose/ui/ui-test/api/current.ignore
+++ /dev/null
@@ -1,11 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.compose.ui.test.MultiModalInjectionScope#touch(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit>):
-    Added method androidx.compose.ui.test.MultiModalInjectionScope.touch(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit>)
-
-
-RemovedMethod: androidx.compose.ui.test.InjectionScope#dispose():
-    Removed method androidx.compose.ui.test.InjectionScope.dispose()
-RemovedMethod: androidx.compose.ui.test.InjectionScope#flush():
-    Removed method androidx.compose.ui.test.InjectionScope.flush()
-RemovedMethod: androidx.compose.ui.test.MultiModalInjectionScope#getTouch():
-    Removed method androidx.compose.ui.test.MultiModalInjectionScope.getTouch()
diff --git a/compose/ui/ui-test/api/restricted_current.ignore b/compose/ui/ui-test/api/restricted_current.ignore
deleted file mode 100644
index ee4027b..0000000
--- a/compose/ui/ui-test/api/restricted_current.ignore
+++ /dev/null
@@ -1,11 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.compose.ui.test.MultiModalInjectionScope#touch(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit>):
-    Added method androidx.compose.ui.test.MultiModalInjectionScope.touch(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit>)
-
-
-RemovedMethod: androidx.compose.ui.test.InjectionScope#dispose():
-    Removed method androidx.compose.ui.test.InjectionScope.dispose()
-RemovedMethod: androidx.compose.ui.test.InjectionScope#flush():
-    Removed method androidx.compose.ui.test.InjectionScope.flush()
-RemovedMethod: androidx.compose.ui.test.MultiModalInjectionScope#getTouch():
-    Removed method androidx.compose.ui.test.MultiModalInjectionScope.getTouch()
diff --git a/compose/ui/ui-text/api/current.ignore b/compose/ui/ui-text/api/current.ignore
index 6fe22d8..360cd29 100644
--- a/compose/ui/ui-text/api/current.ignore
+++ b/compose/ui/ui-text/api/current.ignore
@@ -1,8 +1,3 @@
 // Baseline format: 1.0
-
-InvalidNullConversion: androidx.compose.ui.text.font.FontKt#Font(int, androidx.compose.ui.text.font.FontWeight, int):
-    Attempted to remove @NonNull annotation from method androidx.compose.ui.text.font.FontKt.Font(int,androidx.compose.ui.text.font.FontWeight,int)
-
-
 RemovedClass: androidx.compose.ui.text.TextLayoutResultKt:
     Removed class androidx.compose.ui.text.TextLayoutResultKt
diff --git a/compose/ui/ui-text/api/restricted_current.ignore b/compose/ui/ui-text/api/restricted_current.ignore
index b2dc22b..360cd29 100644
--- a/compose/ui/ui-text/api/restricted_current.ignore
+++ b/compose/ui/ui-text/api/restricted_current.ignore
@@ -1,13 +1,3 @@
 // Baseline format: 1.0
-AddedAbstractMethod: androidx.compose.ui.text.font.Font#getFontLoad():
-    Added method androidx.compose.ui.text.font.Font.getFontLoad()
-AddedAbstractMethod: androidx.compose.ui.text.font.Font.ResourceLoader#getCacheKey():
-    Added method androidx.compose.ui.text.font.Font.ResourceLoader.getCacheKey()
-
-
-InvalidNullConversion: androidx.compose.ui.text.font.FontKt#Font(int, androidx.compose.ui.text.font.FontWeight, int):
-    Attempted to remove @NonNull annotation from method androidx.compose.ui.text.font.FontKt.Font(int,androidx.compose.ui.text.font.FontWeight,int)
-
-
 RemovedClass: androidx.compose.ui.text.TextLayoutResultKt:
     Removed class androidx.compose.ui.text.TextLayoutResultKt
diff --git a/compose/ui/ui/api/current.ignore b/compose/ui/ui/api/current.ignore
deleted file mode 100644
index e0cadc5..0000000
--- a/compose/ui/ui/api/current.ignore
+++ /dev/null
@@ -1,27 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.compose.ui.layout.LayoutInfo#getDensity():
-    Added method androidx.compose.ui.layout.LayoutInfo.getDensity()
-AddedAbstractMethod: androidx.compose.ui.layout.LayoutInfo#getLayoutDirection():
-    Added method androidx.compose.ui.layout.LayoutInfo.getLayoutDirection()
-AddedAbstractMethod: androidx.compose.ui.layout.LayoutInfo#getViewConfiguration():
-    Added method androidx.compose.ui.layout.LayoutInfo.getViewConfiguration()
-
-
-InvalidNullConversion: androidx.compose.ui.graphics.GraphicsLayerModifierKt#graphicsLayer(androidx.compose.ui.Modifier, float, float, float, float, float, float, float, float, float, float, long, androidx.compose.ui.graphics.Shape, boolean):
-    Attempted to remove @NonNull annotation from method androidx.compose.ui.graphics.GraphicsLayerModifierKt.graphicsLayer(androidx.compose.ui.Modifier,float,float,float,float,float,float,float,float,float,float,long,androidx.compose.ui.graphics.Shape,boolean)
-
-
-RemovedClass: androidx.compose.ui.graphics.vector.AnimatorKt:
-    Removed class androidx.compose.ui.graphics.vector.AnimatorKt
-RemovedClass: androidx.compose.ui.graphics.vector.compat.XmlAnimatedVectorParser_androidKt:
-    Removed class androidx.compose.ui.graphics.vector.compat.XmlAnimatedVectorParser_androidKt
-RemovedClass: androidx.compose.ui.graphics.vector.compat.XmlAnimatorParser_androidKt:
-    Removed class androidx.compose.ui.graphics.vector.compat.XmlAnimatorParser_androidKt
-RemovedClass: androidx.compose.ui.graphics.vector.compat.XmlPullParserUtils_androidKt:
-    Removed class androidx.compose.ui.graphics.vector.compat.XmlPullParserUtils_androidKt
-RemovedClass: androidx.compose.ui.input.pointer.MotionEventAdapter_androidKt:
-    Removed class androidx.compose.ui.input.pointer.MotionEventAdapter_androidKt
-RemovedClass: androidx.compose.ui.res.AnimatedVectorResources_androidKt:
-    Removed class androidx.compose.ui.res.AnimatedVectorResources_androidKt
-RemovedClass: androidx.compose.ui.res.AnimatorResources_androidKt:
-    Removed class androidx.compose.ui.res.AnimatorResources_androidKt
diff --git a/compose/ui/ui/api/restricted_current.ignore b/compose/ui/ui/api/restricted_current.ignore
deleted file mode 100644
index e0cadc5..0000000
--- a/compose/ui/ui/api/restricted_current.ignore
+++ /dev/null
@@ -1,27 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.compose.ui.layout.LayoutInfo#getDensity():
-    Added method androidx.compose.ui.layout.LayoutInfo.getDensity()
-AddedAbstractMethod: androidx.compose.ui.layout.LayoutInfo#getLayoutDirection():
-    Added method androidx.compose.ui.layout.LayoutInfo.getLayoutDirection()
-AddedAbstractMethod: androidx.compose.ui.layout.LayoutInfo#getViewConfiguration():
-    Added method androidx.compose.ui.layout.LayoutInfo.getViewConfiguration()
-
-
-InvalidNullConversion: androidx.compose.ui.graphics.GraphicsLayerModifierKt#graphicsLayer(androidx.compose.ui.Modifier, float, float, float, float, float, float, float, float, float, float, long, androidx.compose.ui.graphics.Shape, boolean):
-    Attempted to remove @NonNull annotation from method androidx.compose.ui.graphics.GraphicsLayerModifierKt.graphicsLayer(androidx.compose.ui.Modifier,float,float,float,float,float,float,float,float,float,float,long,androidx.compose.ui.graphics.Shape,boolean)
-
-
-RemovedClass: androidx.compose.ui.graphics.vector.AnimatorKt:
-    Removed class androidx.compose.ui.graphics.vector.AnimatorKt
-RemovedClass: androidx.compose.ui.graphics.vector.compat.XmlAnimatedVectorParser_androidKt:
-    Removed class androidx.compose.ui.graphics.vector.compat.XmlAnimatedVectorParser_androidKt
-RemovedClass: androidx.compose.ui.graphics.vector.compat.XmlAnimatorParser_androidKt:
-    Removed class androidx.compose.ui.graphics.vector.compat.XmlAnimatorParser_androidKt
-RemovedClass: androidx.compose.ui.graphics.vector.compat.XmlPullParserUtils_androidKt:
-    Removed class androidx.compose.ui.graphics.vector.compat.XmlPullParserUtils_androidKt
-RemovedClass: androidx.compose.ui.input.pointer.MotionEventAdapter_androidKt:
-    Removed class androidx.compose.ui.input.pointer.MotionEventAdapter_androidKt
-RemovedClass: androidx.compose.ui.res.AnimatedVectorResources_androidKt:
-    Removed class androidx.compose.ui.res.AnimatedVectorResources_androidKt
-RemovedClass: androidx.compose.ui.res.AnimatorResources_androidKt:
-    Removed class androidx.compose.ui.res.AnimatorResources_androidKt
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.ignore b/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.ignore
index 9d50fa0..e3484c25 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.ignore
+++ b/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.ignore
@@ -1,8 +1,8 @@
 // Baseline format: 1.0
 ChangedSuperclass: androidx.lifecycle.AbstractSavedStateViewModelFactory:
-    Class androidx.lifecycle.AbstractSavedStateViewModelFactory superclass changed from androidx.lifecycle.ViewModelProvider.KeyedFactory to androidx.lifecycle.ViewModelProvider.OnRequeryFactory
+    Class androidx.lifecycle.AbstractSavedStateViewModelFactory superclass changed from androidx.lifecycle.ViewModelProvider.KeyedFactory to java.lang.Object
 ChangedSuperclass: androidx.lifecycle.SavedStateViewModelFactory:
-    Class androidx.lifecycle.SavedStateViewModelFactory superclass changed from androidx.lifecycle.ViewModelProvider.KeyedFactory to androidx.lifecycle.ViewModelProvider.OnRequeryFactory
+    Class androidx.lifecycle.SavedStateViewModelFactory superclass changed from androidx.lifecycle.ViewModelProvider.KeyedFactory to java.lang.Object
 
 
 ChangedType: androidx.lifecycle.SavedStateHandle#getLiveData(String):
diff --git a/navigation/navigation-common-ktx/api/current.ignore b/navigation/navigation-common-ktx/api/current.ignore
deleted file mode 100644
index 477da73..0000000
--- a/navigation/navigation-common-ktx/api/current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.navigation:
-    Removed package androidx.navigation
diff --git a/navigation/navigation-common-ktx/api/restricted_current.ignore b/navigation/navigation-common-ktx/api/restricted_current.ignore
deleted file mode 100644
index 477da73..0000000
--- a/navigation/navigation-common-ktx/api/restricted_current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.navigation:
-    Removed package androidx.navigation
diff --git a/navigation/navigation-common/api/current.ignore b/navigation/navigation-common/api/current.ignore
deleted file mode 100644
index 50f8c33..0000000
--- a/navigation/navigation-common/api/current.ignore
+++ /dev/null
@@ -1,39 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.navigation.NavArgument#getType():
-    Method androidx.navigation.NavArgument.getType has changed return type from androidx.navigation.NavType<?> to androidx.navigation.NavType<java.lang.Object>
-ChangedType: androidx.navigation.NavDestination#getArguments():
-    Method androidx.navigation.NavDestination.getArguments has changed return type from java.util.Map<java.lang.String!,androidx.navigation.NavArgument!> to java.util.Map<java.lang.String,androidx.navigation.NavArgument>
-ChangedType: androidx.navigation.NavDestination.ClassType#value():
-    Method androidx.navigation.NavDestination.ClassType.value has changed return type from Class<?> to kotlin.reflect.KClass<?>
-ChangedType: androidx.navigation.NavGraph#iterator():
-    Method androidx.navigation.NavGraph.iterator has changed return type from java.util.Iterator<androidx.navigation.NavDestination!> to java.util.Iterator<androidx.navigation.NavDestination>
-ChangedType: androidx.navigation.NavType#BoolArrayType:
-    Field androidx.navigation.NavType.BoolArrayType has changed type from androidx.navigation.NavType<boolean[]!> to androidx.navigation.NavType<boolean[]>
-ChangedType: androidx.navigation.NavType#BoolType:
-    Field androidx.navigation.NavType.BoolType has changed type from androidx.navigation.NavType<java.lang.Boolean!> to androidx.navigation.NavType<java.lang.Boolean>
-ChangedType: androidx.navigation.NavType#FloatArrayType:
-    Field androidx.navigation.NavType.FloatArrayType has changed type from androidx.navigation.NavType<float[]!> to androidx.navigation.NavType<float[]>
-ChangedType: androidx.navigation.NavType#FloatType:
-    Field androidx.navigation.NavType.FloatType has changed type from androidx.navigation.NavType<java.lang.Float!> to androidx.navigation.NavType<java.lang.Float>
-ChangedType: androidx.navigation.NavType#IntArrayType:
-    Field androidx.navigation.NavType.IntArrayType has changed type from androidx.navigation.NavType<int[]!> to androidx.navigation.NavType<int[]>
-ChangedType: androidx.navigation.NavType#IntType:
-    Field androidx.navigation.NavType.IntType has changed type from androidx.navigation.NavType<java.lang.Integer!> to androidx.navigation.NavType<java.lang.Integer>
-ChangedType: androidx.navigation.NavType#LongArrayType:
-    Field androidx.navigation.NavType.LongArrayType has changed type from androidx.navigation.NavType<long[]!> to androidx.navigation.NavType<long[]>
-ChangedType: androidx.navigation.NavType#LongType:
-    Field androidx.navigation.NavType.LongType has changed type from androidx.navigation.NavType<java.lang.Long!> to androidx.navigation.NavType<java.lang.Long>
-ChangedType: androidx.navigation.NavType#ReferenceType:
-    Field androidx.navigation.NavType.ReferenceType has changed type from androidx.navigation.NavType<java.lang.Integer!> to androidx.navigation.NavType<java.lang.Integer>
-ChangedType: androidx.navigation.NavType#StringArrayType:
-    Field androidx.navigation.NavType.StringArrayType has changed type from androidx.navigation.NavType<java.lang.String![]!> to androidx.navigation.NavType<java.lang.String[]>
-ChangedType: androidx.navigation.NavType#StringType:
-    Field androidx.navigation.NavType.StringType has changed type from androidx.navigation.NavType<java.lang.String!> to androidx.navigation.NavType<java.lang.String>
-
-
-InvalidNullConversion: androidx.navigation.NavType#parseValue(String):
-    Attempted to remove @NonNull annotation from method androidx.navigation.NavType.parseValue(String)
-InvalidNullConversion: androidx.navigation.NavType.ParcelableType#parseValue(String):
-    Attempted to remove @NonNull annotation from method androidx.navigation.NavType.ParcelableType.parseValue(String)
-InvalidNullConversion: androidx.navigation.NavType.SerializableType#put(android.os.Bundle, String, D) parameter #2:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter value in androidx.navigation.NavType.SerializableType.put(android.os.Bundle bundle, String key, D value)
diff --git a/navigation/navigation-common/api/restricted_current.ignore b/navigation/navigation-common/api/restricted_current.ignore
deleted file mode 100644
index 50f8c33..0000000
--- a/navigation/navigation-common/api/restricted_current.ignore
+++ /dev/null
@@ -1,39 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.navigation.NavArgument#getType():
-    Method androidx.navigation.NavArgument.getType has changed return type from androidx.navigation.NavType<?> to androidx.navigation.NavType<java.lang.Object>
-ChangedType: androidx.navigation.NavDestination#getArguments():
-    Method androidx.navigation.NavDestination.getArguments has changed return type from java.util.Map<java.lang.String!,androidx.navigation.NavArgument!> to java.util.Map<java.lang.String,androidx.navigation.NavArgument>
-ChangedType: androidx.navigation.NavDestination.ClassType#value():
-    Method androidx.navigation.NavDestination.ClassType.value has changed return type from Class<?> to kotlin.reflect.KClass<?>
-ChangedType: androidx.navigation.NavGraph#iterator():
-    Method androidx.navigation.NavGraph.iterator has changed return type from java.util.Iterator<androidx.navigation.NavDestination!> to java.util.Iterator<androidx.navigation.NavDestination>
-ChangedType: androidx.navigation.NavType#BoolArrayType:
-    Field androidx.navigation.NavType.BoolArrayType has changed type from androidx.navigation.NavType<boolean[]!> to androidx.navigation.NavType<boolean[]>
-ChangedType: androidx.navigation.NavType#BoolType:
-    Field androidx.navigation.NavType.BoolType has changed type from androidx.navigation.NavType<java.lang.Boolean!> to androidx.navigation.NavType<java.lang.Boolean>
-ChangedType: androidx.navigation.NavType#FloatArrayType:
-    Field androidx.navigation.NavType.FloatArrayType has changed type from androidx.navigation.NavType<float[]!> to androidx.navigation.NavType<float[]>
-ChangedType: androidx.navigation.NavType#FloatType:
-    Field androidx.navigation.NavType.FloatType has changed type from androidx.navigation.NavType<java.lang.Float!> to androidx.navigation.NavType<java.lang.Float>
-ChangedType: androidx.navigation.NavType#IntArrayType:
-    Field androidx.navigation.NavType.IntArrayType has changed type from androidx.navigation.NavType<int[]!> to androidx.navigation.NavType<int[]>
-ChangedType: androidx.navigation.NavType#IntType:
-    Field androidx.navigation.NavType.IntType has changed type from androidx.navigation.NavType<java.lang.Integer!> to androidx.navigation.NavType<java.lang.Integer>
-ChangedType: androidx.navigation.NavType#LongArrayType:
-    Field androidx.navigation.NavType.LongArrayType has changed type from androidx.navigation.NavType<long[]!> to androidx.navigation.NavType<long[]>
-ChangedType: androidx.navigation.NavType#LongType:
-    Field androidx.navigation.NavType.LongType has changed type from androidx.navigation.NavType<java.lang.Long!> to androidx.navigation.NavType<java.lang.Long>
-ChangedType: androidx.navigation.NavType#ReferenceType:
-    Field androidx.navigation.NavType.ReferenceType has changed type from androidx.navigation.NavType<java.lang.Integer!> to androidx.navigation.NavType<java.lang.Integer>
-ChangedType: androidx.navigation.NavType#StringArrayType:
-    Field androidx.navigation.NavType.StringArrayType has changed type from androidx.navigation.NavType<java.lang.String![]!> to androidx.navigation.NavType<java.lang.String[]>
-ChangedType: androidx.navigation.NavType#StringType:
-    Field androidx.navigation.NavType.StringType has changed type from androidx.navigation.NavType<java.lang.String!> to androidx.navigation.NavType<java.lang.String>
-
-
-InvalidNullConversion: androidx.navigation.NavType#parseValue(String):
-    Attempted to remove @NonNull annotation from method androidx.navigation.NavType.parseValue(String)
-InvalidNullConversion: androidx.navigation.NavType.ParcelableType#parseValue(String):
-    Attempted to remove @NonNull annotation from method androidx.navigation.NavType.ParcelableType.parseValue(String)
-InvalidNullConversion: androidx.navigation.NavType.SerializableType#put(android.os.Bundle, String, D) parameter #2:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter value in androidx.navigation.NavType.SerializableType.put(android.os.Bundle bundle, String key, D value)
diff --git a/navigation/navigation-dynamic-features-runtime/api/current.ignore b/navigation/navigation-dynamic-features-runtime/api/current.ignore
deleted file mode 100644
index ed28c04..0000000
--- a/navigation/navigation-dynamic-features-runtime/api/current.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-ParameterNameChange: androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder#setProgressDestination(int) parameter #0:
-    Attempted to change parameter name from progressDestination to p in method androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder.setProgressDestination
-
-
-RemovedMethod: androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator#navigate(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph, android.os.Bundle, androidx.navigation.NavOptions, androidx.navigation.Navigator.Extras):
-    Removed method androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.navigate(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph,android.os.Bundle,androidx.navigation.NavOptions,androidx.navigation.Navigator.Extras)
-RemovedMethod: androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator#popBackStack():
-    Removed method androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.popBackStack()
diff --git a/navigation/navigation-dynamic-features-runtime/api/restricted_current.ignore b/navigation/navigation-dynamic-features-runtime/api/restricted_current.ignore
deleted file mode 100644
index ed28c04..0000000
--- a/navigation/navigation-dynamic-features-runtime/api/restricted_current.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-ParameterNameChange: androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder#setProgressDestination(int) parameter #0:
-    Attempted to change parameter name from progressDestination to p in method androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder.setProgressDestination
-
-
-RemovedMethod: androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator#navigate(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph, android.os.Bundle, androidx.navigation.NavOptions, androidx.navigation.Navigator.Extras):
-    Removed method androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.navigate(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph,android.os.Bundle,androidx.navigation.NavOptions,androidx.navigation.Navigator.Extras)
-RemovedMethod: androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator#popBackStack():
-    Removed method androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.popBackStack()
diff --git a/navigation/navigation-fragment-ktx/api/current.ignore b/navigation/navigation-fragment-ktx/api/current.ignore
deleted file mode 100644
index f4d7210..0000000
--- a/navigation/navigation-fragment-ktx/api/current.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.navigation:
-    Removed package androidx.navigation
-RemovedPackage: androidx.navigation.fragment:
-    Removed package androidx.navigation.fragment
diff --git a/navigation/navigation-fragment-ktx/api/restricted_current.ignore b/navigation/navigation-fragment-ktx/api/restricted_current.ignore
deleted file mode 100644
index f4d7210..0000000
--- a/navigation/navigation-fragment-ktx/api/restricted_current.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.navigation:
-    Removed package androidx.navigation
-RemovedPackage: androidx.navigation.fragment:
-    Removed package androidx.navigation.fragment
diff --git a/navigation/navigation-fragment/api/current.ignore b/navigation/navigation-fragment/api/current.ignore
deleted file mode 100644
index b755bd3..0000000
--- a/navigation/navigation-fragment/api/current.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.navigation.fragment.FragmentNavigator.Extras#getSharedElements():
-    Method androidx.navigation.fragment.FragmentNavigator.Extras.getSharedElements has changed return type from java.util.Map<android.view.View!,java.lang.String!> to java.util.Map<android.view.View,java.lang.String>
-
-
-RemovedMethod: androidx.navigation.fragment.DialogFragmentNavigator#navigate(androidx.navigation.fragment.DialogFragmentNavigator.Destination, android.os.Bundle, androidx.navigation.NavOptions, androidx.navigation.Navigator.Extras):
-    Removed method androidx.navigation.fragment.DialogFragmentNavigator.navigate(androidx.navigation.fragment.DialogFragmentNavigator.Destination,android.os.Bundle,androidx.navigation.NavOptions,androidx.navigation.Navigator.Extras)
-RemovedMethod: androidx.navigation.fragment.DialogFragmentNavigator#popBackStack():
-    Removed method androidx.navigation.fragment.DialogFragmentNavigator.popBackStack()
-RemovedMethod: androidx.navigation.fragment.FragmentNavigator#navigate(androidx.navigation.fragment.FragmentNavigator.Destination, android.os.Bundle, androidx.navigation.NavOptions, androidx.navigation.Navigator.Extras):
-    Removed method androidx.navigation.fragment.FragmentNavigator.navigate(androidx.navigation.fragment.FragmentNavigator.Destination,android.os.Bundle,androidx.navigation.NavOptions,androidx.navigation.Navigator.Extras)
-RemovedMethod: androidx.navigation.fragment.FragmentNavigator#popBackStack():
-    Removed method androidx.navigation.fragment.FragmentNavigator.popBackStack()
diff --git a/navigation/navigation-fragment/api/restricted_current.ignore b/navigation/navigation-fragment/api/restricted_current.ignore
deleted file mode 100644
index b755bd3..0000000
--- a/navigation/navigation-fragment/api/restricted_current.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.navigation.fragment.FragmentNavigator.Extras#getSharedElements():
-    Method androidx.navigation.fragment.FragmentNavigator.Extras.getSharedElements has changed return type from java.util.Map<android.view.View!,java.lang.String!> to java.util.Map<android.view.View,java.lang.String>
-
-
-RemovedMethod: androidx.navigation.fragment.DialogFragmentNavigator#navigate(androidx.navigation.fragment.DialogFragmentNavigator.Destination, android.os.Bundle, androidx.navigation.NavOptions, androidx.navigation.Navigator.Extras):
-    Removed method androidx.navigation.fragment.DialogFragmentNavigator.navigate(androidx.navigation.fragment.DialogFragmentNavigator.Destination,android.os.Bundle,androidx.navigation.NavOptions,androidx.navigation.Navigator.Extras)
-RemovedMethod: androidx.navigation.fragment.DialogFragmentNavigator#popBackStack():
-    Removed method androidx.navigation.fragment.DialogFragmentNavigator.popBackStack()
-RemovedMethod: androidx.navigation.fragment.FragmentNavigator#navigate(androidx.navigation.fragment.FragmentNavigator.Destination, android.os.Bundle, androidx.navigation.NavOptions, androidx.navigation.Navigator.Extras):
-    Removed method androidx.navigation.fragment.FragmentNavigator.navigate(androidx.navigation.fragment.FragmentNavigator.Destination,android.os.Bundle,androidx.navigation.NavOptions,androidx.navigation.Navigator.Extras)
-RemovedMethod: androidx.navigation.fragment.FragmentNavigator#popBackStack():
-    Removed method androidx.navigation.fragment.FragmentNavigator.popBackStack()
diff --git a/navigation/navigation-runtime-ktx/api/current.ignore b/navigation/navigation-runtime-ktx/api/current.ignore
deleted file mode 100644
index 477da73..0000000
--- a/navigation/navigation-runtime-ktx/api/current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.navigation:
-    Removed package androidx.navigation
diff --git a/navigation/navigation-runtime-ktx/api/restricted_current.ignore b/navigation/navigation-runtime-ktx/api/restricted_current.ignore
deleted file mode 100644
index 477da73..0000000
--- a/navigation/navigation-runtime-ktx/api/restricted_current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.navigation:
-    Removed package androidx.navigation
diff --git a/navigation/navigation-runtime/api/current.ignore b/navigation/navigation-runtime/api/current.ignore
deleted file mode 100644
index cc81f5f..0000000
--- a/navigation/navigation-runtime/api/current.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.navigation.NavBackStackEntry:
-    Removed class androidx.navigation.NavBackStackEntry
-
-
-RemovedMethod: androidx.navigation.ActivityNavigator#popBackStack():
-    Removed method androidx.navigation.ActivityNavigator.popBackStack()
diff --git a/navigation/navigation-runtime/api/restricted_current.ignore b/navigation/navigation-runtime/api/restricted_current.ignore
deleted file mode 100644
index cc81f5f..0000000
--- a/navigation/navigation-runtime/api/restricted_current.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.navigation.NavBackStackEntry:
-    Removed class androidx.navigation.NavBackStackEntry
-
-
-RemovedMethod: androidx.navigation.ActivityNavigator#popBackStack():
-    Removed method androidx.navigation.ActivityNavigator.popBackStack()
diff --git a/navigation/navigation-ui-ktx/api/current.ignore b/navigation/navigation-ui-ktx/api/current.ignore
deleted file mode 100644
index 271d296..0000000
--- a/navigation/navigation-ui-ktx/api/current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.navigation.ui:
-    Removed package androidx.navigation.ui
diff --git a/navigation/navigation-ui-ktx/api/restricted_current.ignore b/navigation/navigation-ui-ktx/api/restricted_current.ignore
deleted file mode 100644
index 271d296..0000000
--- a/navigation/navigation-ui-ktx/api/restricted_current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.navigation.ui:
-    Removed package androidx.navigation.ui
diff --git a/navigation/navigation-ui/api/current.ignore b/navigation/navigation-ui/api/current.ignore
deleted file mode 100644
index af8861c..0000000
--- a/navigation/navigation-ui/api/current.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.navigation.ui.AppBarConfiguration#getTopLevelDestinations():
-    Method androidx.navigation.ui.AppBarConfiguration.getTopLevelDestinations has changed return type from java.util.Set<java.lang.Integer!> to java.util.Set<java.lang.Integer>
-
-
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.bottomnavigation.BottomNavigationView, androidx.navigation.NavController):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.bottomnavigation.BottomNavigationView,androidx.navigation.NavController)
diff --git a/navigation/navigation-ui/api/restricted_current.ignore b/navigation/navigation-ui/api/restricted_current.ignore
deleted file mode 100644
index af8861c..0000000
--- a/navigation/navigation-ui/api/restricted_current.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.navigation.ui.AppBarConfiguration#getTopLevelDestinations():
-    Method androidx.navigation.ui.AppBarConfiguration.getTopLevelDestinations has changed return type from java.util.Set<java.lang.Integer!> to java.util.Set<java.lang.Integer>
-
-
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.bottomnavigation.BottomNavigationView, androidx.navigation.NavController):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.bottomnavigation.BottomNavigationView,androidx.navigation.NavController)
diff --git a/window/window-java/api/current.ignore b/window/window-java/api/current.ignore
deleted file mode 100644
index 632a596..0000000
--- a/window/window-java/api/current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.window.java.layout.WindowInfoRepositoryCallbackAdapter:
-    Removed class androidx.window.java.layout.WindowInfoRepositoryCallbackAdapter
diff --git a/window/window-java/api/restricted_current.ignore b/window/window-java/api/restricted_current.ignore
deleted file mode 100644
index 632a596..0000000
--- a/window/window-java/api/restricted_current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.window.java.layout.WindowInfoRepositoryCallbackAdapter:
-    Removed class androidx.window.java.layout.WindowInfoRepositoryCallbackAdapter
diff --git a/window/window-rxjava2/api/current.ignore b/window/window-rxjava2/api/current.ignore
deleted file mode 100644
index 6cc1120..0000000
--- a/window/window-rxjava2/api/current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.window.rxjava2.layout.WindowInfoRepositoryRx:
-    Removed class androidx.window.rxjava2.layout.WindowInfoRepositoryRx
diff --git a/window/window-rxjava2/api/restricted_current.ignore b/window/window-rxjava2/api/restricted_current.ignore
deleted file mode 100644
index 6cc1120..0000000
--- a/window/window-rxjava2/api/restricted_current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.window.rxjava2.layout.WindowInfoRepositoryRx:
-    Removed class androidx.window.rxjava2.layout.WindowInfoRepositoryRx
diff --git a/window/window-rxjava3/api/current.ignore b/window/window-rxjava3/api/current.ignore
deleted file mode 100644
index cc2d2df..0000000
--- a/window/window-rxjava3/api/current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.window.rxjava3.layout.WindowInfoRepositoryRx:
-    Removed class androidx.window.rxjava3.layout.WindowInfoRepositoryRx
diff --git a/window/window-rxjava3/api/restricted_current.ignore b/window/window-rxjava3/api/restricted_current.ignore
deleted file mode 100644
index cc2d2df..0000000
--- a/window/window-rxjava3/api/restricted_current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.window.rxjava3.layout.WindowInfoRepositoryRx:
-    Removed class androidx.window.rxjava3.layout.WindowInfoRepositoryRx
diff --git a/window/window/api/current.ignore b/window/window/api/current.ignore
deleted file mode 100644
index 7ea60a1..0000000
--- a/window/window/api/current.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedInterface: androidx.window.layout.WindowInfoRepository:
-    Removed class androidx.window.layout.WindowInfoRepository
diff --git a/window/window/api/restricted_current.ignore b/window/window/api/restricted_current.ignore
deleted file mode 100644
index b668ef9..0000000
--- a/window/window/api/restricted_current.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedInterface: androidx.window.layout.WindowInfoRepository:
-    Removed class androidx.window.layout.WindowInfoRepository
-RemovedInterface: androidx.window.layout.WindowInfoRepositoryDecorator:
-    Removed class androidx.window.layout.WindowInfoRepositoryDecorator