Use current.ignore for tracking API check exceptions

Removes versioned ignore files, adds current ones. Always recreates the
current ignore file when regenerating API files.

Cleans up adjacent checkApiRelease mustRunAfter to configure lazily.

Test: ./gradlew checkApi
Fixes: 163627550
Change-Id: I7c01b9f998266302b7586691691ab894148203d7
diff --git a/activity/activity-ktx/api/1.2.0-alpha05.ignore b/activity/activity-ktx/api/1.2.0-alpha05.ignore
deleted file mode 100644
index 762b574..0000000
--- a/activity/activity-ktx/api/1.2.0-alpha05.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.activity.ActivityViewModelLazyKt#viewModels(androidx.activity.ComponentActivity, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.activity.ActivityViewModelLazyKt.viewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-
-
-InvalidNullConversion: androidx.activity.ActivityViewModelLazyKt#viewModels(androidx.activity.ComponentActivity, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.activity.ActivityViewModelLazyKt.viewModels(androidx.activity.ComponentActivity,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
diff --git a/activity/activity-ktx/api/1.2.0-alpha06.ignore b/activity/activity-ktx/api/1.2.0-alpha06.ignore
deleted file mode 100644
index 762b574..0000000
--- a/activity/activity-ktx/api/1.2.0-alpha06.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.activity.ActivityViewModelLazyKt#viewModels(androidx.activity.ComponentActivity, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.activity.ActivityViewModelLazyKt.viewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-
-
-InvalidNullConversion: androidx.activity.ActivityViewModelLazyKt#viewModels(androidx.activity.ComponentActivity, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.activity.ActivityViewModelLazyKt.viewModels(androidx.activity.ComponentActivity,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
diff --git a/activity/activity-ktx/api/restricted_1.2.0-alpha05.ignore b/activity/activity-ktx/api/restricted_1.2.0-alpha05.ignore
deleted file mode 100644
index 762b574..0000000
--- a/activity/activity-ktx/api/restricted_1.2.0-alpha05.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.activity.ActivityViewModelLazyKt#viewModels(androidx.activity.ComponentActivity, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.activity.ActivityViewModelLazyKt.viewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-
-
-InvalidNullConversion: androidx.activity.ActivityViewModelLazyKt#viewModels(androidx.activity.ComponentActivity, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.activity.ActivityViewModelLazyKt.viewModels(androidx.activity.ComponentActivity,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
diff --git a/activity/activity-ktx/api/restricted_1.2.0-alpha06.ignore b/activity/activity-ktx/api/restricted_1.2.0-alpha06.ignore
deleted file mode 100644
index 762b574..0000000
--- a/activity/activity-ktx/api/restricted_1.2.0-alpha06.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.activity.ActivityViewModelLazyKt#viewModels(androidx.activity.ComponentActivity, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.activity.ActivityViewModelLazyKt.viewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-
-
-InvalidNullConversion: androidx.activity.ActivityViewModelLazyKt#viewModels(androidx.activity.ComponentActivity, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.activity.ActivityViewModelLazyKt.viewModels(androidx.activity.ComponentActivity,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
diff --git a/annotation/annotation-experimental/api/1.1.0-alpha01.ignore b/annotation/annotation-experimental/api/current.ignore
similarity index 100%
rename from annotation/annotation-experimental/api/1.1.0-alpha01.ignore
rename to annotation/annotation-experimental/api/current.ignore
diff --git a/annotation/annotation-experimental/api/restricted_1.1.0-alpha01.ignore b/annotation/annotation-experimental/api/restricted_1.1.0-alpha01.ignore
deleted file mode 100644
index 4413cc6..0000000
--- a/annotation/annotation-experimental/api/restricted_1.1.0-alpha01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.annotation.experimental.UseExperimental#markerClass():
-    Method androidx.annotation.experimental.UseExperimental.markerClass has changed return type from Class<?> to Class<? extends java.lang.annotation.Annotation>[]
diff --git a/annotation/annotation-experimental/api/1.1.0-alpha01.ignore b/annotation/annotation-experimental/api/restricted_current.ignore
similarity index 100%
copy from annotation/annotation-experimental/api/1.1.0-alpha01.ignore
copy to annotation/annotation-experimental/api/restricted_current.ignore
diff --git a/appcompat/appcompat-resources/api/1.1.0-rc01.ignore b/appcompat/appcompat-resources/api/1.1.0-rc01.ignore
deleted file mode 100644
index 31e100e..0000000
--- a/appcompat/appcompat-resources/api/1.1.0-rc01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-HiddenSuperclass: androidx.appcompat.graphics.drawable.AnimatedStateListDrawableCompat:
-    Public class androidx.appcompat.graphics.drawable.AnimatedStateListDrawableCompat stripped of unavailable superclass androidx.appcompat.graphics.drawable.StateListDrawable
diff --git a/appcompat/appcompat/api/1.1.0-alpha02.ignore b/appcompat/appcompat/api/1.1.0-alpha02.ignore
deleted file mode 100644
index a6419a0..0000000
--- a/appcompat/appcompat/api/1.1.0-alpha02.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-HiddenSuperclass: androidx.appcompat.graphics.drawable.AnimatedStateListDrawableCompat:
-    Public class androidx.appcompat.graphics.drawable.AnimatedStateListDrawableCompat stripped of unavailable superclass androidx.appcompat.graphics.drawable.StateListDrawable
-
-
diff --git a/appcompat/appcompat/api/1.1.0-alpha03.ignore b/appcompat/appcompat/api/1.1.0-alpha03.ignore
deleted file mode 100644
index f8fc8c9..0000000
--- a/appcompat/appcompat/api/1.1.0-alpha03.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.appcompat.content.res:
-    Removed package androidx.appcompat.content.res
-
-
diff --git a/appcompat/appcompat/api/1.1.0-alpha04.ignore b/appcompat/appcompat/api/1.1.0-alpha04.ignore
deleted file mode 100644
index f8fc8c9..0000000
--- a/appcompat/appcompat/api/1.1.0-alpha04.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.appcompat.content.res:
-    Removed package androidx.appcompat.content.res
-
-
diff --git a/appcompat/appcompat/api/1.1.0-alpha05.ignore b/appcompat/appcompat/api/1.1.0-alpha05.ignore
deleted file mode 100644
index f8fc8c9..0000000
--- a/appcompat/appcompat/api/1.1.0-alpha05.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.appcompat.content.res:
-    Removed package androidx.appcompat.content.res
-
-
diff --git a/appcompat/appcompat/api/1.1.0-alpha06.ignore b/appcompat/appcompat/api/1.1.0-alpha06.ignore
deleted file mode 100644
index f8fc8c9..0000000
--- a/appcompat/appcompat/api/1.1.0-alpha06.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.appcompat.content.res:
-    Removed package androidx.appcompat.content.res
-
-
diff --git a/appcompat/appcompat/api/1.1.0-beta01.ignore b/appcompat/appcompat/api/1.1.0-beta01.ignore
deleted file mode 100644
index ad15ff5..0000000
--- a/appcompat/appcompat/api/1.1.0-beta01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedPackage: androidx.appcompat.content.res:
-    Removed package androidx.appcompat.content.res
diff --git a/appcompat/appcompat/api/1.3.0-alpha01.ignore b/appcompat/appcompat/api/current.ignore
similarity index 100%
rename from appcompat/appcompat/api/1.3.0-alpha01.ignore
rename to appcompat/appcompat/api/current.ignore
diff --git a/appcompat/appcompat/api/restricted_1.3.0-alpha01.ignore b/appcompat/appcompat/api/restricted_1.3.0-alpha01.ignore
deleted file mode 100644
index 057533c..0000000
--- a/appcompat/appcompat/api/restricted_1.3.0-alpha01.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-ChangedSuperclass: androidx.appcompat.widget.LinearLayoutCompat.LayoutParams:
-    Class androidx.appcompat.widget.LinearLayoutCompat.LayoutParams superclass changed from android.view.ViewGroup.MarginLayoutParams to android.widget.LinearLayout.LayoutParams
-
-
-RemovedField: androidx.appcompat.widget.LinearLayoutCompat.LayoutParams#gravity:
-    Removed field androidx.appcompat.widget.LinearLayoutCompat.LayoutParams.gravity
-RemovedField: androidx.appcompat.widget.LinearLayoutCompat.LayoutParams#weight:
-    Removed field androidx.appcompat.widget.LinearLayoutCompat.LayoutParams.weight
-
-
-RemovedMethod: androidx.appcompat.widget.LinearLayoutCompat.LayoutParams#LayoutParams(androidx.appcompat.widget.LinearLayoutCompat.LayoutParams):
-    Removed constructor androidx.appcompat.widget.LinearLayoutCompat.LayoutParams(androidx.appcompat.widget.LinearLayoutCompat.LayoutParams)
diff --git a/appcompat/appcompat/api/1.3.0-alpha01.ignore b/appcompat/appcompat/api/restricted_current.ignore
similarity index 100%
copy from appcompat/appcompat/api/1.3.0-alpha01.ignore
copy to appcompat/appcompat/api/restricted_current.ignore
diff --git a/benchmark/common/api/1.1.0-alpha02.ignore b/benchmark/common/api/1.1.0-alpha02.ignore
deleted file mode 100644
index 44a73f7..0000000
--- a/benchmark/common/api/1.1.0-alpha02.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.benchmark.TraceCompatKt:
-    Removed class androidx.benchmark.TraceCompatKt
diff --git a/benchmark/common/api/1.1.0-alpha01.ignore b/benchmark/common/api/current.ignore
similarity index 100%
rename from benchmark/common/api/1.1.0-alpha01.ignore
rename to benchmark/common/api/current.ignore
diff --git a/benchmark/common/api/restricted_1.1.0-alpha01.ignore b/benchmark/common/api/restricted_1.1.0-alpha01.ignore
deleted file mode 100644
index 44a73f7..0000000
--- a/benchmark/common/api/restricted_1.1.0-alpha01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.benchmark.TraceCompatKt:
-    Removed class androidx.benchmark.TraceCompatKt
diff --git a/benchmark/common/api/restricted_1.1.0-alpha02.ignore b/benchmark/common/api/restricted_1.1.0-alpha02.ignore
deleted file mode 100644
index 44a73f7..0000000
--- a/benchmark/common/api/restricted_1.1.0-alpha02.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.benchmark.TraceCompatKt:
-    Removed class androidx.benchmark.TraceCompatKt
diff --git a/benchmark/common/api/1.1.0-alpha01.ignore b/benchmark/common/api/restricted_current.ignore
similarity index 100%
copy from benchmark/common/api/1.1.0-alpha01.ignore
copy to benchmark/common/api/restricted_current.ignore
diff --git a/buildSrc/src/main/kotlin/androidx/build/checkapi/ApiTasks.kt b/buildSrc/src/main/kotlin/androidx/build/checkapi/ApiTasks.kt
index 07ea321..1df3309 100644
--- a/buildSrc/src/main/kotlin/androidx/build/checkapi/ApiTasks.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/checkapi/ApiTasks.kt
@@ -159,9 +159,7 @@
             }
         }
 
-        // Note that the use of a versioned baseline file conflicts with the "don't generate
-        // versioned API files" bit. We'll cross the bridge when we get to it.
-        val baselinesApiLocation = ApiBaselinesLocation.fromApiLocation(versionedApiLocation)
+        val baselinesApiLocation = ApiBaselinesLocation.fromApiLocation(currentApiLocation)
 
         MetalavaTasks.setupProject(
             project, javaInputs, extension, processManifest, baselinesApiLocation,
diff --git a/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaTasks.kt b/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaTasks.kt
index a331afc..64b595c 100644
--- a/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaTasks.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaTasks.kt
@@ -36,6 +36,8 @@
 
 object MetalavaTasks {
 
+    // flatMap is marked unstable, but it's required for lazy eval
+    @Suppress("UnstableApiUsage")
     fun setupProject(
         project: Project,
         javaCompileInputs: JavaCompileInputs,
@@ -70,6 +72,7 @@
         // checked in, then we must verify "release compatibility" against the work-in-progress
         // API file.
         var checkApiRelease: TaskProvider<CheckApiCompatibilityTask>? = null
+        var ignoreApiChanges: TaskProvider<IgnoreApiChangesTask>? = null
         project.getRequiredCompatibilityApiLocation()?.let { lastReleasedApiFile ->
             checkApiRelease = project.tasks.register(
                 "checkApiRelease",
@@ -86,7 +89,10 @@
                 task.dependsOn(generateApi)
             }
 
-            project.tasks.register("ignoreApiChanges", IgnoreApiChangesTask::class.java) { task ->
+            ignoreApiChanges = project.tasks.register(
+                "ignoreApiChanges",
+                IgnoreApiChangesTask::class.java
+            ) { task ->
                 task.configuration = metalavaConfiguration
                 task.referenceApi.set(checkApiRelease!!.flatMap { it.referenceApi })
                 task.baselines.set(checkApiRelease!!.flatMap { it.baselines })
@@ -135,37 +141,41 @@
             task.description = "Regenerates historic API .txt files using the " +
                 "corresponding prebuilt and the latest Metalava"
             task.generateRestrictToLibraryGroupAPIs = generateRestrictToLibraryGroupAPIs
-            // if checkApiRelease and regenerateOldApis both run, then checkApiRelease must
-            // be the second one run of the two (because checkApiRelease validates
-            // files modified by regenerateOldApis)
-            val cr = checkApiRelease
-            if (cr != null) {
-                cr.get().mustRunAfter(task)
-            }
         }
 
+        // ignoreApiChanges depends on the output of this task for the "last released" API
+        // surface. Make sure it always runs *after* the regenerateOldApis task.
+        ignoreApiChanges?.configure { it.mustRunAfter(regenerateOldApis) }
+
+        // checkApiRelease validates the output of this task, so make sure it always runs
+        // *after* the regenerateOldApis task.
+        checkApiRelease?.configure { it.mustRunAfter(regenerateOldApis) }
+
         val updateApi = project.tasks.register("updateApi", UpdateApiTask::class.java) { task ->
             task.group = "API"
             task.description = "Updates the checked in API files to match source code API"
             task.inputApiLocation.set(generateApi.flatMap { it.apiLocation })
             task.outputApiLocations.set(checkApi.flatMap { it.checkedInApis })
             task.dependsOn(generateApi)
-            if (checkApiRelease != null) {
-                // If a developer (accidentally) makes a non-backwards compatible change to an
-                // api, the developer will want to be informed of it as soon as possible.
-                // So, whenever a developer updates an api, if backwards compatibility checks are
-                // enabled in the library, then we want to check that the changes are backwards
-                // compatible
-                task.dependsOn(checkApiRelease)
-            }
+
+            // If a developer (accidentally) makes a non-backwards compatible change to an API,
+            // the developer will want to be informed of it as soon as possible. So, whenever a
+            // developer updates an API, if backwards compatibility checks are enabled in the
+            // library, then we want to check that the changes are backwards compatible.
+            checkApiRelease?.let { task.dependsOn(it) }
         }
 
+        // ignoreApiChanges depends on the output of this task for the "current" API surface.
+        // Make sure it always runs *after* the updateApi task.
+        ignoreApiChanges?.configure { it.mustRunAfter(updateApi) }
+
         project.tasks.register("regenerateApis") { task ->
             task.group = "API"
             task.description = "Regenerates current and historic API .txt files using the " +
-                "corresponding prebuilt and the latest Metalava"
+                "corresponding prebuilt and the latest Metalava, then updates API ignore files"
             task.dependsOn(regenerateOldApis)
             task.dependsOn(updateApi)
+            ignoreApiChanges?.let { task.dependsOn(it) }
         }
 
         project.addToCheckTask(checkApi)
diff --git a/camera/camera-core/api/1.0.0-beta08.ignore b/camera/camera-core/api/current.ignore
similarity index 100%
rename from camera/camera-core/api/1.0.0-beta08.ignore
rename to camera/camera-core/api/current.ignore
diff --git a/camera/camera-core/api/restricted_1.0.0-beta08.ignore b/camera/camera-core/api/restricted_1.0.0-beta08.ignore
deleted file mode 100644
index 7207c70..0000000
--- a/camera/camera-core/api/restricted_1.0.0-beta08.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.camera.core.DisplayOrientedMeteringPointFactory#DisplayOrientedMeteringPointFactory(android.view.Display, androidx.camera.core.CameraSelector, float, float):
-    Removed constructor androidx.camera.core.DisplayOrientedMeteringPointFactory(android.view.Display,androidx.camera.core.CameraSelector,float,float)
diff --git a/camera/camera-core/api/1.0.0-beta08.ignore b/camera/camera-core/api/restricted_current.ignore
similarity index 100%
copy from camera/camera-core/api/1.0.0-beta08.ignore
copy to camera/camera-core/api/restricted_current.ignore
diff --git a/collection/collection-ktx/api/1.2.0-alpha01.ignore b/collection/collection-ktx/api/current.ignore
similarity index 100%
rename from collection/collection-ktx/api/1.2.0-alpha01.ignore
rename to collection/collection-ktx/api/current.ignore
diff --git a/collection/collection-ktx/api/restricted_1.2.0-alpha01.ignore b/collection/collection-ktx/api/restricted_1.2.0-alpha01.ignore
deleted file mode 100644
index 16ad393..0000000
--- a/collection/collection-ktx/api/restricted_1.2.0-alpha01.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedDeprecatedMethod: androidx.collection.LongSparseArrayKt#remove(androidx.collection.LongSparseArray<T>, long, T):
-    Removed deprecated method androidx.collection.LongSparseArrayKt.remove(androidx.collection.LongSparseArray<T>,long,T)
-RemovedDeprecatedMethod: androidx.collection.SparseArrayKt#remove(androidx.collection.SparseArrayCompat<T>, int, T):
-    Removed deprecated method androidx.collection.SparseArrayKt.remove(androidx.collection.SparseArrayCompat<T>,int,T)
diff --git a/collection/collection-ktx/api/1.2.0-alpha01.ignore b/collection/collection-ktx/api/restricted_current.ignore
similarity index 100%
copy from collection/collection-ktx/api/1.2.0-alpha01.ignore
copy to collection/collection-ktx/api/restricted_current.ignore
diff --git a/collection/collection/api/1.2.0-alpha01.ignore b/collection/collection/api/current.ignore
similarity index 100%
rename from collection/collection/api/1.2.0-alpha01.ignore
rename to collection/collection/api/current.ignore
diff --git a/collection/collection/api/restricted_1.2.0-alpha01.ignore b/collection/collection/api/restricted_1.2.0-alpha01.ignore
deleted file mode 100644
index 7876d30..0000000
--- a/collection/collection/api/restricted_1.2.0-alpha01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.collection.ArraySet#valueAt(int):
-    Attempted to remove @Nullable annotation from method androidx.collection.ArraySet.valueAt(int)
diff --git a/collection/collection/api/1.2.0-alpha01.ignore b/collection/collection/api/restricted_current.ignore
similarity index 100%
copy from collection/collection/api/1.2.0-alpha01.ignore
copy to collection/collection/api/restricted_current.ignore
diff --git a/core/core-ktx/api/1.4.0-alpha01.ignore b/core/core-ktx/api/1.4.0-alpha01.ignore
deleted file mode 100644
index 618a0f6..0000000
--- a/core/core-ktx/api/1.4.0-alpha01.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.core.text.SpannedStringKt#getSpans(android.text.Spanned, int, int):
-    Attempted to remove @NonNull annotation from method androidx.core.text.SpannedStringKt.getSpans(android.text.Spanned,int,int)
-
-
-RemovedMethod: androidx.core.view.ViewKt#updateLayoutParamsTyped(android.view.View, kotlin.jvm.functions.Function1<? super T,kotlin.Unit>):
-    Removed method androidx.core.view.ViewKt.updateLayoutParamsTyped(android.view.View,kotlin.jvm.functions.Function1<? super T,kotlin.Unit>)
diff --git a/core/core-ktx/api/restricted_1.4.0-alpha01.ignore b/core/core-ktx/api/restricted_1.4.0-alpha01.ignore
deleted file mode 100644
index 618a0f6..0000000
--- a/core/core-ktx/api/restricted_1.4.0-alpha01.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.core.text.SpannedStringKt#getSpans(android.text.Spanned, int, int):
-    Attempted to remove @NonNull annotation from method androidx.core.text.SpannedStringKt.getSpans(android.text.Spanned,int,int)
-
-
-RemovedMethod: androidx.core.view.ViewKt#updateLayoutParamsTyped(android.view.View, kotlin.jvm.functions.Function1<? super T,kotlin.Unit>):
-    Removed method androidx.core.view.ViewKt.updateLayoutParamsTyped(android.view.View,kotlin.jvm.functions.Function1<? super T,kotlin.Unit>)
diff --git a/core/core/api/1.1.0-alpha04.ignore b/core/core/api/1.1.0-alpha04.ignore
deleted file mode 100644
index 74eb4e8..0000000
--- a/core/core/api/1.1.0-alpha04.ignore
+++ /dev/null
@@ -1,55 +0,0 @@
-// Baseline format: 1.0
-DeprecationMismatch: androidx.core.app.NotificationCompat.Action.WearableExtender#getCancelLabel():
-    Method androidx.core.app.NotificationCompat.Action.WearableExtender.getCancelLabel(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.Action.WearableExtender#getConfirmLabel():
-    Method androidx.core.app.NotificationCompat.Action.WearableExtender.getConfirmLabel(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.Action.WearableExtender#getInProgressLabel():
-    Method androidx.core.app.NotificationCompat.Action.WearableExtender.getInProgressLabel(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.Action.WearableExtender#setCancelLabel(CharSequence):
-    Method androidx.core.app.NotificationCompat.Action.WearableExtender.setCancelLabel(CharSequence): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.Action.WearableExtender#setConfirmLabel(CharSequence):
-    Method androidx.core.app.NotificationCompat.Action.WearableExtender.setConfirmLabel(CharSequence): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.Action.WearableExtender#setInProgressLabel(CharSequence):
-    Method androidx.core.app.NotificationCompat.Action.WearableExtender.setInProgressLabel(CharSequence): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getContentIcon():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getContentIcon(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getContentIconGravity():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getContentIconGravity(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getCustomContentHeight():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getCustomContentHeight(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getCustomSizePreset():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getCustomSizePreset(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getGravity():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getGravity(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getHintAvoidBackgroundClipping():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getHintAvoidBackgroundClipping(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getHintHideIcon():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getHintHideIcon(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getHintScreenTimeout():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getHintScreenTimeout(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getHintShowBackgroundOnly():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getHintShowBackgroundOnly(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setContentIcon(int):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setContentIcon(int): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setContentIconGravity(int):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setContentIconGravity(int): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setCustomContentHeight(int):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setCustomContentHeight(int): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setCustomSizePreset(int):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setCustomSizePreset(int): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setGravity(int):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setGravity(int): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setHintAvoidBackgroundClipping(boolean):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setHintAvoidBackgroundClipping(boolean): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setHintHideIcon(boolean):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setHintHideIcon(boolean): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setHintScreenTimeout(int):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setHintScreenTimeout(int): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setHintShowBackgroundOnly(boolean):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setHintShowBackgroundOnly(boolean): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-
-
-RemovedDeprecatedMethod: androidx.core.graphics.drawable.IconCompat#createFromIcon(android.graphics.drawable.Icon):
-    Removed deprecated method androidx.core.graphics.drawable.IconCompat.createFromIcon(android.graphics.drawable.Icon)
-
-
diff --git a/core/core/api/1.1.0-alpha05.ignore b/core/core/api/1.1.0-alpha05.ignore
deleted file mode 100644
index 441ccd3..0000000
--- a/core/core/api/1.1.0-alpha05.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedDeprecatedMethod: androidx.core.graphics.drawable.IconCompat#createFromIcon(android.graphics.drawable.Icon):
-    Removed deprecated method androidx.core.graphics.drawable.IconCompat.createFromIcon(android.graphics.drawable.Icon)
diff --git a/core/core/api/1.1.0-alpha06.ignore b/core/core/api/1.1.0-alpha06.ignore
deleted file mode 100644
index efa470d..0000000
--- a/core/core/api/1.1.0-alpha06.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedDeprecatedMethod: androidx.core.graphics.drawable.IconCompat#createFromIcon(android.graphics.drawable.Icon):
-    Removed deprecated method androidx.core.graphics.drawable.IconCompat.createFromIcon(android.graphics.drawable.Icon)
-
-
diff --git a/core/core/api/1.1.0-alpha07.ignore b/core/core/api/1.1.0-alpha07.ignore
deleted file mode 100644
index efa470d..0000000
--- a/core/core/api/1.1.0-alpha07.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedDeprecatedMethod: androidx.core.graphics.drawable.IconCompat#createFromIcon(android.graphics.drawable.Icon):
-    Removed deprecated method androidx.core.graphics.drawable.IconCompat.createFromIcon(android.graphics.drawable.Icon)
-
-
diff --git a/core/core/api/1.1.0-beta01.ignore b/core/core/api/1.1.0-beta01.ignore
deleted file mode 100644
index efa470d..0000000
--- a/core/core/api/1.1.0-beta01.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedDeprecatedMethod: androidx.core.graphics.drawable.IconCompat#createFromIcon(android.graphics.drawable.Icon):
-    Removed deprecated method androidx.core.graphics.drawable.IconCompat.createFromIcon(android.graphics.drawable.Icon)
-
-
diff --git a/core/core/api/1.2.0-alpha03.ignore b/core/core/api/1.2.0-alpha03.ignore
deleted file mode 100644
index b0c3ef0..0000000
--- a/core/core/api/1.2.0-alpha03.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedStatic: androidx.core.content.pm.ShortcutManagerCompat#removeDynamicShortcuts(android.content.Context, java.util.List<java.lang.String>):
-    Method androidx.core.content.pm.ShortcutManagerCompat.removeDynamicShortcuts has changed 'static' qualifier
diff --git a/core/core/api/1.2.0-alpha04.ignore b/core/core/api/1.2.0-alpha04.ignore
deleted file mode 100644
index b0c3ef0..0000000
--- a/core/core/api/1.2.0-alpha04.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedStatic: androidx.core.content.pm.ShortcutManagerCompat#removeDynamicShortcuts(android.content.Context, java.util.List<java.lang.String>):
-    Method androidx.core.content.pm.ShortcutManagerCompat.removeDynamicShortcuts has changed 'static' qualifier
diff --git a/core/core/api/1.2.0-alpha05.ignore b/core/core/api/1.2.0-alpha05.ignore
deleted file mode 100644
index b0c3ef0..0000000
--- a/core/core/api/1.2.0-alpha05.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedStatic: androidx.core.content.pm.ShortcutManagerCompat#removeDynamicShortcuts(android.content.Context, java.util.List<java.lang.String>):
-    Method androidx.core.content.pm.ShortcutManagerCompat.removeDynamicShortcuts has changed 'static' qualifier
diff --git a/core/core/api/1.2.0-beta01.ignore b/core/core/api/1.2.0-beta01.ignore
deleted file mode 100644
index b0c3ef0..0000000
--- a/core/core/api/1.2.0-beta01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedStatic: androidx.core.content.pm.ShortcutManagerCompat#removeDynamicShortcuts(android.content.Context, java.util.List<java.lang.String>):
-    Method androidx.core.content.pm.ShortcutManagerCompat.removeDynamicShortcuts has changed 'static' qualifier
diff --git a/core/core/api/1.5.0-alpha01.ignore b/core/core/api/1.5.0-alpha01.ignore
deleted file mode 100644
index 1b58ddc..0000000
--- a/core/core/api/1.5.0-alpha01.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.core.util.Pair#Pair(F, S) parameter #0:
-    Attempted to remove @Nullable annotation from parameter arg1 in androidx.core.util.Pair(F arg1, S arg2)
-InvalidNullConversion: androidx.core.util.Pair#Pair(F, S) parameter #1:
-    Attempted to remove @Nullable annotation from parameter arg2 in androidx.core.util.Pair(F arg1, S arg2)
-InvalidNullConversion: androidx.core.util.Pair#create(A, B) parameter #0:
-    Attempted to remove @Nullable annotation from parameter arg1 in androidx.core.util.Pair.create(A arg1, B arg2)
-InvalidNullConversion: androidx.core.util.Pair#create(A, B) parameter #1:
-    Attempted to remove @Nullable annotation from parameter arg2 in androidx.core.util.Pair.create(A arg1, B arg2)
-InvalidNullConversion: androidx.core.util.Pair#first:
-    Attempted to remove @Nullable annotation from field androidx.core.util.Pair.first
-InvalidNullConversion: androidx.core.util.Pair#second:
-    Attempted to remove @Nullable annotation from field androidx.core.util.Pair.second
diff --git a/core/core/api/1.5.0-alpha02.ignore b/core/core/api/1.5.0-alpha02.ignore
deleted file mode 100644
index 1b58ddc..0000000
--- a/core/core/api/1.5.0-alpha02.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.core.util.Pair#Pair(F, S) parameter #0:
-    Attempted to remove @Nullable annotation from parameter arg1 in androidx.core.util.Pair(F arg1, S arg2)
-InvalidNullConversion: androidx.core.util.Pair#Pair(F, S) parameter #1:
-    Attempted to remove @Nullable annotation from parameter arg2 in androidx.core.util.Pair(F arg1, S arg2)
-InvalidNullConversion: androidx.core.util.Pair#create(A, B) parameter #0:
-    Attempted to remove @Nullable annotation from parameter arg1 in androidx.core.util.Pair.create(A arg1, B arg2)
-InvalidNullConversion: androidx.core.util.Pair#create(A, B) parameter #1:
-    Attempted to remove @Nullable annotation from parameter arg2 in androidx.core.util.Pair.create(A arg1, B arg2)
-InvalidNullConversion: androidx.core.util.Pair#first:
-    Attempted to remove @Nullable annotation from field androidx.core.util.Pair.first
-InvalidNullConversion: androidx.core.util.Pair#second:
-    Attempted to remove @Nullable annotation from field androidx.core.util.Pair.second
diff --git a/core/core/api/1.4.0-alpha01.ignore b/core/core/api/current.ignore
similarity index 100%
rename from core/core/api/1.4.0-alpha01.ignore
rename to core/core/api/current.ignore
diff --git a/core/core/api/restricted_1.1.0-alpha05.ignore b/core/core/api/restricted_1.1.0-alpha05.ignore
deleted file mode 100644
index bae79eb..0000000
--- a/core/core/api/restricted_1.1.0-alpha05.ignore
+++ /dev/null
@@ -1,105 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.core.internal.view.SupportMenuItem#requiresActionButton():
-    Added method androidx.core.internal.view.SupportMenuItem.requiresActionButton()
-AddedAbstractMethod: androidx.core.internal.view.SupportMenuItem#requiresOverflow():
-    Added method androidx.core.internal.view.SupportMenuItem.requiresOverflow()
-
-
-DeprecationMismatch: androidx.core.app.NotificationCompat.Action.WearableExtender#getCancelLabel():
-    Method androidx.core.app.NotificationCompat.Action.WearableExtender.getCancelLabel(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.Action.WearableExtender#getConfirmLabel():
-    Method androidx.core.app.NotificationCompat.Action.WearableExtender.getConfirmLabel(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.Action.WearableExtender#getInProgressLabel():
-    Method androidx.core.app.NotificationCompat.Action.WearableExtender.getInProgressLabel(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.Action.WearableExtender#setCancelLabel(CharSequence):
-    Method androidx.core.app.NotificationCompat.Action.WearableExtender.setCancelLabel(CharSequence): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.Action.WearableExtender#setConfirmLabel(CharSequence):
-    Method androidx.core.app.NotificationCompat.Action.WearableExtender.setConfirmLabel(CharSequence): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.Action.WearableExtender#setInProgressLabel(CharSequence):
-    Method androidx.core.app.NotificationCompat.Action.WearableExtender.setInProgressLabel(CharSequence): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getContentIcon():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getContentIcon(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getContentIconGravity():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getContentIconGravity(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getCustomContentHeight():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getCustomContentHeight(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getCustomSizePreset():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getCustomSizePreset(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getGravity():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getGravity(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getHintAvoidBackgroundClipping():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getHintAvoidBackgroundClipping(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getHintHideIcon():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getHintHideIcon(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getHintScreenTimeout():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getHintScreenTimeout(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#getHintShowBackgroundOnly():
-    Method androidx.core.app.NotificationCompat.WearableExtender.getHintShowBackgroundOnly(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setContentIcon(int):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setContentIcon(int): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setContentIconGravity(int):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setContentIconGravity(int): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setCustomContentHeight(int):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setCustomContentHeight(int): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setCustomSizePreset(int):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setCustomSizePreset(int): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setGravity(int):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setGravity(int): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setHintAvoidBackgroundClipping(boolean):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setHintAvoidBackgroundClipping(boolean): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setHintHideIcon(boolean):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setHintHideIcon(boolean): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setHintScreenTimeout(int):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setHintScreenTimeout(int): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.core.app.NotificationCompat.WearableExtender#setHintShowBackgroundOnly(boolean):
-    Method androidx.core.app.NotificationCompat.WearableExtender.setHintShowBackgroundOnly(boolean): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-
-
-InvalidNullConversion: androidx.core.graphics.TypefaceCompatApi28Impl#createFromFontFamilyFilesResourceEntry(android.content.Context, androidx.core.content.res.FontResourcesParserCompat.FontFamilyFilesResourceEntry, android.content.res.Resources, int):
-    Attempted to remove @Nullable annotation from method androidx.core.graphics.TypefaceCompatApi28Impl.createFromFontFamilyFilesResourceEntry(android.content.Context,androidx.core.content.res.FontResourcesParserCompat.FontFamilyFilesResourceEntry,android.content.res.Resources,int)
-
-
-RemovedClass: androidx.core.graphics.PathParser:
-    Removed class androidx.core.graphics.PathParser
-RemovedClass: androidx.core.graphics.drawable.IconCompatParcelizer:
-    Removed class androidx.core.graphics.drawable.IconCompatParcelizer
-
-
-RemovedInterface: androidx.core.widget.NestedScrollView:
-    Class androidx.core.widget.NestedScrollView no longer implements androidx.core.view.NestedScrollingChild2
-
-
-RemovedMethod: androidx.core.app.ComponentActivity#getLifecycle():
-    Removed method androidx.core.app.ComponentActivity.getLifecycle()
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentFinite(float, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentFinite(float,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentInRange(float, float, float, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentInRange(float,float,float,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentInRange(long, long, long, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentInRange(long,long,long,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentNonnegative(long):
-    Removed method androidx.core.util.Preconditions.checkArgumentNonnegative(long)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentNonnegative(long, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentNonnegative(long,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentPositive(int, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentPositive(int,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArrayElementsInRange(float[], float, float, String):
-    Removed method androidx.core.util.Preconditions.checkArrayElementsInRange(float[],float,float,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArrayElementsNotNull(T[], String):
-    Removed method androidx.core.util.Preconditions.checkArrayElementsNotNull(T[],String)
-RemovedMethod: androidx.core.util.Preconditions#checkCollectionElementsNotNull(C, String):
-    Removed method androidx.core.util.Preconditions.checkCollectionElementsNotNull(C,String)
-RemovedMethod: androidx.core.util.Preconditions#checkCollectionNotEmpty(java.util.Collection<T>, String):
-    Removed method androidx.core.util.Preconditions.checkCollectionNotEmpty(java.util.Collection<T>,String)
-RemovedMethod: androidx.core.util.Preconditions#checkFlagsArgument(int, int):
-    Removed method androidx.core.util.Preconditions.checkFlagsArgument(int,int)
-RemovedMethod: androidx.core.util.Preconditions#checkStringNotEmpty(T):
-    Removed method androidx.core.util.Preconditions.checkStringNotEmpty(T)
-RemovedMethod: androidx.core.util.Preconditions#checkStringNotEmpty(T, Object):
-    Removed method androidx.core.util.Preconditions.checkStringNotEmpty(T,Object)
-
-
-RemovedPackage: android.support.v4.graphics.drawable:
-    Removed package android.support.v4.graphics.drawable
-
-
diff --git a/core/core/api/restricted_1.1.0-alpha06.ignore b/core/core/api/restricted_1.1.0-alpha06.ignore
deleted file mode 100644
index c0d50ed..0000000
--- a/core/core/api/restricted_1.1.0-alpha06.ignore
+++ /dev/null
@@ -1,55 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.core.internal.view.SupportMenuItem#requiresActionButton():
-    Added method androidx.core.internal.view.SupportMenuItem.requiresActionButton()
-AddedAbstractMethod: androidx.core.internal.view.SupportMenuItem#requiresOverflow():
-    Added method androidx.core.internal.view.SupportMenuItem.requiresOverflow()
-
-
-InvalidNullConversion: androidx.core.graphics.TypefaceCompatApi28Impl#createFromFontFamilyFilesResourceEntry(android.content.Context, androidx.core.content.res.FontResourcesParserCompat.FontFamilyFilesResourceEntry, android.content.res.Resources, int):
-    Attempted to remove @Nullable annotation from method androidx.core.graphics.TypefaceCompatApi28Impl.createFromFontFamilyFilesResourceEntry(android.content.Context,androidx.core.content.res.FontResourcesParserCompat.FontFamilyFilesResourceEntry,android.content.res.Resources,int)
-
-
-RemovedClass: androidx.core.graphics.PathParser:
-    Removed class androidx.core.graphics.PathParser
-RemovedClass: androidx.core.graphics.drawable.IconCompatParcelizer:
-    Removed class androidx.core.graphics.drawable.IconCompatParcelizer
-
-
-RemovedInterface: androidx.core.widget.NestedScrollView:
-    Class androidx.core.widget.NestedScrollView no longer implements androidx.core.view.NestedScrollingChild2
-
-
-RemovedMethod: androidx.core.app.ComponentActivity#getLifecycle():
-    Removed method androidx.core.app.ComponentActivity.getLifecycle()
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentFinite(float, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentFinite(float,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentInRange(float, float, float, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentInRange(float,float,float,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentInRange(long, long, long, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentInRange(long,long,long,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentNonnegative(long):
-    Removed method androidx.core.util.Preconditions.checkArgumentNonnegative(long)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentNonnegative(long, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentNonnegative(long,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentPositive(int, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentPositive(int,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArrayElementsInRange(float[], float, float, String):
-    Removed method androidx.core.util.Preconditions.checkArrayElementsInRange(float[],float,float,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArrayElementsNotNull(T[], String):
-    Removed method androidx.core.util.Preconditions.checkArrayElementsNotNull(T[],String)
-RemovedMethod: androidx.core.util.Preconditions#checkCollectionElementsNotNull(C, String):
-    Removed method androidx.core.util.Preconditions.checkCollectionElementsNotNull(C,String)
-RemovedMethod: androidx.core.util.Preconditions#checkCollectionNotEmpty(java.util.Collection<T>, String):
-    Removed method androidx.core.util.Preconditions.checkCollectionNotEmpty(java.util.Collection<T>,String)
-RemovedMethod: androidx.core.util.Preconditions#checkFlagsArgument(int, int):
-    Removed method androidx.core.util.Preconditions.checkFlagsArgument(int,int)
-RemovedMethod: androidx.core.util.Preconditions#checkStringNotEmpty(T):
-    Removed method androidx.core.util.Preconditions.checkStringNotEmpty(T)
-RemovedMethod: androidx.core.util.Preconditions#checkStringNotEmpty(T, Object):
-    Removed method androidx.core.util.Preconditions.checkStringNotEmpty(T,Object)
-
-
-RemovedPackage: android.support.v4.graphics.drawable:
-    Removed package android.support.v4.graphics.drawable
-
-
diff --git a/core/core/api/restricted_1.1.0-alpha07.ignore b/core/core/api/restricted_1.1.0-alpha07.ignore
deleted file mode 100644
index c0d50ed..0000000
--- a/core/core/api/restricted_1.1.0-alpha07.ignore
+++ /dev/null
@@ -1,55 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.core.internal.view.SupportMenuItem#requiresActionButton():
-    Added method androidx.core.internal.view.SupportMenuItem.requiresActionButton()
-AddedAbstractMethod: androidx.core.internal.view.SupportMenuItem#requiresOverflow():
-    Added method androidx.core.internal.view.SupportMenuItem.requiresOverflow()
-
-
-InvalidNullConversion: androidx.core.graphics.TypefaceCompatApi28Impl#createFromFontFamilyFilesResourceEntry(android.content.Context, androidx.core.content.res.FontResourcesParserCompat.FontFamilyFilesResourceEntry, android.content.res.Resources, int):
-    Attempted to remove @Nullable annotation from method androidx.core.graphics.TypefaceCompatApi28Impl.createFromFontFamilyFilesResourceEntry(android.content.Context,androidx.core.content.res.FontResourcesParserCompat.FontFamilyFilesResourceEntry,android.content.res.Resources,int)
-
-
-RemovedClass: androidx.core.graphics.PathParser:
-    Removed class androidx.core.graphics.PathParser
-RemovedClass: androidx.core.graphics.drawable.IconCompatParcelizer:
-    Removed class androidx.core.graphics.drawable.IconCompatParcelizer
-
-
-RemovedInterface: androidx.core.widget.NestedScrollView:
-    Class androidx.core.widget.NestedScrollView no longer implements androidx.core.view.NestedScrollingChild2
-
-
-RemovedMethod: androidx.core.app.ComponentActivity#getLifecycle():
-    Removed method androidx.core.app.ComponentActivity.getLifecycle()
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentFinite(float, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentFinite(float,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentInRange(float, float, float, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentInRange(float,float,float,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentInRange(long, long, long, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentInRange(long,long,long,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentNonnegative(long):
-    Removed method androidx.core.util.Preconditions.checkArgumentNonnegative(long)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentNonnegative(long, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentNonnegative(long,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentPositive(int, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentPositive(int,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArrayElementsInRange(float[], float, float, String):
-    Removed method androidx.core.util.Preconditions.checkArrayElementsInRange(float[],float,float,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArrayElementsNotNull(T[], String):
-    Removed method androidx.core.util.Preconditions.checkArrayElementsNotNull(T[],String)
-RemovedMethod: androidx.core.util.Preconditions#checkCollectionElementsNotNull(C, String):
-    Removed method androidx.core.util.Preconditions.checkCollectionElementsNotNull(C,String)
-RemovedMethod: androidx.core.util.Preconditions#checkCollectionNotEmpty(java.util.Collection<T>, String):
-    Removed method androidx.core.util.Preconditions.checkCollectionNotEmpty(java.util.Collection<T>,String)
-RemovedMethod: androidx.core.util.Preconditions#checkFlagsArgument(int, int):
-    Removed method androidx.core.util.Preconditions.checkFlagsArgument(int,int)
-RemovedMethod: androidx.core.util.Preconditions#checkStringNotEmpty(T):
-    Removed method androidx.core.util.Preconditions.checkStringNotEmpty(T)
-RemovedMethod: androidx.core.util.Preconditions#checkStringNotEmpty(T, Object):
-    Removed method androidx.core.util.Preconditions.checkStringNotEmpty(T,Object)
-
-
-RemovedPackage: android.support.v4.graphics.drawable:
-    Removed package android.support.v4.graphics.drawable
-
-
diff --git a/core/core/api/restricted_1.1.0-beta01.ignore b/core/core/api/restricted_1.1.0-beta01.ignore
deleted file mode 100644
index c0d50ed..0000000
--- a/core/core/api/restricted_1.1.0-beta01.ignore
+++ /dev/null
@@ -1,55 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.core.internal.view.SupportMenuItem#requiresActionButton():
-    Added method androidx.core.internal.view.SupportMenuItem.requiresActionButton()
-AddedAbstractMethod: androidx.core.internal.view.SupportMenuItem#requiresOverflow():
-    Added method androidx.core.internal.view.SupportMenuItem.requiresOverflow()
-
-
-InvalidNullConversion: androidx.core.graphics.TypefaceCompatApi28Impl#createFromFontFamilyFilesResourceEntry(android.content.Context, androidx.core.content.res.FontResourcesParserCompat.FontFamilyFilesResourceEntry, android.content.res.Resources, int):
-    Attempted to remove @Nullable annotation from method androidx.core.graphics.TypefaceCompatApi28Impl.createFromFontFamilyFilesResourceEntry(android.content.Context,androidx.core.content.res.FontResourcesParserCompat.FontFamilyFilesResourceEntry,android.content.res.Resources,int)
-
-
-RemovedClass: androidx.core.graphics.PathParser:
-    Removed class androidx.core.graphics.PathParser
-RemovedClass: androidx.core.graphics.drawable.IconCompatParcelizer:
-    Removed class androidx.core.graphics.drawable.IconCompatParcelizer
-
-
-RemovedInterface: androidx.core.widget.NestedScrollView:
-    Class androidx.core.widget.NestedScrollView no longer implements androidx.core.view.NestedScrollingChild2
-
-
-RemovedMethod: androidx.core.app.ComponentActivity#getLifecycle():
-    Removed method androidx.core.app.ComponentActivity.getLifecycle()
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentFinite(float, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentFinite(float,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentInRange(float, float, float, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentInRange(float,float,float,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentInRange(long, long, long, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentInRange(long,long,long,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentNonnegative(long):
-    Removed method androidx.core.util.Preconditions.checkArgumentNonnegative(long)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentNonnegative(long, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentNonnegative(long,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArgumentPositive(int, String):
-    Removed method androidx.core.util.Preconditions.checkArgumentPositive(int,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArrayElementsInRange(float[], float, float, String):
-    Removed method androidx.core.util.Preconditions.checkArrayElementsInRange(float[],float,float,String)
-RemovedMethod: androidx.core.util.Preconditions#checkArrayElementsNotNull(T[], String):
-    Removed method androidx.core.util.Preconditions.checkArrayElementsNotNull(T[],String)
-RemovedMethod: androidx.core.util.Preconditions#checkCollectionElementsNotNull(C, String):
-    Removed method androidx.core.util.Preconditions.checkCollectionElementsNotNull(C,String)
-RemovedMethod: androidx.core.util.Preconditions#checkCollectionNotEmpty(java.util.Collection<T>, String):
-    Removed method androidx.core.util.Preconditions.checkCollectionNotEmpty(java.util.Collection<T>,String)
-RemovedMethod: androidx.core.util.Preconditions#checkFlagsArgument(int, int):
-    Removed method androidx.core.util.Preconditions.checkFlagsArgument(int,int)
-RemovedMethod: androidx.core.util.Preconditions#checkStringNotEmpty(T):
-    Removed method androidx.core.util.Preconditions.checkStringNotEmpty(T)
-RemovedMethod: androidx.core.util.Preconditions#checkStringNotEmpty(T, Object):
-    Removed method androidx.core.util.Preconditions.checkStringNotEmpty(T,Object)
-
-
-RemovedPackage: android.support.v4.graphics.drawable:
-    Removed package android.support.v4.graphics.drawable
-
-
diff --git a/core/core/api/restricted_1.2.0-alpha02.ignore b/core/core/api/restricted_1.2.0-alpha02.ignore
deleted file mode 100644
index 56a8fe1..0000000
--- a/core/core/api/restricted_1.2.0-alpha02.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#mFontFamily:
-    Field androidx.core.graphics.TypefaceCompatApi26Impl.mFontFamily has changed type from java.lang.Class to java.lang.Class<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#mFontFamilyCtor:
-    Field androidx.core.graphics.TypefaceCompatApi26Impl.mFontFamilyCtor has changed type from java.lang.reflect.Constructor to java.lang.reflect.Constructor<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#obtainFontFamily():
-    Method androidx.core.graphics.TypefaceCompatApi26Impl.obtainFontFamily has changed return type from Class to Class<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#obtainFontFamilyCtor(Class<?>):
-    Method androidx.core.graphics.TypefaceCompatApi26Impl.obtainFontFamilyCtor has changed return type from java.lang.reflect.Constructor to java.lang.reflect.Constructor<?>
diff --git a/core/core/api/restricted_1.2.0-alpha03.ignore b/core/core/api/restricted_1.2.0-alpha03.ignore
deleted file mode 100644
index e0f9ee3..0000000
--- a/core/core/api/restricted_1.2.0-alpha03.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-ChangedStatic: androidx.core.content.pm.ShortcutManagerCompat#removeDynamicShortcuts(android.content.Context, java.util.List<java.lang.String>):
-    Method androidx.core.content.pm.ShortcutManagerCompat.removeDynamicShortcuts has changed 'static' qualifier
-
-
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#mFontFamily:
-    Field androidx.core.graphics.TypefaceCompatApi26Impl.mFontFamily has changed type from java.lang.Class to java.lang.Class<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#mFontFamilyCtor:
-    Field androidx.core.graphics.TypefaceCompatApi26Impl.mFontFamilyCtor has changed type from java.lang.reflect.Constructor to java.lang.reflect.Constructor<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#obtainFontFamily():
-    Method androidx.core.graphics.TypefaceCompatApi26Impl.obtainFontFamily has changed return type from Class to Class<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#obtainFontFamilyCtor(Class<?>):
-    Method androidx.core.graphics.TypefaceCompatApi26Impl.obtainFontFamilyCtor has changed return type from java.lang.reflect.Constructor to java.lang.reflect.Constructor<?>
diff --git a/core/core/api/restricted_1.2.0-alpha04.ignore b/core/core/api/restricted_1.2.0-alpha04.ignore
deleted file mode 100644
index e0f9ee3..0000000
--- a/core/core/api/restricted_1.2.0-alpha04.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-ChangedStatic: androidx.core.content.pm.ShortcutManagerCompat#removeDynamicShortcuts(android.content.Context, java.util.List<java.lang.String>):
-    Method androidx.core.content.pm.ShortcutManagerCompat.removeDynamicShortcuts has changed 'static' qualifier
-
-
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#mFontFamily:
-    Field androidx.core.graphics.TypefaceCompatApi26Impl.mFontFamily has changed type from java.lang.Class to java.lang.Class<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#mFontFamilyCtor:
-    Field androidx.core.graphics.TypefaceCompatApi26Impl.mFontFamilyCtor has changed type from java.lang.reflect.Constructor to java.lang.reflect.Constructor<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#obtainFontFamily():
-    Method androidx.core.graphics.TypefaceCompatApi26Impl.obtainFontFamily has changed return type from Class to Class<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#obtainFontFamilyCtor(Class<?>):
-    Method androidx.core.graphics.TypefaceCompatApi26Impl.obtainFontFamilyCtor has changed return type from java.lang.reflect.Constructor to java.lang.reflect.Constructor<?>
diff --git a/core/core/api/restricted_1.2.0-alpha05.ignore b/core/core/api/restricted_1.2.0-alpha05.ignore
deleted file mode 100644
index e0f9ee3..0000000
--- a/core/core/api/restricted_1.2.0-alpha05.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-ChangedStatic: androidx.core.content.pm.ShortcutManagerCompat#removeDynamicShortcuts(android.content.Context, java.util.List<java.lang.String>):
-    Method androidx.core.content.pm.ShortcutManagerCompat.removeDynamicShortcuts has changed 'static' qualifier
-
-
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#mFontFamily:
-    Field androidx.core.graphics.TypefaceCompatApi26Impl.mFontFamily has changed type from java.lang.Class to java.lang.Class<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#mFontFamilyCtor:
-    Field androidx.core.graphics.TypefaceCompatApi26Impl.mFontFamilyCtor has changed type from java.lang.reflect.Constructor to java.lang.reflect.Constructor<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#obtainFontFamily():
-    Method androidx.core.graphics.TypefaceCompatApi26Impl.obtainFontFamily has changed return type from Class to Class<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#obtainFontFamilyCtor(Class<?>):
-    Method androidx.core.graphics.TypefaceCompatApi26Impl.obtainFontFamilyCtor has changed return type from java.lang.reflect.Constructor to java.lang.reflect.Constructor<?>
diff --git a/core/core/api/restricted_1.2.0-beta01.ignore b/core/core/api/restricted_1.2.0-beta01.ignore
deleted file mode 100644
index e0f9ee3..0000000
--- a/core/core/api/restricted_1.2.0-beta01.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-ChangedStatic: androidx.core.content.pm.ShortcutManagerCompat#removeDynamicShortcuts(android.content.Context, java.util.List<java.lang.String>):
-    Method androidx.core.content.pm.ShortcutManagerCompat.removeDynamicShortcuts has changed 'static' qualifier
-
-
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#mFontFamily:
-    Field androidx.core.graphics.TypefaceCompatApi26Impl.mFontFamily has changed type from java.lang.Class to java.lang.Class<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#mFontFamilyCtor:
-    Field androidx.core.graphics.TypefaceCompatApi26Impl.mFontFamilyCtor has changed type from java.lang.reflect.Constructor to java.lang.reflect.Constructor<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#obtainFontFamily():
-    Method androidx.core.graphics.TypefaceCompatApi26Impl.obtainFontFamily has changed return type from Class to Class<?>
-ChangedType: androidx.core.graphics.TypefaceCompatApi26Impl#obtainFontFamilyCtor(Class<?>):
-    Method androidx.core.graphics.TypefaceCompatApi26Impl.obtainFontFamilyCtor has changed return type from java.lang.reflect.Constructor to java.lang.reflect.Constructor<?>
diff --git a/core/core/api/restricted_1.3.0-alpha01.ignore b/core/core/api/restricted_1.3.0-alpha01.ignore
deleted file mode 100644
index 392c5a0..0000000
--- a/core/core/api/restricted_1.3.0-alpha01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.core.util.LogWriter:
-    Removed class androidx.core.util.LogWriter
diff --git a/core/core/api/restricted_1.4.0-alpha01.ignore b/core/core/api/restricted_1.4.0-alpha01.ignore
deleted file mode 100644
index 1b58ddc..0000000
--- a/core/core/api/restricted_1.4.0-alpha01.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.core.util.Pair#Pair(F, S) parameter #0:
-    Attempted to remove @Nullable annotation from parameter arg1 in androidx.core.util.Pair(F arg1, S arg2)
-InvalidNullConversion: androidx.core.util.Pair#Pair(F, S) parameter #1:
-    Attempted to remove @Nullable annotation from parameter arg2 in androidx.core.util.Pair(F arg1, S arg2)
-InvalidNullConversion: androidx.core.util.Pair#create(A, B) parameter #0:
-    Attempted to remove @Nullable annotation from parameter arg1 in androidx.core.util.Pair.create(A arg1, B arg2)
-InvalidNullConversion: androidx.core.util.Pair#create(A, B) parameter #1:
-    Attempted to remove @Nullable annotation from parameter arg2 in androidx.core.util.Pair.create(A arg1, B arg2)
-InvalidNullConversion: androidx.core.util.Pair#first:
-    Attempted to remove @Nullable annotation from field androidx.core.util.Pair.first
-InvalidNullConversion: androidx.core.util.Pair#second:
-    Attempted to remove @Nullable annotation from field androidx.core.util.Pair.second
diff --git a/core/core/api/restricted_1.5.0-alpha01.ignore b/core/core/api/restricted_1.5.0-alpha01.ignore
deleted file mode 100644
index 1b58ddc..0000000
--- a/core/core/api/restricted_1.5.0-alpha01.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.core.util.Pair#Pair(F, S) parameter #0:
-    Attempted to remove @Nullable annotation from parameter arg1 in androidx.core.util.Pair(F arg1, S arg2)
-InvalidNullConversion: androidx.core.util.Pair#Pair(F, S) parameter #1:
-    Attempted to remove @Nullable annotation from parameter arg2 in androidx.core.util.Pair(F arg1, S arg2)
-InvalidNullConversion: androidx.core.util.Pair#create(A, B) parameter #0:
-    Attempted to remove @Nullable annotation from parameter arg1 in androidx.core.util.Pair.create(A arg1, B arg2)
-InvalidNullConversion: androidx.core.util.Pair#create(A, B) parameter #1:
-    Attempted to remove @Nullable annotation from parameter arg2 in androidx.core.util.Pair.create(A arg1, B arg2)
-InvalidNullConversion: androidx.core.util.Pair#first:
-    Attempted to remove @Nullable annotation from field androidx.core.util.Pair.first
-InvalidNullConversion: androidx.core.util.Pair#second:
-    Attempted to remove @Nullable annotation from field androidx.core.util.Pair.second
diff --git a/core/core/api/restricted_1.5.0-alpha02.ignore b/core/core/api/restricted_1.5.0-alpha02.ignore
deleted file mode 100644
index 1b58ddc..0000000
--- a/core/core/api/restricted_1.5.0-alpha02.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.core.util.Pair#Pair(F, S) parameter #0:
-    Attempted to remove @Nullable annotation from parameter arg1 in androidx.core.util.Pair(F arg1, S arg2)
-InvalidNullConversion: androidx.core.util.Pair#Pair(F, S) parameter #1:
-    Attempted to remove @Nullable annotation from parameter arg2 in androidx.core.util.Pair(F arg1, S arg2)
-InvalidNullConversion: androidx.core.util.Pair#create(A, B) parameter #0:
-    Attempted to remove @Nullable annotation from parameter arg1 in androidx.core.util.Pair.create(A arg1, B arg2)
-InvalidNullConversion: androidx.core.util.Pair#create(A, B) parameter #1:
-    Attempted to remove @Nullable annotation from parameter arg2 in androidx.core.util.Pair.create(A arg1, B arg2)
-InvalidNullConversion: androidx.core.util.Pair#first:
-    Attempted to remove @Nullable annotation from field androidx.core.util.Pair.first
-InvalidNullConversion: androidx.core.util.Pair#second:
-    Attempted to remove @Nullable annotation from field androidx.core.util.Pair.second
diff --git a/core/core/api/1.4.0-alpha01.ignore b/core/core/api/restricted_current.ignore
similarity index 100%
copy from core/core/api/1.4.0-alpha01.ignore
copy to core/core/api/restricted_current.ignore
diff --git a/fragment/fragment-ktx/api/1.3.0-alpha05.ignore b/fragment/fragment-ktx/api/1.3.0-alpha05.ignore
deleted file mode 100644
index 4da20b8..0000000
--- a/fragment/fragment-ktx/api/1.3.0-alpha05.ignore
+++ /dev/null
@@ -1,21 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.fragment.app.FragmentViewModelLazyKt#activityViewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.fragment.app.FragmentViewModelLazyKt.activityViewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-ChangedType: androidx.fragment.app.FragmentViewModelLazyKt#viewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.fragment.app.FragmentViewModelLazyKt.viewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-
-
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#add(androidx.fragment.app.FragmentTransaction, String, android.os.Bundle):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentTransactionKt.add(androidx.fragment.app.FragmentTransaction,String,android.os.Bundle)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#add(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentTransactionKt.add(androidx.fragment.app.FragmentTransaction,int,String,android.os.Bundle)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#add(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle) parameter #2:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter tag in androidx.fragment.app.FragmentTransactionKt.add(androidx.fragment.app.FragmentTransaction arg1, int containerViewId, String tag, android.os.Bundle args)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#replace(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentTransactionKt.replace(androidx.fragment.app.FragmentTransaction,int,String,android.os.Bundle)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#replace(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle) parameter #2:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter tag in androidx.fragment.app.FragmentTransactionKt.replace(androidx.fragment.app.FragmentTransaction arg1, int containerViewId, String tag, android.os.Bundle args)
-InvalidNullConversion: androidx.fragment.app.FragmentViewModelLazyKt#activityViewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentViewModelLazyKt.activityViewModels(androidx.fragment.app.Fragment,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
-InvalidNullConversion: androidx.fragment.app.FragmentViewModelLazyKt#viewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentViewModelLazyKt.viewModels(androidx.fragment.app.Fragment,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
diff --git a/fragment/fragment-ktx/api/1.3.0-alpha06.ignore b/fragment/fragment-ktx/api/1.3.0-alpha06.ignore
deleted file mode 100644
index 4da20b8..0000000
--- a/fragment/fragment-ktx/api/1.3.0-alpha06.ignore
+++ /dev/null
@@ -1,21 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.fragment.app.FragmentViewModelLazyKt#activityViewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.fragment.app.FragmentViewModelLazyKt.activityViewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-ChangedType: androidx.fragment.app.FragmentViewModelLazyKt#viewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.fragment.app.FragmentViewModelLazyKt.viewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-
-
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#add(androidx.fragment.app.FragmentTransaction, String, android.os.Bundle):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentTransactionKt.add(androidx.fragment.app.FragmentTransaction,String,android.os.Bundle)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#add(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentTransactionKt.add(androidx.fragment.app.FragmentTransaction,int,String,android.os.Bundle)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#add(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle) parameter #2:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter tag in androidx.fragment.app.FragmentTransactionKt.add(androidx.fragment.app.FragmentTransaction arg1, int containerViewId, String tag, android.os.Bundle args)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#replace(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentTransactionKt.replace(androidx.fragment.app.FragmentTransaction,int,String,android.os.Bundle)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#replace(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle) parameter #2:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter tag in androidx.fragment.app.FragmentTransactionKt.replace(androidx.fragment.app.FragmentTransaction arg1, int containerViewId, String tag, android.os.Bundle args)
-InvalidNullConversion: androidx.fragment.app.FragmentViewModelLazyKt#activityViewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentViewModelLazyKt.activityViewModels(androidx.fragment.app.Fragment,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
-InvalidNullConversion: androidx.fragment.app.FragmentViewModelLazyKt#viewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentViewModelLazyKt.viewModels(androidx.fragment.app.Fragment,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
diff --git a/fragment/fragment-ktx/api/restricted_1.3.0-alpha05.ignore b/fragment/fragment-ktx/api/restricted_1.3.0-alpha05.ignore
deleted file mode 100644
index 4da20b8..0000000
--- a/fragment/fragment-ktx/api/restricted_1.3.0-alpha05.ignore
+++ /dev/null
@@ -1,21 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.fragment.app.FragmentViewModelLazyKt#activityViewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.fragment.app.FragmentViewModelLazyKt.activityViewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-ChangedType: androidx.fragment.app.FragmentViewModelLazyKt#viewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.fragment.app.FragmentViewModelLazyKt.viewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-
-
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#add(androidx.fragment.app.FragmentTransaction, String, android.os.Bundle):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentTransactionKt.add(androidx.fragment.app.FragmentTransaction,String,android.os.Bundle)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#add(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentTransactionKt.add(androidx.fragment.app.FragmentTransaction,int,String,android.os.Bundle)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#add(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle) parameter #2:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter tag in androidx.fragment.app.FragmentTransactionKt.add(androidx.fragment.app.FragmentTransaction arg1, int containerViewId, String tag, android.os.Bundle args)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#replace(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentTransactionKt.replace(androidx.fragment.app.FragmentTransaction,int,String,android.os.Bundle)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#replace(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle) parameter #2:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter tag in androidx.fragment.app.FragmentTransactionKt.replace(androidx.fragment.app.FragmentTransaction arg1, int containerViewId, String tag, android.os.Bundle args)
-InvalidNullConversion: androidx.fragment.app.FragmentViewModelLazyKt#activityViewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentViewModelLazyKt.activityViewModels(androidx.fragment.app.Fragment,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
-InvalidNullConversion: androidx.fragment.app.FragmentViewModelLazyKt#viewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentViewModelLazyKt.viewModels(androidx.fragment.app.Fragment,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
diff --git a/fragment/fragment-ktx/api/restricted_1.3.0-alpha06.ignore b/fragment/fragment-ktx/api/restricted_1.3.0-alpha06.ignore
deleted file mode 100644
index 4da20b8..0000000
--- a/fragment/fragment-ktx/api/restricted_1.3.0-alpha06.ignore
+++ /dev/null
@@ -1,21 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.fragment.app.FragmentViewModelLazyKt#activityViewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.fragment.app.FragmentViewModelLazyKt.activityViewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-ChangedType: androidx.fragment.app.FragmentViewModelLazyKt#viewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.fragment.app.FragmentViewModelLazyKt.viewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-
-
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#add(androidx.fragment.app.FragmentTransaction, String, android.os.Bundle):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentTransactionKt.add(androidx.fragment.app.FragmentTransaction,String,android.os.Bundle)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#add(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentTransactionKt.add(androidx.fragment.app.FragmentTransaction,int,String,android.os.Bundle)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#add(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle) parameter #2:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter tag in androidx.fragment.app.FragmentTransactionKt.add(androidx.fragment.app.FragmentTransaction arg1, int containerViewId, String tag, android.os.Bundle args)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#replace(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentTransactionKt.replace(androidx.fragment.app.FragmentTransaction,int,String,android.os.Bundle)
-InvalidNullConversion: androidx.fragment.app.FragmentTransactionKt#replace(androidx.fragment.app.FragmentTransaction, int, String, android.os.Bundle) parameter #2:
-    Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter tag in androidx.fragment.app.FragmentTransactionKt.replace(androidx.fragment.app.FragmentTransaction arg1, int containerViewId, String tag, android.os.Bundle args)
-InvalidNullConversion: androidx.fragment.app.FragmentViewModelLazyKt#activityViewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentViewModelLazyKt.activityViewModels(androidx.fragment.app.Fragment,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
-InvalidNullConversion: androidx.fragment.app.FragmentViewModelLazyKt#viewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.FragmentViewModelLazyKt.viewModels(androidx.fragment.app.Fragment,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
diff --git a/fragment/fragment-testing/api/1.3.0-alpha05.ignore b/fragment/fragment-testing/api/1.3.0-alpha05.ignore
deleted file mode 100644
index 0c3c8e4..0000000
--- a/fragment/fragment-testing/api/1.3.0-alpha05.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragment(android.os.Bundle, int, androidx.fragment.app.FragmentFactory):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragment(android.os.Bundle,int,androidx.fragment.app.FragmentFactory)
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragment(android.os.Bundle, int, kotlin.jvm.functions.Function0<? extends F>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragment(android.os.Bundle,int,kotlin.jvm.functions.Function0<? extends F>)
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragmentInContainer(android.os.Bundle, int, androidx.fragment.app.FragmentFactory):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragmentInContainer(android.os.Bundle,int,androidx.fragment.app.FragmentFactory)
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragmentInContainer(android.os.Bundle, int, kotlin.jvm.functions.Function0<? extends F>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragmentInContainer(android.os.Bundle,int,kotlin.jvm.functions.Function0<? extends F>)
diff --git a/fragment/fragment-testing/api/1.3.0-alpha06.ignore b/fragment/fragment-testing/api/1.3.0-alpha06.ignore
deleted file mode 100644
index 0c3c8e4..0000000
--- a/fragment/fragment-testing/api/1.3.0-alpha06.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragment(android.os.Bundle, int, androidx.fragment.app.FragmentFactory):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragment(android.os.Bundle,int,androidx.fragment.app.FragmentFactory)
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragment(android.os.Bundle, int, kotlin.jvm.functions.Function0<? extends F>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragment(android.os.Bundle,int,kotlin.jvm.functions.Function0<? extends F>)
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragmentInContainer(android.os.Bundle, int, androidx.fragment.app.FragmentFactory):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragmentInContainer(android.os.Bundle,int,androidx.fragment.app.FragmentFactory)
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragmentInContainer(android.os.Bundle, int, kotlin.jvm.functions.Function0<? extends F>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragmentInContainer(android.os.Bundle,int,kotlin.jvm.functions.Function0<? extends F>)
diff --git a/fragment/fragment-testing/api/restricted_1.3.0-alpha05.ignore b/fragment/fragment-testing/api/restricted_1.3.0-alpha05.ignore
deleted file mode 100644
index 0c3c8e4..0000000
--- a/fragment/fragment-testing/api/restricted_1.3.0-alpha05.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragment(android.os.Bundle, int, androidx.fragment.app.FragmentFactory):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragment(android.os.Bundle,int,androidx.fragment.app.FragmentFactory)
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragment(android.os.Bundle, int, kotlin.jvm.functions.Function0<? extends F>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragment(android.os.Bundle,int,kotlin.jvm.functions.Function0<? extends F>)
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragmentInContainer(android.os.Bundle, int, androidx.fragment.app.FragmentFactory):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragmentInContainer(android.os.Bundle,int,androidx.fragment.app.FragmentFactory)
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragmentInContainer(android.os.Bundle, int, kotlin.jvm.functions.Function0<? extends F>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragmentInContainer(android.os.Bundle,int,kotlin.jvm.functions.Function0<? extends F>)
diff --git a/fragment/fragment-testing/api/restricted_1.3.0-alpha06.ignore b/fragment/fragment-testing/api/restricted_1.3.0-alpha06.ignore
deleted file mode 100644
index 0c3c8e4..0000000
--- a/fragment/fragment-testing/api/restricted_1.3.0-alpha06.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragment(android.os.Bundle, int, androidx.fragment.app.FragmentFactory):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragment(android.os.Bundle,int,androidx.fragment.app.FragmentFactory)
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragment(android.os.Bundle, int, kotlin.jvm.functions.Function0<? extends F>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragment(android.os.Bundle,int,kotlin.jvm.functions.Function0<? extends F>)
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragmentInContainer(android.os.Bundle, int, androidx.fragment.app.FragmentFactory):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragmentInContainer(android.os.Bundle,int,androidx.fragment.app.FragmentFactory)
-InvalidNullConversion: androidx.fragment.app.testing.FragmentScenarioKt#launchFragmentInContainer(android.os.Bundle, int, kotlin.jvm.functions.Function0<? extends F>):
-    Attempted to remove @NonNull annotation from method androidx.fragment.app.testing.FragmentScenarioKt.launchFragmentInContainer(android.os.Bundle,int,kotlin.jvm.functions.Function0<? extends F>)
diff --git a/fragment/fragment/api/1.0.0.ignore b/fragment/fragment/api/1.0.0.ignore
deleted file mode 100644
index 34d22d0..0000000
--- a/fragment/fragment/api/1.0.0.ignore
+++ /dev/null
@@ -1,6 +0,0 @@
-909472b
-3151adf
-84551fe
-95afe7a
-e4a0928
-4188d08
diff --git a/leanback/leanback/api/0.0.0.ignore b/leanback/leanback/api/0.0.0.ignore
deleted file mode 100644
index acbd650..0000000
--- a/leanback/leanback/api/0.0.0.ignore
+++ /dev/null
@@ -1,26 +0,0 @@
-af573c0
-a4cc564
-577640f
-fd4768c
-53f90e9
-cfb6d61
-1cf7c66
-5ffc06d
-0514f73
-c618f03
-74f7502
-9215d08
-c0e89bb
-dfff1c8
-a3499fd
-9155dd6
-78a1228
-71b71dd
-53572e1
-e72a1ff
-16ebeca
-62abd78
-fb45acb
-75a3b64
-fe056b6
-5ecba84
diff --git a/leanback/leanback/api/1.1.0-alpha02.ignore b/leanback/leanback/api/1.1.0-alpha02.ignore
deleted file mode 100644
index 8474b08..0000000
--- a/leanback/leanback/api/1.1.0-alpha02.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-ChangedStatic: androidx.leanback.widget.ItemBridgeAdapter.ViewHolder:
-    Class androidx.leanback.widget.ItemBridgeAdapter.ViewHolder changed 'static' qualifier
-
-
diff --git a/leanback/leanback/api/1.1.0-alpha03.ignore b/leanback/leanback/api/1.1.0-alpha03.ignore
deleted file mode 100644
index cf7fad9..0000000
--- a/leanback/leanback/api/1.1.0-alpha03.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-ChangedStatic: androidx.leanback.widget.ItemBridgeAdapter.ViewHolder:
-    Class androidx.leanback.widget.ItemBridgeAdapter.ViewHolder changed 'static' qualifier
-
-
-RemovedDeprecatedMethod: androidx.leanback.app.RowsFragment#onCreate(android.os.Bundle):
-    Removed deprecated method androidx.leanback.app.RowsFragment.onCreate(android.os.Bundle)
diff --git a/leanback/leanback/api/restricted_1.1.0-alpha03.ignore b/leanback/leanback/api/restricted_1.1.0-alpha03.ignore
deleted file mode 100644
index c94da04..0000000
--- a/leanback/leanback/api/restricted_1.1.0-alpha03.ignore
+++ /dev/null
@@ -1,11 +0,0 @@
-// Baseline format: 1.0
-ChangedStatic: androidx.leanback.widget.ItemBridgeAdapter.ViewHolder:
-    Class androidx.leanback.widget.ItemBridgeAdapter.ViewHolder changed 'static' qualifier
-
-
-RemovedDeprecatedMethod: androidx.leanback.app.RowsFragment#onCreate(android.os.Bundle):
-    Removed deprecated method androidx.leanback.app.RowsFragment.onCreate(android.os.Bundle)
-
-
-RemovedMethod: androidx.leanback.widget.picker.DatePicker#updateDate(int, int, int, boolean):
-    Removed method androidx.leanback.widget.picker.DatePicker.updateDate(int,int,int,boolean)
diff --git a/lifecycle/lifecycle-common/api/restricted_2.1.0-alpha03.ignore b/lifecycle/lifecycle-common/api/restricted_2.1.0-alpha03.ignore
deleted file mode 100644
index f0841f8..0000000
--- a/lifecycle/lifecycle-common/api/restricted_2.1.0-alpha03.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-ChangedSuperclass: androidx.lifecycle.GenericLifecycleObserver:
-    Class androidx.lifecycle.GenericLifecycleObserver superclass changed from androidx.lifecycle.LifecycleObserver to androidx.lifecycle.LifecycleEventObserver
-
-RemovedClass: androidx.lifecycle.CompositeGeneratedAdaptersObserver:
-    Removed class androidx.lifecycle.CompositeGeneratedAdaptersObserver
-
-RemovedClass: androidx.lifecycle.SingleGeneratedAdapterObserver:
-    Removed class androidx.lifecycle.SingleGeneratedAdapterObserver
\ No newline at end of file
diff --git a/lifecycle/lifecycle-common/api/restricted_2.1.0-alpha04.ignore b/lifecycle/lifecycle-common/api/restricted_2.1.0-alpha04.ignore
deleted file mode 100644
index 0a4fad1..0000000
--- a/lifecycle/lifecycle-common/api/restricted_2.1.0-alpha04.ignore
+++ /dev/null
@@ -1,11 +0,0 @@
-// Baseline format: 1.0
-ChangedSuperclass: androidx.lifecycle.GenericLifecycleObserver:
-    Class androidx.lifecycle.GenericLifecycleObserver superclass changed from androidx.lifecycle.LifecycleObserver to androidx.lifecycle.LifecycleEventObserver
-
-
-RemovedClass: androidx.lifecycle.CompositeGeneratedAdaptersObserver:
-    Removed class androidx.lifecycle.CompositeGeneratedAdaptersObserver
-RemovedClass: androidx.lifecycle.SingleGeneratedAdapterObserver:
-    Removed class androidx.lifecycle.SingleGeneratedAdapterObserver
-
-
diff --git a/lifecycle/lifecycle-common/api/restricted_2.1.0-alpha05.ignore b/lifecycle/lifecycle-common/api/restricted_2.1.0-alpha05.ignore
deleted file mode 100644
index 0a4fad1..0000000
--- a/lifecycle/lifecycle-common/api/restricted_2.1.0-alpha05.ignore
+++ /dev/null
@@ -1,11 +0,0 @@
-// Baseline format: 1.0
-ChangedSuperclass: androidx.lifecycle.GenericLifecycleObserver:
-    Class androidx.lifecycle.GenericLifecycleObserver superclass changed from androidx.lifecycle.LifecycleObserver to androidx.lifecycle.LifecycleEventObserver
-
-
-RemovedClass: androidx.lifecycle.CompositeGeneratedAdaptersObserver:
-    Removed class androidx.lifecycle.CompositeGeneratedAdaptersObserver
-RemovedClass: androidx.lifecycle.SingleGeneratedAdapterObserver:
-    Removed class androidx.lifecycle.SingleGeneratedAdapterObserver
-
-
diff --git a/lifecycle/lifecycle-common/api/restricted_2.1.0-beta00.ignore b/lifecycle/lifecycle-common/api/restricted_2.1.0-beta00.ignore
deleted file mode 100644
index 0a4fad1..0000000
--- a/lifecycle/lifecycle-common/api/restricted_2.1.0-beta00.ignore
+++ /dev/null
@@ -1,11 +0,0 @@
-// Baseline format: 1.0
-ChangedSuperclass: androidx.lifecycle.GenericLifecycleObserver:
-    Class androidx.lifecycle.GenericLifecycleObserver superclass changed from androidx.lifecycle.LifecycleObserver to androidx.lifecycle.LifecycleEventObserver
-
-
-RemovedClass: androidx.lifecycle.CompositeGeneratedAdaptersObserver:
-    Removed class androidx.lifecycle.CompositeGeneratedAdaptersObserver
-RemovedClass: androidx.lifecycle.SingleGeneratedAdapterObserver:
-    Removed class androidx.lifecycle.SingleGeneratedAdapterObserver
-
-
diff --git a/lifecycle/lifecycle-common/api/restricted_2.2.0-alpha02.ignore b/lifecycle/lifecycle-common/api/restricted_2.2.0-alpha02.ignore
deleted file mode 100644
index f8a81b8..0000000
--- a/lifecycle/lifecycle-common/api/restricted_2.2.0-alpha02.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.lifecycle.LifecycleEventObserver#onStateChanged(androidx.lifecycle.LifecycleOwner, androidx.lifecycle.Lifecycle.Event):
-    Added method androidx.lifecycle.LifecycleEventObserver.onStateChanged(androidx.lifecycle.LifecycleOwner,androidx.lifecycle.Lifecycle.Event)
diff --git a/lifecycle/lifecycle-common/api/restricted_2.2.0-alpha03.ignore b/lifecycle/lifecycle-common/api/restricted_2.2.0-alpha03.ignore
deleted file mode 100644
index f8a81b8..0000000
--- a/lifecycle/lifecycle-common/api/restricted_2.2.0-alpha03.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.lifecycle.LifecycleEventObserver#onStateChanged(androidx.lifecycle.LifecycleOwner, androidx.lifecycle.Lifecycle.Event):
-    Added method androidx.lifecycle.LifecycleEventObserver.onStateChanged(androidx.lifecycle.LifecycleOwner,androidx.lifecycle.Lifecycle.Event)
diff --git a/lifecycle/lifecycle-common/api/restricted_2.2.0-alpha04.ignore b/lifecycle/lifecycle-common/api/restricted_2.2.0-alpha04.ignore
deleted file mode 100644
index f8a81b8..0000000
--- a/lifecycle/lifecycle-common/api/restricted_2.2.0-alpha04.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.lifecycle.LifecycleEventObserver#onStateChanged(androidx.lifecycle.LifecycleOwner, androidx.lifecycle.Lifecycle.Event):
-    Added method androidx.lifecycle.LifecycleEventObserver.onStateChanged(androidx.lifecycle.LifecycleOwner,androidx.lifecycle.Lifecycle.Event)
diff --git a/lifecycle/lifecycle-common/api/restricted_2.2.0-alpha05.ignore b/lifecycle/lifecycle-common/api/restricted_2.2.0-alpha05.ignore
deleted file mode 100644
index f8a81b8..0000000
--- a/lifecycle/lifecycle-common/api/restricted_2.2.0-alpha05.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.lifecycle.LifecycleEventObserver#onStateChanged(androidx.lifecycle.LifecycleOwner, androidx.lifecycle.Lifecycle.Event):
-    Added method androidx.lifecycle.LifecycleEventObserver.onStateChanged(androidx.lifecycle.LifecycleOwner,androidx.lifecycle.Lifecycle.Event)
diff --git a/lifecycle/lifecycle-common/api/restricted_2.2.0-beta01.ignore b/lifecycle/lifecycle-common/api/restricted_2.2.0-beta01.ignore
deleted file mode 100644
index f8a81b8..0000000
--- a/lifecycle/lifecycle-common/api/restricted_2.2.0-beta01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.lifecycle.LifecycleEventObserver#onStateChanged(androidx.lifecycle.LifecycleOwner, androidx.lifecycle.Lifecycle.Event):
-    Added method androidx.lifecycle.LifecycleEventObserver.onStateChanged(androidx.lifecycle.LifecycleOwner,androidx.lifecycle.Lifecycle.Event)
diff --git a/lifecycle/lifecycle-livedata-ktx/api/2.3.0-alpha03.ignore b/lifecycle/lifecycle-livedata-ktx/api/2.3.0-alpha03.ignore
deleted file mode 100644
index 5129315..0000000
--- a/lifecycle/lifecycle-livedata-ktx/api/2.3.0-alpha03.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.lifecycle.LiveDataScope#emitSource(androidx.lifecycle.LiveData<T>, kotlin.coroutines.Continuation<? super kotlinx.coroutines.DisposableHandle>):
-    Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.lifecycle.LiveDataScope.emitSource(androidx.lifecycle.LiveData<T>,kotlin.coroutines.Continuation<? super kotlinx.coroutines.DisposableHandle>)
diff --git a/lifecycle/lifecycle-livedata-ktx/api/restricted_2.3.0-alpha03.ignore b/lifecycle/lifecycle-livedata-ktx/api/restricted_2.3.0-alpha03.ignore
deleted file mode 100644
index 5129315..0000000
--- a/lifecycle/lifecycle-livedata-ktx/api/restricted_2.3.0-alpha03.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.lifecycle.LiveDataScope#emitSource(androidx.lifecycle.LiveData<T>, kotlin.coroutines.Continuation<? super kotlinx.coroutines.DisposableHandle>):
-    Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.lifecycle.LiveDataScope.emitSource(androidx.lifecycle.LiveData<T>,kotlin.coroutines.Continuation<? super kotlinx.coroutines.DisposableHandle>)
diff --git a/lifecycle/lifecycle-viewmodel-ktx/api/2.1.0-beta02.ignore b/lifecycle/lifecycle-viewmodel-ktx/api/2.1.0-beta02.ignore
deleted file mode 100644
index 9f94992..0000000
--- a/lifecycle/lifecycle-viewmodel-ktx/api/2.1.0-beta02.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.lifecycle.ViewModelProviderKt#get(androidx.lifecycle.ViewModelProvider):
-    Method androidx.lifecycle.ViewModelProviderKt.get has changed return type from VM to VM
-
-
diff --git a/lifecycle/lifecycle-viewmodel-ktx/api/2.2.0-alpha01.ignore b/lifecycle/lifecycle-viewmodel-ktx/api/2.2.0-alpha01.ignore
deleted file mode 100644
index 9f94992..0000000
--- a/lifecycle/lifecycle-viewmodel-ktx/api/2.2.0-alpha01.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.lifecycle.ViewModelProviderKt#get(androidx.lifecycle.ViewModelProvider):
-    Method androidx.lifecycle.ViewModelProviderKt.get has changed return type from VM to VM
-
-
diff --git a/lifecycle/lifecycle-viewmodel-ktx/api/2.2.0-alpha02.ignore b/lifecycle/lifecycle-viewmodel-ktx/api/2.2.0-alpha02.ignore
deleted file mode 100644
index fd00442..0000000
--- a/lifecycle/lifecycle-viewmodel-ktx/api/2.2.0-alpha02.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.lifecycle.ViewModelProviderKt#get(androidx.lifecycle.ViewModelProvider):
-    Method androidx.lifecycle.ViewModelProviderKt.get has changed return type from java.lang.VM to VM
diff --git a/lifecycle/lifecycle-viewmodel-ktx/api/2.3.0-alpha03.ignore b/lifecycle/lifecycle-viewmodel-ktx/api/2.3.0-alpha03.ignore
deleted file mode 100644
index 9aa947be..0000000
--- a/lifecycle/lifecycle-viewmodel-ktx/api/2.3.0-alpha03.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.lifecycle.ViewModelProviderKt#get(androidx.lifecycle.ViewModelProvider):
-    Attempted to remove @NonNull annotation from method androidx.lifecycle.ViewModelProviderKt.get(androidx.lifecycle.ViewModelProvider)
diff --git a/lifecycle/lifecycle-viewmodel-ktx/api/restricted_2.3.0-alpha03.ignore b/lifecycle/lifecycle-viewmodel-ktx/api/restricted_2.3.0-alpha03.ignore
deleted file mode 100644
index 9aa947be..0000000
--- a/lifecycle/lifecycle-viewmodel-ktx/api/restricted_2.3.0-alpha03.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.lifecycle.ViewModelProviderKt#get(androidx.lifecycle.ViewModelProvider):
-    Attempted to remove @NonNull annotation from method androidx.lifecycle.ViewModelProviderKt.get(androidx.lifecycle.ViewModelProvider)
diff --git a/loader/loader/api/1.1.0-beta01.ignore b/loader/loader/api/1.1.0-beta01.ignore
deleted file mode 100644
index 4376069..0000000
--- a/loader/loader/api/1.1.0-beta01.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-DeprecationMismatch: androidx.loader.content.AsyncTaskLoader#dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]):
-    Method androidx.loader.content.AsyncTaskLoader.dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.loader.content.CursorLoader#dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]):
-    Method androidx.loader.content.CursorLoader.dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-
-
diff --git a/loader/loader/api/1.1.0-rc01.ignore b/loader/loader/api/1.1.0-rc01.ignore
deleted file mode 100644
index 4376069..0000000
--- a/loader/loader/api/1.1.0-rc01.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-DeprecationMismatch: androidx.loader.content.AsyncTaskLoader#dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]):
-    Method androidx.loader.content.AsyncTaskLoader.dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.loader.content.CursorLoader#dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]):
-    Method androidx.loader.content.CursorLoader.dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-
-
diff --git a/loader/loader/api/restricted_1.1.0-beta01.ignore b/loader/loader/api/restricted_1.1.0-beta01.ignore
deleted file mode 100644
index 4376069..0000000
--- a/loader/loader/api/restricted_1.1.0-beta01.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-DeprecationMismatch: androidx.loader.content.AsyncTaskLoader#dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]):
-    Method androidx.loader.content.AsyncTaskLoader.dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.loader.content.CursorLoader#dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]):
-    Method androidx.loader.content.CursorLoader.dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-
-
diff --git a/loader/loader/api/restricted_1.1.0-rc02.ignore b/loader/loader/api/restricted_1.1.0-rc02.ignore
deleted file mode 100644
index 4376069..0000000
--- a/loader/loader/api/restricted_1.1.0-rc02.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-DeprecationMismatch: androidx.loader.content.AsyncTaskLoader#dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]):
-    Method androidx.loader.content.AsyncTaskLoader.dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-DeprecationMismatch: androidx.loader.content.CursorLoader#dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]):
-    Method androidx.loader.content.CursorLoader.dump(String, java.io.FileDescriptor, java.io.PrintWriter, String[]): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-
-
diff --git a/media/media/api/1.2.0-alpha01.ignore b/media/media/api/1.2.0-alpha01.ignore
deleted file mode 100644
index de0edac..0000000
--- a/media/media/api/1.2.0-alpha01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedThrows: android.support.v4.media.session.MediaControllerCompat#MediaControllerCompat(android.content.Context, android.support.v4.media.session.MediaSessionCompat.Token):
-    Constructor android.support.v4.media.session.MediaControllerCompat no longer throws exception android.os.RemoteException
diff --git a/media/media/api/1.2.0-alpha02.ignore b/media/media/api/1.2.0-alpha02.ignore
deleted file mode 100644
index de0edac..0000000
--- a/media/media/api/1.2.0-alpha02.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedThrows: android.support.v4.media.session.MediaControllerCompat#MediaControllerCompat(android.content.Context, android.support.v4.media.session.MediaSessionCompat.Token):
-    Constructor android.support.v4.media.session.MediaControllerCompat no longer throws exception android.os.RemoteException
diff --git a/media/media/api/1.2.0-alpha03.ignore b/media/media/api/1.2.0-alpha03.ignore
deleted file mode 100644
index de0edac..0000000
--- a/media/media/api/1.2.0-alpha03.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedThrows: android.support.v4.media.session.MediaControllerCompat#MediaControllerCompat(android.content.Context, android.support.v4.media.session.MediaSessionCompat.Token):
-    Constructor android.support.v4.media.session.MediaControllerCompat no longer throws exception android.os.RemoteException
diff --git a/media/media/api/1.2.0-alpha04.ignore b/media/media/api/1.2.0-alpha04.ignore
deleted file mode 100644
index de0edac..0000000
--- a/media/media/api/1.2.0-alpha04.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedThrows: android.support.v4.media.session.MediaControllerCompat#MediaControllerCompat(android.content.Context, android.support.v4.media.session.MediaSessionCompat.Token):
-    Constructor android.support.v4.media.session.MediaControllerCompat no longer throws exception android.os.RemoteException
diff --git a/media/media/api/1.2.0-alpha05.ignore b/media/media/api/1.2.0-alpha05.ignore
deleted file mode 100644
index badaf86..0000000
--- a/media/media/api/1.2.0-alpha05.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-// See tools/metalava/API-LINT.md for how to update this file.
-
-ChangedThrows: android.support.v4.media.session.MediaControllerCompat#MediaControllerCompat(android.content.Context, android.support.v4.media.session.MediaSessionCompat.Token):
-    Constructor android.support.v4.media.session.MediaControllerCompat no longer throws exception android.os.RemoteException
diff --git a/media/media/api/1.2.0-beta01.ignore b/media/media/api/current.ignore
similarity index 100%
rename from media/media/api/1.2.0-beta01.ignore
rename to media/media/api/current.ignore
diff --git a/media/media/api/restricted_1.2.0-alpha01.ignore b/media/media/api/restricted_1.2.0-alpha01.ignore
deleted file mode 100644
index de0edac..0000000
--- a/media/media/api/restricted_1.2.0-alpha01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedThrows: android.support.v4.media.session.MediaControllerCompat#MediaControllerCompat(android.content.Context, android.support.v4.media.session.MediaSessionCompat.Token):
-    Constructor android.support.v4.media.session.MediaControllerCompat no longer throws exception android.os.RemoteException
diff --git a/media/media/api/restricted_1.2.0-alpha02.ignore b/media/media/api/restricted_1.2.0-alpha02.ignore
deleted file mode 100644
index 329d30d..0000000
--- a/media/media/api/restricted_1.2.0-alpha02.ignore
+++ /dev/null
@@ -1,77 +0,0 @@
-// Baseline format: 1.0
-ChangedThrows: android.support.v4.media.session.MediaControllerCompat#MediaControllerCompat(android.content.Context, android.support.v4.media.session.MediaSessionCompat.Token):
-    Constructor android.support.v4.media.session.MediaControllerCompat no longer throws exception android.os.RemoteException
-
-
-RemovedClass: android.support.v4.media.MediaBrowserCompat.MediaItem.Flags:
-    Removed class android.support.v4.media.MediaBrowserCompat.MediaItem.Flags
-RemovedClass: android.support.v4.media.MediaMetadataCompat.BitmapKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.BitmapKey
-RemovedClass: android.support.v4.media.MediaMetadataCompat.LongKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.LongKey
-RemovedClass: android.support.v4.media.MediaMetadataCompat.RatingKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.RatingKey
-RemovedClass: android.support.v4.media.MediaMetadataCompat.TextKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.TextKey
-RemovedClass: android.support.v4.media.RatingCompat.StarStyle:
-    Removed class android.support.v4.media.RatingCompat.StarStyle
-RemovedClass: android.support.v4.media.session.MediaSessionCompat.SessionFlags:
-    Removed class android.support.v4.media.session.MediaSessionCompat.SessionFlags
-RemovedClass: android.support.v4.media.session.PlaybackStateCompat.ErrorCode:
-    Removed class android.support.v4.media.session.PlaybackStateCompat.ErrorCode
-RemovedClass: android.support.v4.media.session.PlaybackStateCompat.MediaKeyAction:
-    Removed class android.support.v4.media.session.PlaybackStateCompat.MediaKeyAction
-RemovedClass: androidx.media.AudioAttributesCompat.AttributeContentType:
-    Removed class androidx.media.AudioAttributesCompat.AttributeContentType
-RemovedClass: androidx.media.AudioAttributesCompat.AttributeUsage:
-    Removed class androidx.media.AudioAttributesCompat.AttributeUsage
-RemovedClass: androidx.media.AudioAttributesImplApi21:
-    Removed class androidx.media.AudioAttributesImplApi21
-RemovedClass: androidx.media.AudioAttributesImplApi26:
-    Removed class androidx.media.AudioAttributesImplApi26
-RemovedClass: androidx.media.AudioAttributesImplBase:
-    Removed class androidx.media.AudioAttributesImplBase
-RemovedClass: androidx.media.AudioFocusRequestCompat.FocusGainType:
-    Removed class androidx.media.AudioFocusRequestCompat.FocusGainType
-RemovedClass: androidx.media.MediaBrowserCompatUtils:
-    Removed class androidx.media.MediaBrowserCompatUtils
-
-
-RemovedField: android.support.v4.media.MediaDescriptionCompat#DESCRIPTION_KEY_MEDIA_URI:
-    Removed field android.support.v4.media.MediaDescriptionCompat.DESCRIPTION_KEY_MEDIA_URI
-RemovedField: android.support.v4.media.MediaDescriptionCompat#DESCRIPTION_KEY_NULL_BUNDLE_FLAG:
-    Removed field android.support.v4.media.MediaDescriptionCompat.DESCRIPTION_KEY_NULL_BUNDLE_FLAG
-RemovedField: android.support.v4.media.session.MediaSessionCompat#KEY_SESSION2_TOKEN:
-    Removed field android.support.v4.media.session.MediaSessionCompat.KEY_SESSION2_TOKEN
-RemovedField: android.support.v4.media.session.MediaSessionCompat#KEY_TOKEN:
-    Removed field android.support.v4.media.session.MediaSessionCompat.KEY_TOKEN
-RemovedField: androidx.media.AudioAttributesCompat#mImpl:
-    Removed field androidx.media.AudioAttributesCompat.mImpl
-RemovedField: androidx.media.MediaSessionManager.RemoteUserInfo#UNKNOWN_PID:
-    Removed field androidx.media.MediaSessionManager.RemoteUserInfo.UNKNOWN_PID
-RemovedField: androidx.media.MediaSessionManager.RemoteUserInfo#UNKNOWN_UID:
-    Removed field androidx.media.MediaSessionManager.RemoteUserInfo.UNKNOWN_UID
-
-
-RemovedMethod: android.support.v4.media.MediaMetadataCompat.Builder#Builder(android.support.v4.media.MediaMetadataCompat, int):
-    Removed constructor android.support.v4.media.MediaMetadataCompat.Builder(android.support.v4.media.MediaMetadataCompat,int)
-RemovedMethod: android.support.v4.media.session.MediaControllerCompat#getSession2Token():
-    Removed method android.support.v4.media.session.MediaControllerCompat.getSession2Token()
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat#ensureClassLoader(android.os.Bundle):
-    Removed method android.support.v4.media.session.MediaSessionCompat.ensureClassLoader(android.os.Bundle)
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat#getCallingPackage():
-    Removed method android.support.v4.media.session.MediaSessionCompat.getCallingPackage()
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat.Token#fromToken(Object, android.support.v4.media.session.IMediaSession):
-    Removed method android.support.v4.media.session.MediaSessionCompat.Token.fromToken(Object,android.support.v4.media.session.IMediaSession)
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat.Token#getExtraBinder():
-    Removed method android.support.v4.media.session.MediaSessionCompat.Token.getExtraBinder()
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat.Token#setExtraBinder(android.support.v4.media.session.IMediaSession):
-    Removed method android.support.v4.media.session.MediaSessionCompat.Token.setExtraBinder(android.support.v4.media.session.IMediaSession)
-RemovedMethod: androidx.media.AudioAttributesCompat#setForceLegacyBehavior(boolean):
-    Removed method androidx.media.AudioAttributesCompat.setForceLegacyBehavior(boolean)
-RemovedMethod: androidx.media.MediaBrowserServiceCompat#onSubscribe(String, android.os.Bundle):
-    Removed method androidx.media.MediaBrowserServiceCompat.onSubscribe(String,android.os.Bundle)
-RemovedMethod: androidx.media.MediaBrowserServiceCompat#onUnsubscribe(String):
-    Removed method androidx.media.MediaBrowserServiceCompat.onUnsubscribe(String)
-RemovedMethod: androidx.media.MediaSessionManager.RemoteUserInfo#RemoteUserInfo(android.media.session.MediaSessionManager.RemoteUserInfo):
-    Removed constructor androidx.media.MediaSessionManager.RemoteUserInfo(android.media.session.MediaSessionManager.RemoteUserInfo)
diff --git a/media/media/api/restricted_1.2.0-alpha04.ignore b/media/media/api/restricted_1.2.0-alpha04.ignore
deleted file mode 100644
index 5779f4b..0000000
--- a/media/media/api/restricted_1.2.0-alpha04.ignore
+++ /dev/null
@@ -1,73 +0,0 @@
-// Baseline format: 1.0
-ChangedThrows: android.support.v4.media.session.MediaControllerCompat#MediaControllerCompat(android.content.Context, android.support.v4.media.session.MediaSessionCompat.Token):
-    Constructor android.support.v4.media.session.MediaControllerCompat no longer throws exception android.os.RemoteException
-
-
-RemovedClass: android.support.v4.media.MediaBrowserCompat.MediaItem.Flags:
-    Removed class android.support.v4.media.MediaBrowserCompat.MediaItem.Flags
-RemovedClass: android.support.v4.media.MediaMetadataCompat.BitmapKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.BitmapKey
-RemovedClass: android.support.v4.media.MediaMetadataCompat.LongKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.LongKey
-RemovedClass: android.support.v4.media.MediaMetadataCompat.RatingKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.RatingKey
-RemovedClass: android.support.v4.media.MediaMetadataCompat.TextKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.TextKey
-RemovedClass: android.support.v4.media.RatingCompat.StarStyle:
-    Removed class android.support.v4.media.RatingCompat.StarStyle
-RemovedClass: android.support.v4.media.session.MediaSessionCompat.SessionFlags:
-    Removed class android.support.v4.media.session.MediaSessionCompat.SessionFlags
-RemovedClass: android.support.v4.media.session.PlaybackStateCompat.ErrorCode:
-    Removed class android.support.v4.media.session.PlaybackStateCompat.ErrorCode
-RemovedClass: android.support.v4.media.session.PlaybackStateCompat.MediaKeyAction:
-    Removed class android.support.v4.media.session.PlaybackStateCompat.MediaKeyAction
-RemovedClass: androidx.media.AudioAttributesCompat.AttributeContentType:
-    Removed class androidx.media.AudioAttributesCompat.AttributeContentType
-RemovedClass: androidx.media.AudioAttributesCompat.AttributeUsage:
-    Removed class androidx.media.AudioAttributesCompat.AttributeUsage
-RemovedClass: androidx.media.AudioAttributesImplApi21:
-    Removed class androidx.media.AudioAttributesImplApi21
-RemovedClass: androidx.media.AudioAttributesImplApi26:
-    Removed class androidx.media.AudioAttributesImplApi26
-RemovedClass: androidx.media.AudioAttributesImplBase:
-    Removed class androidx.media.AudioAttributesImplBase
-RemovedClass: androidx.media.AudioFocusRequestCompat.FocusGainType:
-    Removed class androidx.media.AudioFocusRequestCompat.FocusGainType
-RemovedClass: androidx.media.MediaBrowserCompatUtils:
-    Removed class androidx.media.MediaBrowserCompatUtils
-
-
-RemovedField: android.support.v4.media.MediaDescriptionCompat#DESCRIPTION_KEY_MEDIA_URI:
-    Removed field android.support.v4.media.MediaDescriptionCompat.DESCRIPTION_KEY_MEDIA_URI
-RemovedField: android.support.v4.media.MediaDescriptionCompat#DESCRIPTION_KEY_NULL_BUNDLE_FLAG:
-    Removed field android.support.v4.media.MediaDescriptionCompat.DESCRIPTION_KEY_NULL_BUNDLE_FLAG
-RemovedField: android.support.v4.media.session.MediaSessionCompat#KEY_SESSION2_TOKEN:
-    Removed field android.support.v4.media.session.MediaSessionCompat.KEY_SESSION2_TOKEN
-RemovedField: android.support.v4.media.session.MediaSessionCompat#KEY_TOKEN:
-    Removed field android.support.v4.media.session.MediaSessionCompat.KEY_TOKEN
-RemovedField: androidx.media.AudioAttributesCompat#mImpl:
-    Removed field androidx.media.AudioAttributesCompat.mImpl
-
-
-RemovedMethod: android.support.v4.media.MediaMetadataCompat.Builder#Builder(android.support.v4.media.MediaMetadataCompat, int):
-    Removed constructor android.support.v4.media.MediaMetadataCompat.Builder(android.support.v4.media.MediaMetadataCompat,int)
-RemovedMethod: android.support.v4.media.session.MediaControllerCompat#getSession2Token():
-    Removed method android.support.v4.media.session.MediaControllerCompat.getSession2Token()
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat#ensureClassLoader(android.os.Bundle):
-    Removed method android.support.v4.media.session.MediaSessionCompat.ensureClassLoader(android.os.Bundle)
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat#getCallingPackage():
-    Removed method android.support.v4.media.session.MediaSessionCompat.getCallingPackage()
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat.Token#fromToken(Object, android.support.v4.media.session.IMediaSession):
-    Removed method android.support.v4.media.session.MediaSessionCompat.Token.fromToken(Object,android.support.v4.media.session.IMediaSession)
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat.Token#getExtraBinder():
-    Removed method android.support.v4.media.session.MediaSessionCompat.Token.getExtraBinder()
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat.Token#setExtraBinder(android.support.v4.media.session.IMediaSession):
-    Removed method android.support.v4.media.session.MediaSessionCompat.Token.setExtraBinder(android.support.v4.media.session.IMediaSession)
-RemovedMethod: androidx.media.AudioAttributesCompat#setForceLegacyBehavior(boolean):
-    Removed method androidx.media.AudioAttributesCompat.setForceLegacyBehavior(boolean)
-RemovedMethod: androidx.media.MediaBrowserServiceCompat#onSubscribe(String, android.os.Bundle):
-    Removed method androidx.media.MediaBrowserServiceCompat.onSubscribe(String,android.os.Bundle)
-RemovedMethod: androidx.media.MediaBrowserServiceCompat#onUnsubscribe(String):
-    Removed method androidx.media.MediaBrowserServiceCompat.onUnsubscribe(String)
-RemovedMethod: androidx.media.MediaSessionManager.RemoteUserInfo#RemoteUserInfo(android.media.session.MediaSessionManager.RemoteUserInfo):
-    Removed constructor androidx.media.MediaSessionManager.RemoteUserInfo(android.media.session.MediaSessionManager.RemoteUserInfo)
diff --git a/media/media/api/restricted_1.2.0-alpha05.ignore b/media/media/api/restricted_1.2.0-alpha05.ignore
deleted file mode 100644
index d0f9b00..0000000
--- a/media/media/api/restricted_1.2.0-alpha05.ignore
+++ /dev/null
@@ -1,75 +0,0 @@
-// Baseline format: 1.0
-// See tools/metalava/API-LINT.md for how to update this file.
-
-ChangedThrows: android.support.v4.media.session.MediaControllerCompat#MediaControllerCompat(android.content.Context, android.support.v4.media.session.MediaSessionCompat.Token):
-    Constructor android.support.v4.media.session.MediaControllerCompat no longer throws exception android.os.RemoteException
-
-
-RemovedClass: android.support.v4.media.MediaBrowserCompat.MediaItem.Flags:
-    Removed class android.support.v4.media.MediaBrowserCompat.MediaItem.Flags
-RemovedClass: android.support.v4.media.MediaMetadataCompat.BitmapKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.BitmapKey
-RemovedClass: android.support.v4.media.MediaMetadataCompat.LongKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.LongKey
-RemovedClass: android.support.v4.media.MediaMetadataCompat.RatingKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.RatingKey
-RemovedClass: android.support.v4.media.MediaMetadataCompat.TextKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.TextKey
-RemovedClass: android.support.v4.media.RatingCompat.StarStyle:
-    Removed class android.support.v4.media.RatingCompat.StarStyle
-RemovedClass: android.support.v4.media.session.MediaSessionCompat.SessionFlags:
-    Removed class android.support.v4.media.session.MediaSessionCompat.SessionFlags
-RemovedClass: android.support.v4.media.session.PlaybackStateCompat.ErrorCode:
-    Removed class android.support.v4.media.session.PlaybackStateCompat.ErrorCode
-RemovedClass: android.support.v4.media.session.PlaybackStateCompat.MediaKeyAction:
-    Removed class android.support.v4.media.session.PlaybackStateCompat.MediaKeyAction
-RemovedClass: androidx.media.AudioAttributesCompat.AttributeContentType:
-    Removed class androidx.media.AudioAttributesCompat.AttributeContentType
-RemovedClass: androidx.media.AudioAttributesCompat.AttributeUsage:
-    Removed class androidx.media.AudioAttributesCompat.AttributeUsage
-RemovedClass: androidx.media.AudioAttributesImplApi21:
-    Removed class androidx.media.AudioAttributesImplApi21
-RemovedClass: androidx.media.AudioAttributesImplApi26:
-    Removed class androidx.media.AudioAttributesImplApi26
-RemovedClass: androidx.media.AudioAttributesImplBase:
-    Removed class androidx.media.AudioAttributesImplBase
-RemovedClass: androidx.media.AudioFocusRequestCompat.FocusGainType:
-    Removed class androidx.media.AudioFocusRequestCompat.FocusGainType
-RemovedClass: androidx.media.MediaBrowserCompatUtils:
-    Removed class androidx.media.MediaBrowserCompatUtils
-
-
-RemovedField: android.support.v4.media.MediaDescriptionCompat#DESCRIPTION_KEY_MEDIA_URI:
-    Removed field android.support.v4.media.MediaDescriptionCompat.DESCRIPTION_KEY_MEDIA_URI
-RemovedField: android.support.v4.media.MediaDescriptionCompat#DESCRIPTION_KEY_NULL_BUNDLE_FLAG:
-    Removed field android.support.v4.media.MediaDescriptionCompat.DESCRIPTION_KEY_NULL_BUNDLE_FLAG
-RemovedField: android.support.v4.media.session.MediaSessionCompat#KEY_SESSION2_TOKEN:
-    Removed field android.support.v4.media.session.MediaSessionCompat.KEY_SESSION2_TOKEN
-RemovedField: android.support.v4.media.session.MediaSessionCompat#KEY_TOKEN:
-    Removed field android.support.v4.media.session.MediaSessionCompat.KEY_TOKEN
-RemovedField: androidx.media.AudioAttributesCompat#mImpl:
-    Removed field androidx.media.AudioAttributesCompat.mImpl
-
-
-RemovedMethod: android.support.v4.media.MediaMetadataCompat.Builder#Builder(android.support.v4.media.MediaMetadataCompat, int):
-    Removed constructor android.support.v4.media.MediaMetadataCompat.Builder(android.support.v4.media.MediaMetadataCompat,int)
-RemovedMethod: android.support.v4.media.session.MediaControllerCompat#getSession2Token():
-    Removed method android.support.v4.media.session.MediaControllerCompat.getSession2Token()
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat#ensureClassLoader(android.os.Bundle):
-    Removed method android.support.v4.media.session.MediaSessionCompat.ensureClassLoader(android.os.Bundle)
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat#getCallingPackage():
-    Removed method android.support.v4.media.session.MediaSessionCompat.getCallingPackage()
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat.Token#fromToken(Object, android.support.v4.media.session.IMediaSession):
-    Removed method android.support.v4.media.session.MediaSessionCompat.Token.fromToken(Object,android.support.v4.media.session.IMediaSession)
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat.Token#getExtraBinder():
-    Removed method android.support.v4.media.session.MediaSessionCompat.Token.getExtraBinder()
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat.Token#setExtraBinder(android.support.v4.media.session.IMediaSession):
-    Removed method android.support.v4.media.session.MediaSessionCompat.Token.setExtraBinder(android.support.v4.media.session.IMediaSession)
-RemovedMethod: androidx.media.AudioAttributesCompat#setForceLegacyBehavior(boolean):
-    Removed method androidx.media.AudioAttributesCompat.setForceLegacyBehavior(boolean)
-RemovedMethod: androidx.media.MediaBrowserServiceCompat#onSubscribe(String, android.os.Bundle):
-    Removed method androidx.media.MediaBrowserServiceCompat.onSubscribe(String,android.os.Bundle)
-RemovedMethod: androidx.media.MediaBrowserServiceCompat#onUnsubscribe(String):
-    Removed method androidx.media.MediaBrowserServiceCompat.onUnsubscribe(String)
-RemovedMethod: androidx.media.MediaSessionManager.RemoteUserInfo#RemoteUserInfo(android.media.session.MediaSessionManager.RemoteUserInfo):
-    Removed constructor androidx.media.MediaSessionManager.RemoteUserInfo(android.media.session.MediaSessionManager.RemoteUserInfo)
diff --git a/media/media/api/restricted_1.2.0-beta01.ignore b/media/media/api/restricted_1.2.0-beta01.ignore
deleted file mode 100644
index 5779f4b..0000000
--- a/media/media/api/restricted_1.2.0-beta01.ignore
+++ /dev/null
@@ -1,73 +0,0 @@
-// Baseline format: 1.0
-ChangedThrows: android.support.v4.media.session.MediaControllerCompat#MediaControllerCompat(android.content.Context, android.support.v4.media.session.MediaSessionCompat.Token):
-    Constructor android.support.v4.media.session.MediaControllerCompat no longer throws exception android.os.RemoteException
-
-
-RemovedClass: android.support.v4.media.MediaBrowserCompat.MediaItem.Flags:
-    Removed class android.support.v4.media.MediaBrowserCompat.MediaItem.Flags
-RemovedClass: android.support.v4.media.MediaMetadataCompat.BitmapKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.BitmapKey
-RemovedClass: android.support.v4.media.MediaMetadataCompat.LongKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.LongKey
-RemovedClass: android.support.v4.media.MediaMetadataCompat.RatingKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.RatingKey
-RemovedClass: android.support.v4.media.MediaMetadataCompat.TextKey:
-    Removed class android.support.v4.media.MediaMetadataCompat.TextKey
-RemovedClass: android.support.v4.media.RatingCompat.StarStyle:
-    Removed class android.support.v4.media.RatingCompat.StarStyle
-RemovedClass: android.support.v4.media.session.MediaSessionCompat.SessionFlags:
-    Removed class android.support.v4.media.session.MediaSessionCompat.SessionFlags
-RemovedClass: android.support.v4.media.session.PlaybackStateCompat.ErrorCode:
-    Removed class android.support.v4.media.session.PlaybackStateCompat.ErrorCode
-RemovedClass: android.support.v4.media.session.PlaybackStateCompat.MediaKeyAction:
-    Removed class android.support.v4.media.session.PlaybackStateCompat.MediaKeyAction
-RemovedClass: androidx.media.AudioAttributesCompat.AttributeContentType:
-    Removed class androidx.media.AudioAttributesCompat.AttributeContentType
-RemovedClass: androidx.media.AudioAttributesCompat.AttributeUsage:
-    Removed class androidx.media.AudioAttributesCompat.AttributeUsage
-RemovedClass: androidx.media.AudioAttributesImplApi21:
-    Removed class androidx.media.AudioAttributesImplApi21
-RemovedClass: androidx.media.AudioAttributesImplApi26:
-    Removed class androidx.media.AudioAttributesImplApi26
-RemovedClass: androidx.media.AudioAttributesImplBase:
-    Removed class androidx.media.AudioAttributesImplBase
-RemovedClass: androidx.media.AudioFocusRequestCompat.FocusGainType:
-    Removed class androidx.media.AudioFocusRequestCompat.FocusGainType
-RemovedClass: androidx.media.MediaBrowserCompatUtils:
-    Removed class androidx.media.MediaBrowserCompatUtils
-
-
-RemovedField: android.support.v4.media.MediaDescriptionCompat#DESCRIPTION_KEY_MEDIA_URI:
-    Removed field android.support.v4.media.MediaDescriptionCompat.DESCRIPTION_KEY_MEDIA_URI
-RemovedField: android.support.v4.media.MediaDescriptionCompat#DESCRIPTION_KEY_NULL_BUNDLE_FLAG:
-    Removed field android.support.v4.media.MediaDescriptionCompat.DESCRIPTION_KEY_NULL_BUNDLE_FLAG
-RemovedField: android.support.v4.media.session.MediaSessionCompat#KEY_SESSION2_TOKEN:
-    Removed field android.support.v4.media.session.MediaSessionCompat.KEY_SESSION2_TOKEN
-RemovedField: android.support.v4.media.session.MediaSessionCompat#KEY_TOKEN:
-    Removed field android.support.v4.media.session.MediaSessionCompat.KEY_TOKEN
-RemovedField: androidx.media.AudioAttributesCompat#mImpl:
-    Removed field androidx.media.AudioAttributesCompat.mImpl
-
-
-RemovedMethod: android.support.v4.media.MediaMetadataCompat.Builder#Builder(android.support.v4.media.MediaMetadataCompat, int):
-    Removed constructor android.support.v4.media.MediaMetadataCompat.Builder(android.support.v4.media.MediaMetadataCompat,int)
-RemovedMethod: android.support.v4.media.session.MediaControllerCompat#getSession2Token():
-    Removed method android.support.v4.media.session.MediaControllerCompat.getSession2Token()
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat#ensureClassLoader(android.os.Bundle):
-    Removed method android.support.v4.media.session.MediaSessionCompat.ensureClassLoader(android.os.Bundle)
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat#getCallingPackage():
-    Removed method android.support.v4.media.session.MediaSessionCompat.getCallingPackage()
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat.Token#fromToken(Object, android.support.v4.media.session.IMediaSession):
-    Removed method android.support.v4.media.session.MediaSessionCompat.Token.fromToken(Object,android.support.v4.media.session.IMediaSession)
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat.Token#getExtraBinder():
-    Removed method android.support.v4.media.session.MediaSessionCompat.Token.getExtraBinder()
-RemovedMethod: android.support.v4.media.session.MediaSessionCompat.Token#setExtraBinder(android.support.v4.media.session.IMediaSession):
-    Removed method android.support.v4.media.session.MediaSessionCompat.Token.setExtraBinder(android.support.v4.media.session.IMediaSession)
-RemovedMethod: androidx.media.AudioAttributesCompat#setForceLegacyBehavior(boolean):
-    Removed method androidx.media.AudioAttributesCompat.setForceLegacyBehavior(boolean)
-RemovedMethod: androidx.media.MediaBrowserServiceCompat#onSubscribe(String, android.os.Bundle):
-    Removed method androidx.media.MediaBrowserServiceCompat.onSubscribe(String,android.os.Bundle)
-RemovedMethod: androidx.media.MediaBrowserServiceCompat#onUnsubscribe(String):
-    Removed method androidx.media.MediaBrowserServiceCompat.onUnsubscribe(String)
-RemovedMethod: androidx.media.MediaSessionManager.RemoteUserInfo#RemoteUserInfo(android.media.session.MediaSessionManager.RemoteUserInfo):
-    Removed constructor androidx.media.MediaSessionManager.RemoteUserInfo(android.media.session.MediaSessionManager.RemoteUserInfo)
diff --git a/media/media/api/restricted_1.2.0-alpha03.ignore b/media/media/api/restricted_current.ignore
similarity index 100%
rename from media/media/api/restricted_1.2.0-alpha03.ignore
rename to media/media/api/restricted_current.ignore
diff --git a/media2/common/api/1.1.0-alpha02.ignore b/media2/common/api/1.1.0-alpha02.ignore
deleted file mode 100644
index 0d02ad9..0000000
--- a/media2/common/api/1.1.0-alpha02.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-// See tools/metalava/API-LINT.md for how to update this file.
-
-RemovedInterface: androidx.media2.common.SessionPlayer:
-    Class androidx.media2.common.SessionPlayer no longer implements java.lang.AutoCloseable
diff --git a/media2/common/api/1.1.0-alpha01.ignore b/media2/common/api/current.ignore
similarity index 100%
rename from media2/common/api/1.1.0-alpha01.ignore
rename to media2/common/api/current.ignore
diff --git a/media2/common/api/restricted_1.1.0-alpha02.ignore b/media2/common/api/restricted_1.1.0-alpha02.ignore
deleted file mode 100644
index 4917bb6..0000000
--- a/media2/common/api/restricted_1.1.0-alpha02.ignore
+++ /dev/null
@@ -1,45 +0,0 @@
-// Baseline format: 1.0
-// See tools/metalava/API-LINT.md for how to update this file.
-
-RemovedClass: androidx.media2.common.MediaMetadata.BitmapKey:
-    Removed class androidx.media2.common.MediaMetadata.BitmapKey
-RemovedClass: androidx.media2.common.MediaMetadata.BundleKey:
-    Removed class androidx.media2.common.MediaMetadata.BundleKey
-RemovedClass: androidx.media2.common.MediaMetadata.FloatKey:
-    Removed class androidx.media2.common.MediaMetadata.FloatKey
-RemovedClass: androidx.media2.common.MediaMetadata.LongKey:
-    Removed class androidx.media2.common.MediaMetadata.LongKey
-RemovedClass: androidx.media2.common.MediaMetadata.RatingKey:
-    Removed class androidx.media2.common.MediaMetadata.RatingKey
-RemovedClass: androidx.media2.common.MediaMetadata.TextKey:
-    Removed class androidx.media2.common.MediaMetadata.TextKey
-RemovedClass: androidx.media2.common.ParcelImplListSlice:
-    Removed class androidx.media2.common.ParcelImplListSlice
-RemovedClass: androidx.media2.common.SessionPlayer.BuffState:
-    Removed class androidx.media2.common.SessionPlayer.BuffState
-RemovedClass: androidx.media2.common.SessionPlayer.PlayerResult.ResultCode:
-    Removed class androidx.media2.common.SessionPlayer.PlayerResult.ResultCode
-RemovedClass: androidx.media2.common.SessionPlayer.PlayerState:
-    Removed class androidx.media2.common.SessionPlayer.PlayerState
-RemovedClass: androidx.media2.common.SessionPlayer.RepeatMode:
-    Removed class androidx.media2.common.SessionPlayer.RepeatMode
-RemovedClass: androidx.media2.common.SessionPlayer.ShuffleMode:
-    Removed class androidx.media2.common.SessionPlayer.ShuffleMode
-
-
-RemovedField: androidx.media2.common.MediaMetadata#METADATA_KEY_RADIO_FREQUENCY:
-    Removed field androidx.media2.common.MediaMetadata.METADATA_KEY_RADIO_FREQUENCY
-RemovedField: androidx.media2.common.MediaMetadata#METADATA_KEY_RADIO_PROGRAM_NAME:
-    Removed field androidx.media2.common.MediaMetadata.METADATA_KEY_RADIO_PROGRAM_NAME
-
-
-RemovedInterface: androidx.media2.common.SessionPlayer:
-    Class androidx.media2.common.SessionPlayer no longer implements java.lang.AutoCloseable
-
-
-RemovedMethod: androidx.media2.common.FileMediaItem#decreaseRefCount():
-    Removed method androidx.media2.common.FileMediaItem.decreaseRefCount()
-RemovedMethod: androidx.media2.common.FileMediaItem#increaseRefCount():
-    Removed method androidx.media2.common.FileMediaItem.increaseRefCount()
-RemovedMethod: androidx.media2.common.MediaMetadata#getObject(String):
-    Removed method androidx.media2.common.MediaMetadata.getObject(String)
diff --git a/media2/common/api/restricted_1.1.0-alpha01.ignore b/media2/common/api/restricted_current.ignore
similarity index 100%
rename from media2/common/api/restricted_1.1.0-alpha01.ignore
rename to media2/common/api/restricted_current.ignore
diff --git a/media2/player/api/1.1.0-alpha02.ignore b/media2/player/api/1.1.0-alpha02.ignore
deleted file mode 100644
index 35657c4..0000000
--- a/media2/player/api/1.1.0-alpha02.ignore
+++ /dev/null
@@ -1,29 +0,0 @@
-// Baseline format: 1.0
-// See tools/metalava/API-LINT.md for how to update this file.
-
-RemovedField: androidx.media2.player.MediaPlayer.TrackInfo#MEDIA_TRACK_TYPE_AUDIO:
-    Removed field androidx.media2.player.MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_AUDIO
-RemovedField: androidx.media2.player.MediaPlayer.TrackInfo#MEDIA_TRACK_TYPE_METADATA:
-    Removed field androidx.media2.player.MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_METADATA
-RemovedField: androidx.media2.player.MediaPlayer.TrackInfo#MEDIA_TRACK_TYPE_SUBTITLE:
-    Removed field androidx.media2.player.MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_SUBTITLE
-RemovedField: androidx.media2.player.MediaPlayer.TrackInfo#MEDIA_TRACK_TYPE_UNKNOWN:
-    Removed field androidx.media2.player.MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_UNKNOWN
-RemovedField: androidx.media2.player.MediaPlayer.TrackInfo#MEDIA_TRACK_TYPE_VIDEO:
-    Removed field androidx.media2.player.MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_VIDEO
-
-
-RemovedMethod: androidx.media2.player.MediaPlayer#close():
-    Removed method androidx.media2.player.MediaPlayer.close()
-RemovedMethod: androidx.media2.player.MediaPlayer#setSurface(android.view.Surface):
-    Removed method androidx.media2.player.MediaPlayer.setSurface(android.view.Surface)
-RemovedMethod: androidx.media2.player.MediaPlayer.TrackInfo#getFormat():
-    Removed method androidx.media2.player.MediaPlayer.TrackInfo.getFormat()
-RemovedMethod: androidx.media2.player.MediaPlayer.TrackInfo#getLanguage():
-    Removed method androidx.media2.player.MediaPlayer.TrackInfo.getLanguage()
-RemovedMethod: androidx.media2.player.MediaPlayer.TrackInfo#getTrackType():
-    Removed method androidx.media2.player.MediaPlayer.TrackInfo.getTrackType()
-RemovedMethod: androidx.media2.player.VideoSize#getHeight():
-    Removed method androidx.media2.player.VideoSize.getHeight()
-RemovedMethod: androidx.media2.player.VideoSize#getWidth():
-    Removed method androidx.media2.player.VideoSize.getWidth()
diff --git a/media2/player/api/1.1.0-alpha01.ignore b/media2/player/api/current.ignore
similarity index 100%
rename from media2/player/api/1.1.0-alpha01.ignore
rename to media2/player/api/current.ignore
diff --git a/media2/player/api/restricted_1.1.0-alpha02.ignore b/media2/player/api/restricted_1.1.0-alpha02.ignore
deleted file mode 100644
index 3075958..0000000
--- a/media2/player/api/restricted_1.1.0-alpha02.ignore
+++ /dev/null
@@ -1,123 +0,0 @@
-// Baseline format: 1.0
-// See tools/metalava/API-LINT.md for how to update this file.
-
-RemovedClass: androidx.media2.player.MediaPlayer.DrmInfo:
-    Removed class androidx.media2.player.MediaPlayer.DrmInfo
-RemovedClass: androidx.media2.player.MediaPlayer.DrmResult:
-    Removed class androidx.media2.player.MediaPlayer.DrmResult
-RemovedClass: androidx.media2.player.MediaPlayer.MediaError:
-    Removed class androidx.media2.player.MediaPlayer.MediaError
-RemovedClass: androidx.media2.player.MediaPlayer.MediaInfo:
-    Removed class androidx.media2.player.MediaPlayer.MediaInfo
-RemovedClass: androidx.media2.player.MediaPlayer.MetricsConstants:
-    Removed class androidx.media2.player.MediaPlayer.MetricsConstants
-RemovedClass: androidx.media2.player.MediaPlayer.NoDrmSchemeException:
-    Removed class androidx.media2.player.MediaPlayer.NoDrmSchemeException
-RemovedClass: androidx.media2.player.MediaPlayer.SeekMode:
-    Removed class androidx.media2.player.MediaPlayer.SeekMode
-RemovedClass: androidx.media2.player.MediaPlayer.TrackInfo.MediaTrackType:
-    Removed class androidx.media2.player.MediaPlayer.TrackInfo.MediaTrackType
-RemovedClass: androidx.media2.player.MediaPlayer2:
-    Removed class androidx.media2.player.MediaPlayer2
-RemovedClass: androidx.media2.player.MediaPlayer2Impl:
-    Removed class androidx.media2.player.MediaPlayer2Impl
-RemovedClass: androidx.media2.player.PlaybackParams.AudioFallbackMode:
-    Removed class androidx.media2.player.PlaybackParams.AudioFallbackMode
-
-
-RemovedField: androidx.media2.player.MediaPlayer#MEDIA_INFO_BUFFERING_END:
-    Removed field androidx.media2.player.MediaPlayer.MEDIA_INFO_BUFFERING_END
-RemovedField: androidx.media2.player.MediaPlayer#MEDIA_INFO_BUFFERING_START:
-    Removed field androidx.media2.player.MediaPlayer.MEDIA_INFO_BUFFERING_START
-RemovedField: androidx.media2.player.MediaPlayer#MEDIA_INFO_EXTERNAL_METADATA_UPDATE:
-    Removed field androidx.media2.player.MediaPlayer.MEDIA_INFO_EXTERNAL_METADATA_UPDATE
-RemovedField: androidx.media2.player.MediaPlayer#MEDIA_INFO_MEDIA_ITEM_END:
-    Removed field androidx.media2.player.MediaPlayer.MEDIA_INFO_MEDIA_ITEM_END
-RemovedField: androidx.media2.player.MediaPlayer#MEDIA_INFO_MEDIA_ITEM_LIST_END:
-    Removed field androidx.media2.player.MediaPlayer.MEDIA_INFO_MEDIA_ITEM_LIST_END
-RemovedField: androidx.media2.player.MediaPlayer#MEDIA_INFO_MEDIA_ITEM_REPEAT:
-    Removed field androidx.media2.player.MediaPlayer.MEDIA_INFO_MEDIA_ITEM_REPEAT
-RemovedField: androidx.media2.player.MediaPlayer#MEDIA_INFO_MEDIA_ITEM_START:
-    Removed field androidx.media2.player.MediaPlayer.MEDIA_INFO_MEDIA_ITEM_START
-RemovedField: androidx.media2.player.MediaPlayer#MEDIA_INFO_NETWORK_BANDWIDTH:
-    Removed field androidx.media2.player.MediaPlayer.MEDIA_INFO_NETWORK_BANDWIDTH
-RemovedField: androidx.media2.player.MediaPlayer#MEDIA_INFO_PREPARED:
-    Removed field androidx.media2.player.MediaPlayer.MEDIA_INFO_PREPARED
-RemovedField: androidx.media2.player.MediaPlayer#MEDIA_INFO_SUBTITLE_TIMED_OUT:
-    Removed field androidx.media2.player.MediaPlayer.MEDIA_INFO_SUBTITLE_TIMED_OUT
-RemovedField: androidx.media2.player.MediaPlayer#MEDIA_INFO_UNSUPPORTED_SUBTITLE:
-    Removed field androidx.media2.player.MediaPlayer.MEDIA_INFO_UNSUPPORTED_SUBTITLE
-RemovedField: androidx.media2.player.MediaPlayer.TrackInfo#MEDIA_TRACK_TYPE_AUDIO:
-    Removed field androidx.media2.player.MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_AUDIO
-RemovedField: androidx.media2.player.MediaPlayer.TrackInfo#MEDIA_TRACK_TYPE_METADATA:
-    Removed field androidx.media2.player.MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_METADATA
-RemovedField: androidx.media2.player.MediaPlayer.TrackInfo#MEDIA_TRACK_TYPE_SUBTITLE:
-    Removed field androidx.media2.player.MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_SUBTITLE
-RemovedField: androidx.media2.player.MediaPlayer.TrackInfo#MEDIA_TRACK_TYPE_UNKNOWN:
-    Removed field androidx.media2.player.MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_UNKNOWN
-RemovedField: androidx.media2.player.MediaPlayer.TrackInfo#MEDIA_TRACK_TYPE_VIDEO:
-    Removed field androidx.media2.player.MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_VIDEO
-
-
-RemovedInterface: androidx.media2.player.MediaPlayer.OnDrmConfigHelper:
-    Removed class androidx.media2.player.MediaPlayer.OnDrmConfigHelper
-
-
-RemovedMethod: androidx.media2.player.MediaPlayer#close():
-    Removed method androidx.media2.player.MediaPlayer.close()
-RemovedMethod: androidx.media2.player.MediaPlayer#deselectTrack(androidx.media2.player.MediaPlayer.TrackInfo):
-    Removed method androidx.media2.player.MediaPlayer.deselectTrack(androidx.media2.player.MediaPlayer.TrackInfo)
-RemovedMethod: androidx.media2.player.MediaPlayer#getDrmInfo():
-    Removed method androidx.media2.player.MediaPlayer.getDrmInfo()
-RemovedMethod: androidx.media2.player.MediaPlayer#getDrmKeyRequest(byte[], byte[], String, int, java.util.Map<java.lang.String,java.lang.String>):
-    Removed method androidx.media2.player.MediaPlayer.getDrmKeyRequest(byte[],byte[],String,int,java.util.Map<java.lang.String,java.lang.String>)
-RemovedMethod: androidx.media2.player.MediaPlayer#getDrmPropertyString(String):
-    Removed method androidx.media2.player.MediaPlayer.getDrmPropertyString(String)
-RemovedMethod: androidx.media2.player.MediaPlayer#getMetrics():
-    Removed method androidx.media2.player.MediaPlayer.getMetrics()
-RemovedMethod: androidx.media2.player.MediaPlayer#prepareDrm(java.util.UUID):
-    Removed method androidx.media2.player.MediaPlayer.prepareDrm(java.util.UUID)
-RemovedMethod: androidx.media2.player.MediaPlayer#provideDrmKeyResponse(byte[], byte[]):
-    Removed method androidx.media2.player.MediaPlayer.provideDrmKeyResponse(byte[],byte[])
-RemovedMethod: androidx.media2.player.MediaPlayer#releaseDrm():
-    Removed method androidx.media2.player.MediaPlayer.releaseDrm()
-RemovedMethod: androidx.media2.player.MediaPlayer#restoreDrmKeys(byte[]):
-    Removed method androidx.media2.player.MediaPlayer.restoreDrmKeys(byte[])
-RemovedMethod: androidx.media2.player.MediaPlayer#setDrmPropertyString(String, String):
-    Removed method androidx.media2.player.MediaPlayer.setDrmPropertyString(String,String)
-RemovedMethod: androidx.media2.player.MediaPlayer#setOnDrmConfigHelper(androidx.media2.player.MediaPlayer.OnDrmConfigHelper):
-    Removed method androidx.media2.player.MediaPlayer.setOnDrmConfigHelper(androidx.media2.player.MediaPlayer.OnDrmConfigHelper)
-RemovedMethod: androidx.media2.player.MediaPlayer#setSurface(android.view.Surface):
-    Removed method androidx.media2.player.MediaPlayer.setSurface(android.view.Surface)
-RemovedMethod: androidx.media2.player.MediaPlayer.PlayerCallback#onDrmInfo(androidx.media2.player.MediaPlayer, androidx.media2.common.MediaItem, androidx.media2.player.MediaPlayer.DrmInfo):
-    Removed method androidx.media2.player.MediaPlayer.PlayerCallback.onDrmInfo(androidx.media2.player.MediaPlayer,androidx.media2.common.MediaItem,androidx.media2.player.MediaPlayer.DrmInfo)
-RemovedMethod: androidx.media2.player.MediaPlayer.TrackInfo#TrackInfo(int, androidx.media2.common.MediaItem, int, android.media.MediaFormat):
-    Removed constructor androidx.media2.player.MediaPlayer.TrackInfo(int,androidx.media2.common.MediaItem,int,android.media.MediaFormat)
-RemovedMethod: androidx.media2.player.MediaPlayer.TrackInfo#getFormat():
-    Removed method androidx.media2.player.MediaPlayer.TrackInfo.getFormat()
-RemovedMethod: androidx.media2.player.MediaPlayer.TrackInfo#getLanguage():
-    Removed method androidx.media2.player.MediaPlayer.TrackInfo.getLanguage()
-RemovedMethod: androidx.media2.player.MediaPlayer.TrackInfo#getTrackType():
-    Removed method androidx.media2.player.MediaPlayer.TrackInfo.getTrackType()
-RemovedMethod: androidx.media2.player.MediaTimestamp#MediaTimestamp(long, long, float):
-    Removed constructor androidx.media2.player.MediaTimestamp(long,long,float)
-RemovedMethod: androidx.media2.player.PlaybackParams#getPlaybackParams():
-    Removed method androidx.media2.player.PlaybackParams.getPlaybackParams()
-RemovedMethod: androidx.media2.player.PlaybackParams.Builder#Builder(android.media.PlaybackParams):
-    Removed constructor androidx.media2.player.PlaybackParams.Builder(android.media.PlaybackParams)
-RemovedMethod: androidx.media2.player.TimedMetaData#TimedMetaData(android.media.TimedMetaData):
-    Removed constructor androidx.media2.player.TimedMetaData(android.media.TimedMetaData)
-RemovedMethod: androidx.media2.player.TimedMetaData#TimedMetaData(long, byte[]):
-    Removed constructor androidx.media2.player.TimedMetaData(long,byte[])
-RemovedMethod: androidx.media2.player.VideoSize#getHeight():
-    Removed method androidx.media2.player.VideoSize.getHeight()
-RemovedMethod: androidx.media2.player.VideoSize#getWidth():
-    Removed method androidx.media2.player.VideoSize.getWidth()
-
-
-RemovedPackage: androidx.media2.player.common:
-    Removed package androidx.media2.player.common
-RemovedPackage: androidx.media2.player.exoplayer:
-    Removed package androidx.media2.player.exoplayer
-RemovedPackage: androidx.media2.player.subtitle:
-    Removed package androidx.media2.player.subtitle
diff --git a/media2/player/api/restricted_1.1.0-alpha01.ignore b/media2/player/api/restricted_current.ignore
similarity index 100%
rename from media2/player/api/restricted_1.1.0-alpha01.ignore
rename to media2/player/api/restricted_current.ignore
diff --git a/media2/session/api/1.1.0-alpha02.ignore b/media2/session/api/1.1.0-alpha02.ignore
deleted file mode 100644
index 77b75ca..0000000
--- a/media2/session/api/1.1.0-alpha02.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-// See tools/metalava/API-LINT.md for how to update this file.
-
-RemovedInterface: androidx.media2.session.MediaController:
-    Class androidx.media2.session.MediaController no longer implements java.lang.AutoCloseable
-RemovedInterface: androidx.media2.session.MediaSession:
-    Class androidx.media2.session.MediaSession no longer implements java.lang.AutoCloseable
diff --git a/media2/session/api/1.1.0-alpha01.ignore b/media2/session/api/current.ignore
similarity index 100%
rename from media2/session/api/1.1.0-alpha01.ignore
rename to media2/session/api/current.ignore
diff --git a/media2/session/api/restricted_1.1.0-alpha02.ignore b/media2/session/api/restricted_1.1.0-alpha02.ignore
deleted file mode 100644
index 3ce2007..0000000
--- a/media2/session/api/restricted_1.1.0-alpha02.ignore
+++ /dev/null
@@ -1,89 +0,0 @@
-// Baseline format: 1.0
-// See tools/metalava/API-LINT.md for how to update this file.
-
-RemovedClass: androidx.media2.session.LibraryResult.ResultCode:
-    Removed class androidx.media2.session.LibraryResult.ResultCode
-RemovedClass: androidx.media2.session.MediaController.VolumeDirection:
-    Removed class androidx.media2.session.MediaController.VolumeDirection
-RemovedClass: androidx.media2.session.MediaController.VolumeFlags:
-    Removed class androidx.media2.session.MediaController.VolumeFlags
-RemovedClass: androidx.media2.session.RemoteSessionPlayer.VolumeControlType:
-    Removed class androidx.media2.session.RemoteSessionPlayer.VolumeControlType
-RemovedClass: androidx.media2.session.SessionCommand.CommandCode:
-    Removed class androidx.media2.session.SessionCommand.CommandCode
-RemovedClass: androidx.media2.session.SessionCommand.CommandVersion:
-    Removed class androidx.media2.session.SessionCommand.CommandVersion
-RemovedClass: androidx.media2.session.SessionResult.ResultCode:
-    Removed class androidx.media2.session.SessionResult.ResultCode
-RemovedClass: androidx.media2.session.SessionToken.TokenType:
-    Removed class androidx.media2.session.SessionToken.TokenType
-
-
-RemovedField: androidx.media2.session.SessionCommand#COMMAND_CODE_SESSION_PLAY_FROM_MEDIA_ID:
-    Removed field androidx.media2.session.SessionCommand.COMMAND_CODE_SESSION_PLAY_FROM_MEDIA_ID
-RemovedField: androidx.media2.session.SessionCommand#COMMAND_CODE_SESSION_PLAY_FROM_SEARCH:
-    Removed field androidx.media2.session.SessionCommand.COMMAND_CODE_SESSION_PLAY_FROM_SEARCH
-RemovedField: androidx.media2.session.SessionCommand#COMMAND_CODE_SESSION_PLAY_FROM_URI:
-    Removed field androidx.media2.session.SessionCommand.COMMAND_CODE_SESSION_PLAY_FROM_URI
-RemovedField: androidx.media2.session.SessionCommand#COMMAND_CODE_SESSION_PREPARE_FROM_MEDIA_ID:
-    Removed field androidx.media2.session.SessionCommand.COMMAND_CODE_SESSION_PREPARE_FROM_MEDIA_ID
-RemovedField: androidx.media2.session.SessionCommand#COMMAND_CODE_SESSION_PREPARE_FROM_SEARCH:
-    Removed field androidx.media2.session.SessionCommand.COMMAND_CODE_SESSION_PREPARE_FROM_SEARCH
-RemovedField: androidx.media2.session.SessionCommand#COMMAND_CODE_SESSION_PREPARE_FROM_URI:
-    Removed field androidx.media2.session.SessionCommand.COMMAND_CODE_SESSION_PREPARE_FROM_URI
-RemovedField: androidx.media2.session.SessionCommand#COMMAND_VERSION_CURRENT:
-    Removed field androidx.media2.session.SessionCommand.COMMAND_VERSION_CURRENT
-
-
-RemovedInterface: androidx.media2.session.MediaController:
-    Class androidx.media2.session.MediaController no longer implements java.lang.AutoCloseable
-RemovedInterface: androidx.media2.session.MediaSession:
-    Class androidx.media2.session.MediaSession no longer implements java.lang.AutoCloseable
-RemovedInterface: androidx.media2.session.SessionResult:
-    Class androidx.media2.session.SessionResult no longer implements androidx.versionedparcelable.VersionedParcelable
-RemovedInterface: androidx.media2.session.SessionToken.OnSessionTokenCreatedListener:
-    Removed class androidx.media2.session.SessionToken.OnSessionTokenCreatedListener
-
-
-RemovedMethod: androidx.media2.session.MediaController#playFromMediaId(String, android.os.Bundle):
-    Removed method androidx.media2.session.MediaController.playFromMediaId(String,android.os.Bundle)
-RemovedMethod: androidx.media2.session.MediaController#playFromSearch(String, android.os.Bundle):
-    Removed method androidx.media2.session.MediaController.playFromSearch(String,android.os.Bundle)
-RemovedMethod: androidx.media2.session.MediaController#playFromUri(android.net.Uri, android.os.Bundle):
-    Removed method androidx.media2.session.MediaController.playFromUri(android.net.Uri,android.os.Bundle)
-RemovedMethod: androidx.media2.session.MediaController#prepareFromMediaId(String, android.os.Bundle):
-    Removed method androidx.media2.session.MediaController.prepareFromMediaId(String,android.os.Bundle)
-RemovedMethod: androidx.media2.session.MediaController#prepareFromSearch(String, android.os.Bundle):
-    Removed method androidx.media2.session.MediaController.prepareFromSearch(String,android.os.Bundle)
-RemovedMethod: androidx.media2.session.MediaController#prepareFromUri(android.net.Uri, android.os.Bundle):
-    Removed method androidx.media2.session.MediaController.prepareFromUri(android.net.Uri,android.os.Bundle)
-RemovedMethod: androidx.media2.session.MediaController#setTimeDiff(Long):
-    Removed method androidx.media2.session.MediaController.setTimeDiff(Long)
-RemovedMethod: androidx.media2.session.MediaSession#getSessionCompat():
-    Removed method androidx.media2.session.MediaSession.getSessionCompat()
-RemovedMethod: androidx.media2.session.MediaSession#isClosed():
-    Removed method androidx.media2.session.MediaSession.isClosed()
-RemovedMethod: androidx.media2.session.MediaSession.ControllerInfo#getRemoteUserInfo():
-    Removed method androidx.media2.session.MediaSession.ControllerInfo.getRemoteUserInfo()
-RemovedMethod: androidx.media2.session.MediaSession.ControllerInfo#isTrusted():
-    Removed method androidx.media2.session.MediaSession.ControllerInfo.isTrusted()
-RemovedMethod: androidx.media2.session.MediaSession.SessionCallback#onPlayFromMediaId(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo, String, android.os.Bundle):
-    Removed method androidx.media2.session.MediaSession.SessionCallback.onPlayFromMediaId(androidx.media2.session.MediaSession,androidx.media2.session.MediaSession.ControllerInfo,String,android.os.Bundle)
-RemovedMethod: androidx.media2.session.MediaSession.SessionCallback#onPlayFromSearch(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo, String, android.os.Bundle):
-    Removed method androidx.media2.session.MediaSession.SessionCallback.onPlayFromSearch(androidx.media2.session.MediaSession,androidx.media2.session.MediaSession.ControllerInfo,String,android.os.Bundle)
-RemovedMethod: androidx.media2.session.MediaSession.SessionCallback#onPlayFromUri(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo, android.net.Uri, android.os.Bundle):
-    Removed method androidx.media2.session.MediaSession.SessionCallback.onPlayFromUri(androidx.media2.session.MediaSession,androidx.media2.session.MediaSession.ControllerInfo,android.net.Uri,android.os.Bundle)
-RemovedMethod: androidx.media2.session.MediaSession.SessionCallback#onPrepareFromMediaId(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo, String, android.os.Bundle):
-    Removed method androidx.media2.session.MediaSession.SessionCallback.onPrepareFromMediaId(androidx.media2.session.MediaSession,androidx.media2.session.MediaSession.ControllerInfo,String,android.os.Bundle)
-RemovedMethod: androidx.media2.session.MediaSession.SessionCallback#onPrepareFromSearch(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo, String, android.os.Bundle):
-    Removed method androidx.media2.session.MediaSession.SessionCallback.onPrepareFromSearch(androidx.media2.session.MediaSession,androidx.media2.session.MediaSession.ControllerInfo,String,android.os.Bundle)
-RemovedMethod: androidx.media2.session.MediaSession.SessionCallback#onPrepareFromUri(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo, android.net.Uri, android.os.Bundle):
-    Removed method androidx.media2.session.MediaSession.SessionCallback.onPrepareFromUri(androidx.media2.session.MediaSession,androidx.media2.session.MediaSession.ControllerInfo,android.net.Uri,android.os.Bundle)
-RemovedMethod: androidx.media2.session.SessionToken#createSessionToken(android.content.Context, android.support.v4.media.session.MediaSessionCompat.Token, java.util.concurrent.Executor, androidx.media2.session.SessionToken.OnSessionTokenCreatedListener):
-    Removed method androidx.media2.session.SessionToken.createSessionToken(android.content.Context,android.support.v4.media.session.MediaSessionCompat.Token,java.util.concurrent.Executor,androidx.media2.session.SessionToken.OnSessionTokenCreatedListener)
-RemovedMethod: androidx.media2.session.SessionToken#getBinder():
-    Removed method androidx.media2.session.SessionToken.getBinder()
-RemovedMethod: androidx.media2.session.SessionToken#getComponentName():
-    Removed method androidx.media2.session.SessionToken.getComponentName()
-RemovedMethod: androidx.media2.session.SessionToken#isLegacySession():
-    Removed method androidx.media2.session.SessionToken.isLegacySession()
diff --git a/media2/session/api/restricted_1.1.0-alpha01.ignore b/media2/session/api/restricted_current.ignore
similarity index 100%
rename from media2/session/api/restricted_1.1.0-alpha01.ignore
rename to media2/session/api/restricted_current.ignore
diff --git a/mediarouter/mediarouter/api/restricted_1.2.0-alpha02.ignore b/mediarouter/mediarouter/api/restricted_1.2.0-alpha02.ignore
deleted file mode 100644
index 6871cc5..0000000
--- a/mediarouter/mediarouter/api/restricted_1.2.0-alpha02.ignore
+++ /dev/null
@@ -1,47 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.mediarouter.media.MediaRouteProvider.DynamicGroupRouteController.DynamicRouteDescriptor.SelectionState:
-    Removed class androidx.mediarouter.media.MediaRouteProvider.DynamicGroupRouteController.DynamicRouteDescriptor.SelectionState
-
-
-RemovedField: androidx.mediarouter.media.MediaRouter.RouteInfo#DEVICE_TYPE_BLUETOOTH:
-    Removed field androidx.mediarouter.media.MediaRouter.RouteInfo.DEVICE_TYPE_BLUETOOTH
-RemovedField: androidx.mediarouter.media.MediaRouter.RouteInfo#DEVICE_TYPE_UNKNOWN:
-    Removed field androidx.mediarouter.media.MediaRouter.RouteInfo.DEVICE_TYPE_UNKNOWN
-RemovedField: androidx.mediarouter.media.MediaRouter.RouteInfo#PRESENTATION_DISPLAY_ID_NONE:
-    Removed field androidx.mediarouter.media.MediaRouter.RouteInfo.PRESENTATION_DISPLAY_ID_NONE
-
-
-RemovedMethod: androidx.mediarouter.app.MediaRouteControllerDialogFragment#getRouteSelector():
-    Removed method androidx.mediarouter.app.MediaRouteControllerDialogFragment.getRouteSelector()
-RemovedMethod: androidx.mediarouter.app.MediaRouteControllerDialogFragment#setRouteSelector(androidx.mediarouter.media.MediaRouteSelector):
-    Removed method androidx.mediarouter.app.MediaRouteControllerDialogFragment.setRouteSelector(androidx.mediarouter.media.MediaRouteSelector)
-RemovedMethod: androidx.mediarouter.media.MediaRouteDescriptor#getGroupMemberIds():
-    Removed method androidx.mediarouter.media.MediaRouteDescriptor.getGroupMemberIds()
-RemovedMethod: androidx.mediarouter.media.MediaRouteDescriptor#getMaxClientVersion():
-    Removed method androidx.mediarouter.media.MediaRouteDescriptor.getMaxClientVersion()
-RemovedMethod: androidx.mediarouter.media.MediaRouteDescriptor#getMinClientVersion():
-    Removed method androidx.mediarouter.media.MediaRouteDescriptor.getMinClientVersion()
-RemovedMethod: androidx.mediarouter.media.MediaRouteDescriptor.Builder#addGroupMemberId(String):
-    Removed method androidx.mediarouter.media.MediaRouteDescriptor.Builder.addGroupMemberId(String)
-RemovedMethod: androidx.mediarouter.media.MediaRouteDescriptor.Builder#addGroupMemberIds(java.util.Collection<java.lang.String>):
-    Removed method androidx.mediarouter.media.MediaRouteDescriptor.Builder.addGroupMemberIds(java.util.Collection<java.lang.String>)
-RemovedMethod: androidx.mediarouter.media.MediaRouteDescriptor.Builder#removeGroupMemberId(String):
-    Removed method androidx.mediarouter.media.MediaRouteDescriptor.Builder.removeGroupMemberId(String)
-RemovedMethod: androidx.mediarouter.media.MediaRouteDescriptor.Builder#setMaxClientVersion(int):
-    Removed method androidx.mediarouter.media.MediaRouteDescriptor.Builder.setMaxClientVersion(int)
-RemovedMethod: androidx.mediarouter.media.MediaRouteDescriptor.Builder#setMinClientVersion(int):
-    Removed method androidx.mediarouter.media.MediaRouteDescriptor.Builder.setMinClientVersion(int)
-RemovedMethod: androidx.mediarouter.media.MediaRouteProvider#onCreateRouteController(String, String):
-    Removed method androidx.mediarouter.media.MediaRouteProvider.onCreateRouteController(String,String)
-RemovedMethod: androidx.mediarouter.media.MediaRouter.RouteInfo#getDynamicGroupController():
-    Removed method androidx.mediarouter.media.MediaRouter.RouteInfo.getDynamicGroupController()
-RemovedMethod: androidx.mediarouter.media.MediaRouter.RouteInfo#getMemberRoutes():
-    Removed method androidx.mediarouter.media.MediaRouter.RouteInfo.getMemberRoutes()
-RemovedMethod: androidx.mediarouter.media.MediaRouter.RouteInfo#getPresentationDisplayId():
-    Removed method androidx.mediarouter.media.MediaRouter.RouteInfo.getPresentationDisplayId()
-RemovedMethod: androidx.mediarouter.media.MediaRouter.RouteInfo#getProviderInstance():
-    Removed method androidx.mediarouter.media.MediaRouter.RouteInfo.getProviderInstance()
-RemovedMethod: androidx.mediarouter.media.MediaRouter.RouteInfo#isDefaultOrBluetooth():
-    Removed method androidx.mediarouter.media.MediaRouter.RouteInfo.isDefaultOrBluetooth()
-RemovedMethod: androidx.mediarouter.media.MediaRouter.RouteInfo#isGroup():
-    Removed method androidx.mediarouter.media.MediaRouter.RouteInfo.isGroup()
diff --git a/mediarouter/mediarouter/api/restricted_1.2.0-alpha01.ignore b/mediarouter/mediarouter/api/restricted_current.ignore
similarity index 100%
rename from mediarouter/mediarouter/api/restricted_1.2.0-alpha01.ignore
rename to mediarouter/mediarouter/api/restricted_current.ignore
diff --git a/navigation/navigation-common/api/2.1.0-alpha06.ignore b/navigation/navigation-common/api/2.1.0-alpha06.ignore
deleted file mode 100644
index 0ed39b9..0000000
--- a/navigation/navigation-common/api/2.1.0-alpha06.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.navigation.NavDestination.ClassType#value():
-    Method androidx.navigation.NavDestination.ClassType.value has changed return type from Class to Class<?>
diff --git a/navigation/navigation-common/api/2.1.0-beta01.ignore b/navigation/navigation-common/api/2.1.0-beta01.ignore
deleted file mode 100644
index 0ed39b9..0000000
--- a/navigation/navigation-common/api/2.1.0-beta01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.navigation.NavDestination.ClassType#value():
-    Method androidx.navigation.NavDestination.ClassType.value has changed return type from Class to Class<?>
diff --git a/navigation/navigation-common/api/restricted_2.1.0-alpha06.ignore b/navigation/navigation-common/api/restricted_2.1.0-alpha06.ignore
deleted file mode 100644
index 0fa0c72..0000000
--- a/navigation/navigation-common/api/restricted_2.1.0-alpha06.ignore
+++ /dev/null
@@ -1,23 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.navigation.Navigator#createDestination():
-    Added method androidx.navigation.Navigator.createDestination()
-AddedAbstractMethod: androidx.navigation.Navigator#navigate(D, android.os.Bundle, androidx.navigation.NavOptions, androidx.navigation.Navigator.Extras):
-    Added method androidx.navigation.Navigator.navigate(D,android.os.Bundle,androidx.navigation.NavOptions,androidx.navigation.Navigator.Extras)
-AddedAbstractMethod: androidx.navigation.Navigator#popBackStack():
-    Added method androidx.navigation.Navigator.popBackStack()
-
-
-RemovedInterface: androidx.navigation.Navigator.OnNavigatorBackPressListener:
-    Removed class androidx.navigation.Navigator.OnNavigatorBackPressListener
-
-
-RemovedMethod: androidx.navigation.Navigator#addOnNavigatorBackPressListener(androidx.navigation.Navigator.OnNavigatorBackPressListener):
-    Removed method androidx.navigation.Navigator.addOnNavigatorBackPressListener(androidx.navigation.Navigator.OnNavigatorBackPressListener)
-RemovedMethod: androidx.navigation.Navigator#dispatchOnNavigatorBackPress():
-    Removed method androidx.navigation.Navigator.dispatchOnNavigatorBackPress()
-RemovedMethod: androidx.navigation.Navigator#onBackPressAdded():
-    Removed method androidx.navigation.Navigator.onBackPressAdded()
-RemovedMethod: androidx.navigation.Navigator#onBackPressRemoved():
-    Removed method androidx.navigation.Navigator.onBackPressRemoved()
-RemovedMethod: androidx.navigation.Navigator#removeOnNavigatorBackPressListener(androidx.navigation.Navigator.OnNavigatorBackPressListener):
-    Removed method androidx.navigation.Navigator.removeOnNavigatorBackPressListener(androidx.navigation.Navigator.OnNavigatorBackPressListener)
diff --git a/navigation/navigation-common/api/restricted_2.1.0-beta01.ignore b/navigation/navigation-common/api/restricted_2.1.0-beta01.ignore
deleted file mode 100644
index 0fa0c72..0000000
--- a/navigation/navigation-common/api/restricted_2.1.0-beta01.ignore
+++ /dev/null
@@ -1,23 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.navigation.Navigator#createDestination():
-    Added method androidx.navigation.Navigator.createDestination()
-AddedAbstractMethod: androidx.navigation.Navigator#navigate(D, android.os.Bundle, androidx.navigation.NavOptions, androidx.navigation.Navigator.Extras):
-    Added method androidx.navigation.Navigator.navigate(D,android.os.Bundle,androidx.navigation.NavOptions,androidx.navigation.Navigator.Extras)
-AddedAbstractMethod: androidx.navigation.Navigator#popBackStack():
-    Added method androidx.navigation.Navigator.popBackStack()
-
-
-RemovedInterface: androidx.navigation.Navigator.OnNavigatorBackPressListener:
-    Removed class androidx.navigation.Navigator.OnNavigatorBackPressListener
-
-
-RemovedMethod: androidx.navigation.Navigator#addOnNavigatorBackPressListener(androidx.navigation.Navigator.OnNavigatorBackPressListener):
-    Removed method androidx.navigation.Navigator.addOnNavigatorBackPressListener(androidx.navigation.Navigator.OnNavigatorBackPressListener)
-RemovedMethod: androidx.navigation.Navigator#dispatchOnNavigatorBackPress():
-    Removed method androidx.navigation.Navigator.dispatchOnNavigatorBackPress()
-RemovedMethod: androidx.navigation.Navigator#onBackPressAdded():
-    Removed method androidx.navigation.Navigator.onBackPressAdded()
-RemovedMethod: androidx.navigation.Navigator#onBackPressRemoved():
-    Removed method androidx.navigation.Navigator.onBackPressRemoved()
-RemovedMethod: androidx.navigation.Navigator#removeOnNavigatorBackPressListener(androidx.navigation.Navigator.OnNavigatorBackPressListener):
-    Removed method androidx.navigation.Navigator.removeOnNavigatorBackPressListener(androidx.navigation.Navigator.OnNavigatorBackPressListener)
diff --git a/navigation/navigation-fragment-ktx/api/2.3.0-beta01.ignore b/navigation/navigation-fragment-ktx/api/2.3.0-beta01.ignore
deleted file mode 100644
index 41c0d71..0000000
--- a/navigation/navigation-fragment-ktx/api/2.3.0-beta01.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.navigation.NavGraphViewModelLazyKt#navGraphViewModels(androidx.fragment.app.Fragment, int, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.navigation.NavGraphViewModelLazyKt.navGraphViewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-
-
-InvalidNullConversion: androidx.navigation.NavGraphViewModelLazyKt#navGraphViewModels(androidx.fragment.app.Fragment, int, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.navigation.NavGraphViewModelLazyKt.navGraphViewModels(androidx.fragment.app.Fragment,int,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
-InvalidNullConversion: androidx.navigation.fragment.FragmentNavArgsLazyKt#navArgs(androidx.fragment.app.Fragment):
-    Attempted to remove @NonNull annotation from method androidx.navigation.fragment.FragmentNavArgsLazyKt.navArgs(androidx.fragment.app.Fragment)
diff --git a/navigation/navigation-fragment-ktx/api/restricted_2.3.0-beta01.ignore b/navigation/navigation-fragment-ktx/api/restricted_2.3.0-beta01.ignore
deleted file mode 100644
index 41c0d71..0000000
--- a/navigation/navigation-fragment-ktx/api/restricted_2.3.0-beta01.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.navigation.NavGraphViewModelLazyKt#navGraphViewModels(androidx.fragment.app.Fragment, int, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Method androidx.navigation.NavGraphViewModelLazyKt.navGraphViewModels has changed return type from kotlin.Lazy<VM> to kotlin.Lazy<? extends VM>
-
-
-InvalidNullConversion: androidx.navigation.NavGraphViewModelLazyKt#navGraphViewModels(androidx.fragment.app.Fragment, int, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>):
-    Attempted to remove @NonNull annotation from method androidx.navigation.NavGraphViewModelLazyKt.navGraphViewModels(androidx.fragment.app.Fragment,int,kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>)
-InvalidNullConversion: androidx.navigation.fragment.FragmentNavArgsLazyKt#navArgs(androidx.fragment.app.Fragment):
-    Attempted to remove @NonNull annotation from method androidx.navigation.fragment.FragmentNavArgsLazyKt.navArgs(androidx.fragment.app.Fragment)
diff --git a/navigation/navigation-runtime-ktx/api/2.3.0-beta01.ignore b/navigation/navigation-runtime-ktx/api/2.3.0-beta01.ignore
deleted file mode 100644
index 1337f0e..0000000
--- a/navigation/navigation-runtime-ktx/api/2.3.0-beta01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.navigation.ActivityNavArgsLazyKt#navArgs(android.app.Activity):
-    Attempted to remove @NonNull annotation from method androidx.navigation.ActivityNavArgsLazyKt.navArgs(android.app.Activity)
diff --git a/navigation/navigation-runtime-ktx/api/restricted_2.3.0-beta01.ignore b/navigation/navigation-runtime-ktx/api/restricted_2.3.0-beta01.ignore
deleted file mode 100644
index 1337f0e..0000000
--- a/navigation/navigation-runtime-ktx/api/restricted_2.3.0-beta01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.navigation.ActivityNavArgsLazyKt#navArgs(android.app.Activity):
-    Attempted to remove @NonNull annotation from method androidx.navigation.ActivityNavArgsLazyKt.navArgs(android.app.Activity)
diff --git a/navigation/navigation-runtime/api/2.1.0-rc01.ignore b/navigation/navigation-runtime/api/2.1.0-rc01.ignore
deleted file mode 100644
index 1ca5fd9..0000000
--- a/navigation/navigation-runtime/api/2.1.0-rc01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedDeprecatedMethod: androidx.navigation.NavController#getViewModelStore(int):
-    Removed deprecated method androidx.navigation.NavController.getViewModelStore(int)
diff --git a/navigation/navigation-runtime/api/2.2.0-alpha02.ignore b/navigation/navigation-runtime/api/2.2.0-alpha02.ignore
deleted file mode 100644
index 1ca5fd9..0000000
--- a/navigation/navigation-runtime/api/2.2.0-alpha02.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedDeprecatedMethod: androidx.navigation.NavController#getViewModelStore(int):
-    Removed deprecated method androidx.navigation.NavController.getViewModelStore(int)
diff --git a/navigation/navigation-runtime/api/restricted_2.1.0-rc01.ignore b/navigation/navigation-runtime/api/restricted_2.1.0-rc01.ignore
deleted file mode 100644
index 1ca5fd9..0000000
--- a/navigation/navigation-runtime/api/restricted_2.1.0-rc01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedDeprecatedMethod: androidx.navigation.NavController#getViewModelStore(int):
-    Removed deprecated method androidx.navigation.NavController.getViewModelStore(int)
diff --git a/navigation/navigation-runtime/api/restricted_2.2.0-alpha02.ignore b/navigation/navigation-runtime/api/restricted_2.2.0-alpha02.ignore
deleted file mode 100644
index 1ca5fd9..0000000
--- a/navigation/navigation-runtime/api/restricted_2.2.0-alpha02.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedDeprecatedMethod: androidx.navigation.NavController#getViewModelStore(int):
-    Removed deprecated method androidx.navigation.NavController.getViewModelStore(int)
diff --git a/navigation/navigation-ui-ktx/api/2.3.0-alpha02.ignore b/navigation/navigation-ui-ktx/api/2.3.0-alpha02.ignore
deleted file mode 100644
index 657afee..0000000
--- a/navigation/navigation-ui-ktx/api/2.3.0-alpha02.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/2.3.0-alpha03.ignore b/navigation/navigation-ui-ktx/api/2.3.0-alpha03.ignore
deleted file mode 100644
index 657afee..0000000
--- a/navigation/navigation-ui-ktx/api/2.3.0-alpha03.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/2.3.0-alpha04.ignore b/navigation/navigation-ui-ktx/api/2.3.0-alpha04.ignore
deleted file mode 100644
index 657afee..0000000
--- a/navigation/navigation-ui-ktx/api/2.3.0-alpha04.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/2.3.0-alpha05.ignore b/navigation/navigation-ui-ktx/api/2.3.0-alpha05.ignore
deleted file mode 100644
index 657afee..0000000
--- a/navigation/navigation-ui-ktx/api/2.3.0-alpha05.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/2.3.0-alpha06.ignore b/navigation/navigation-ui-ktx/api/2.3.0-alpha06.ignore
deleted file mode 100644
index 657afee..0000000
--- a/navigation/navigation-ui-ktx/api/2.3.0-alpha06.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/2.3.0-beta01.ignore b/navigation/navigation-ui-ktx/api/2.3.0-beta01.ignore
deleted file mode 100644
index 657afee..0000000
--- a/navigation/navigation-ui-ktx/api/2.3.0-beta01.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha02.ignore b/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha02.ignore
deleted file mode 100644
index 657afee..0000000
--- a/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha02.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha03.ignore b/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha03.ignore
deleted file mode 100644
index 657afee..0000000
--- a/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha03.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha04.ignore b/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha04.ignore
deleted file mode 100644
index 657afee..0000000
--- a/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha04.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha05.ignore b/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha05.ignore
deleted file mode 100644
index 657afee..0000000
--- a/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha05.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha06.ignore b/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha06.ignore
deleted file mode 100644
index 657afee..0000000
--- a/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha06.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/restricted_2.3.0-beta01.ignore b/navigation/navigation-ui-ktx/api/restricted_2.3.0-beta01.ignore
deleted file mode 100644
index 657afee..0000000
--- a/navigation/navigation-ui-ktx/api/restricted_2.3.0-beta01.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
-    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
-RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/2.3.0-alpha02.ignore b/navigation/navigation-ui/api/2.3.0-alpha02.ignore
deleted file mode 100644
index 9e9e553..0000000
--- a/navigation/navigation-ui/api/2.3.0-alpha02.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/2.3.0-alpha03.ignore b/navigation/navigation-ui/api/2.3.0-alpha03.ignore
deleted file mode 100644
index 9e9e553..0000000
--- a/navigation/navigation-ui/api/2.3.0-alpha03.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/2.3.0-alpha04.ignore b/navigation/navigation-ui/api/2.3.0-alpha04.ignore
deleted file mode 100644
index 9e9e553..0000000
--- a/navigation/navigation-ui/api/2.3.0-alpha04.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/2.3.0-alpha05.ignore b/navigation/navigation-ui/api/2.3.0-alpha05.ignore
deleted file mode 100644
index 9e9e553..0000000
--- a/navigation/navigation-ui/api/2.3.0-alpha05.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/2.3.0-alpha06.ignore b/navigation/navigation-ui/api/2.3.0-alpha06.ignore
deleted file mode 100644
index 9e9e553..0000000
--- a/navigation/navigation-ui/api/2.3.0-alpha06.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/2.3.0-beta01.ignore b/navigation/navigation-ui/api/2.3.0-beta01.ignore
deleted file mode 100644
index 9e9e553..0000000
--- a/navigation/navigation-ui/api/2.3.0-beta01.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/restricted_2.3.0-alpha02.ignore b/navigation/navigation-ui/api/restricted_2.3.0-alpha02.ignore
deleted file mode 100644
index 9e9e553..0000000
--- a/navigation/navigation-ui/api/restricted_2.3.0-alpha02.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/restricted_2.3.0-alpha03.ignore b/navigation/navigation-ui/api/restricted_2.3.0-alpha03.ignore
deleted file mode 100644
index 9e9e553..0000000
--- a/navigation/navigation-ui/api/restricted_2.3.0-alpha03.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/restricted_2.3.0-alpha04.ignore b/navigation/navigation-ui/api/restricted_2.3.0-alpha04.ignore
deleted file mode 100644
index 9e9e553..0000000
--- a/navigation/navigation-ui/api/restricted_2.3.0-alpha04.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/restricted_2.3.0-alpha05.ignore b/navigation/navigation-ui/api/restricted_2.3.0-alpha05.ignore
deleted file mode 100644
index 9e9e553..0000000
--- a/navigation/navigation-ui/api/restricted_2.3.0-alpha05.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/restricted_2.3.0-alpha06.ignore b/navigation/navigation-ui/api/restricted_2.3.0-alpha06.ignore
deleted file mode 100644
index 9e9e553..0000000
--- a/navigation/navigation-ui/api/restricted_2.3.0-alpha06.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/restricted_2.3.0-beta01.ignore b/navigation/navigation-ui/api/restricted_2.3.0-beta01.ignore
deleted file mode 100644
index 9e9e553..0000000
--- a/navigation/navigation-ui/api/restricted_2.3.0-beta01.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
-RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
-    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/preference/preference/api/1.1.0-beta01.ignore b/preference/preference/api/1.1.0-beta01.ignore
deleted file mode 100644
index 9a97707..0000000
--- a/preference/preference/api/1.1.0-beta01.ignore
+++ /dev/null
@@ -1 +0,0 @@
-// Baseline format: 1.0
diff --git a/preference/preference/api/restricted_1.1.0-alpha04.ignore b/preference/preference/api/restricted_1.1.0-alpha04.ignore
deleted file mode 100644
index 9a6d5b8..0000000
--- a/preference/preference/api/restricted_1.1.0-alpha04.ignore
+++ /dev/null
@@ -1,23 +0,0 @@
-// Baseline format: 1.0
-// See tools/metalava/API-LINT.md for how to update this file.
-
-RemovedClass: androidx.preference.internal.AbstractMultiSelectListPreference:
-    Removed class androidx.preference.internal.AbstractMultiSelectListPreference
-
-
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_EDITTEXT_PREFERENCE_STYLE:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_EDITTEXT_PREFERENCE_STYLE
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_LIST_CONTAINER:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_LIST_CONTAINER
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_PREFERENCE_FRAGMENT_STYLE:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_PREFERENCE_FRAGMENT_STYLE
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_SWITCH_WIDGET:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_SWITCH_WIDGET
-
-
-RemovedMethod: androidx.preference.Preference#clearWasDetached():
-    Removed method androidx.preference.Preference.clearWasDetached()
-RemovedMethod: androidx.preference.Preference#wasDetached():
-    Removed method androidx.preference.Preference.wasDetached()
-
-
diff --git a/preference/preference/api/restricted_1.1.0-alpha05.ignore b/preference/preference/api/restricted_1.1.0-alpha05.ignore
deleted file mode 100644
index 37595b8..0000000
--- a/preference/preference/api/restricted_1.1.0-alpha05.ignore
+++ /dev/null
@@ -1,21 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.preference.internal.AbstractMultiSelectListPreference:
-    Removed class androidx.preference.internal.AbstractMultiSelectListPreference
-
-
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_EDITTEXT_PREFERENCE_STYLE:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_EDITTEXT_PREFERENCE_STYLE
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_LIST_CONTAINER:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_LIST_CONTAINER
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_PREFERENCE_FRAGMENT_STYLE:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_PREFERENCE_FRAGMENT_STYLE
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_SWITCH_WIDGET:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_SWITCH_WIDGET
-
-
-RemovedMethod: androidx.preference.Preference#clearWasDetached():
-    Removed method androidx.preference.Preference.clearWasDetached()
-RemovedMethod: androidx.preference.Preference#wasDetached():
-    Removed method androidx.preference.Preference.wasDetached()
-
-
diff --git a/preference/preference/api/restricted_1.1.0-alpha06.ignore b/preference/preference/api/restricted_1.1.0-alpha06.ignore
deleted file mode 100644
index 37595b8..0000000
--- a/preference/preference/api/restricted_1.1.0-alpha06.ignore
+++ /dev/null
@@ -1,21 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.preference.internal.AbstractMultiSelectListPreference:
-    Removed class androidx.preference.internal.AbstractMultiSelectListPreference
-
-
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_EDITTEXT_PREFERENCE_STYLE:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_EDITTEXT_PREFERENCE_STYLE
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_LIST_CONTAINER:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_LIST_CONTAINER
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_PREFERENCE_FRAGMENT_STYLE:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_PREFERENCE_FRAGMENT_STYLE
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_SWITCH_WIDGET:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_SWITCH_WIDGET
-
-
-RemovedMethod: androidx.preference.Preference#clearWasDetached():
-    Removed method androidx.preference.Preference.clearWasDetached()
-RemovedMethod: androidx.preference.Preference#wasDetached():
-    Removed method androidx.preference.Preference.wasDetached()
-
-
diff --git a/preference/preference/api/restricted_1.1.0-beta01.ignore b/preference/preference/api/restricted_1.1.0-beta01.ignore
deleted file mode 100644
index 6583852..0000000
--- a/preference/preference/api/restricted_1.1.0-beta01.ignore
+++ /dev/null
@@ -1,19 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.preference.internal.AbstractMultiSelectListPreference:
-    Removed class androidx.preference.internal.AbstractMultiSelectListPreference
-
-
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_EDITTEXT_PREFERENCE_STYLE:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_EDITTEXT_PREFERENCE_STYLE
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_LIST_CONTAINER:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_LIST_CONTAINER
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_PREFERENCE_FRAGMENT_STYLE:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_PREFERENCE_FRAGMENT_STYLE
-RemovedField: androidx.preference.AndroidResources#ANDROID_R_SWITCH_WIDGET:
-    Removed field androidx.preference.AndroidResources.ANDROID_R_SWITCH_WIDGET
-
-
-RemovedMethod: androidx.preference.Preference#clearWasDetached():
-    Removed method androidx.preference.Preference.clearWasDetached()
-RemovedMethod: androidx.preference.Preference#wasDetached():
-    Removed method androidx.preference.Preference.wasDetached()
diff --git a/preference/preference/api/restricted_1.1.0-rc01.ignore b/preference/preference/api/restricted_1.1.0-rc01.ignore
deleted file mode 100644
index 9546b2a..0000000
--- a/preference/preference/api/restricted_1.1.0-rc01.ignore
+++ /dev/null
@@ -1,21 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.preference.DialogPreference.TargetFragment#findPreference(CharSequence):
-    Added method androidx.preference.DialogPreference.TargetFragment.findPreference(CharSequence)
-AddedAbstractMethod: androidx.preference.PreferenceDialogFragment#onDialogClosed(boolean):
-    Added method androidx.preference.PreferenceDialogFragment.onDialogClosed(boolean)
-AddedAbstractMethod: androidx.preference.PreferenceDialogFragmentCompat#onDialogClosed(boolean):
-    Added method androidx.preference.PreferenceDialogFragmentCompat.onDialogClosed(boolean)
-AddedAbstractMethod: androidx.preference.PreferenceFragment#onCreatePreferences(android.os.Bundle, String):
-    Added method androidx.preference.PreferenceFragment.onCreatePreferences(android.os.Bundle,String)
-AddedAbstractMethod: androidx.preference.PreferenceFragmentCompat#onCreatePreferences(android.os.Bundle, String):
-    Added method androidx.preference.PreferenceFragmentCompat.onCreatePreferences(android.os.Bundle,String)
-AddedAbstractMethod: androidx.preference.PreferenceGroup.PreferencePositionCallback#getPreferenceAdapterPosition(String):
-    Added method androidx.preference.PreferenceGroup.PreferencePositionCallback.getPreferenceAdapterPosition(String)
-AddedAbstractMethod: androidx.preference.PreferenceGroup.PreferencePositionCallback#getPreferenceAdapterPosition(androidx.preference.Preference):
-    Added method androidx.preference.PreferenceGroup.PreferencePositionCallback.getPreferenceAdapterPosition(androidx.preference.Preference)
-AddedAbstractMethod: androidx.preference.PreferenceManager.OnDisplayPreferenceDialogListener#onDisplayPreferenceDialog(androidx.preference.Preference):
-    Added method androidx.preference.PreferenceManager.OnDisplayPreferenceDialogListener.onDisplayPreferenceDialog(androidx.preference.Preference)
-AddedAbstractMethod: androidx.preference.PreferenceManager.OnNavigateToScreenListener#onNavigateToScreen(androidx.preference.PreferenceScreen):
-    Added method androidx.preference.PreferenceManager.OnNavigateToScreenListener.onNavigateToScreen(androidx.preference.PreferenceScreen)
-AddedAbstractMethod: androidx.preference.PreferenceManager.OnPreferenceTreeClickListener#onPreferenceTreeClick(androidx.preference.Preference):
-    Added method androidx.preference.PreferenceManager.OnPreferenceTreeClickListener.onPreferenceTreeClick(androidx.preference.Preference)
diff --git a/recyclerview/recyclerview-selection/api/1.1.0-alpha06.ignore b/recyclerview/recyclerview-selection/api/1.1.0-alpha06.ignore
deleted file mode 100644
index 9a97707..0000000
--- a/recyclerview/recyclerview-selection/api/1.1.0-alpha06.ignore
+++ /dev/null
@@ -1 +0,0 @@
-// Baseline format: 1.0
diff --git a/recyclerview/recyclerview-selection/api/1.1.0-alpha07.ignore b/recyclerview/recyclerview-selection/api/1.1.0-alpha07.ignore
deleted file mode 100644
index 829ad3d..0000000
--- a/recyclerview/recyclerview-selection/api/1.1.0-alpha07.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.recyclerview.selection.BandPredicate.NonDraggableArea#NonDraggableArea(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.selection.ItemDetailsLookup):
-    Removed constructor androidx.recyclerview.selection.BandPredicate.NonDraggableArea(androidx.recyclerview.widget.RecyclerView,androidx.recyclerview.selection.ItemDetailsLookup)
diff --git a/recyclerview/recyclerview-selection/api/1.1.0-beta01.ignore b/recyclerview/recyclerview-selection/api/1.1.0-beta01.ignore
deleted file mode 100644
index 829ad3d..0000000
--- a/recyclerview/recyclerview-selection/api/1.1.0-beta01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.recyclerview.selection.BandPredicate.NonDraggableArea#NonDraggableArea(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.selection.ItemDetailsLookup):
-    Removed constructor androidx.recyclerview.selection.BandPredicate.NonDraggableArea(androidx.recyclerview.widget.RecyclerView,androidx.recyclerview.selection.ItemDetailsLookup)
diff --git a/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha03.ignore b/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha03.ignore
deleted file mode 100644
index d242801..0000000
--- a/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha03.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.recyclerview.selection.EventBridge:
-    Removed class androidx.recyclerview.selection.EventBridge
-
-
diff --git a/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha04.ignore b/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha04.ignore
deleted file mode 100644
index d242801..0000000
--- a/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha04.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.recyclerview.selection.EventBridge:
-    Removed class androidx.recyclerview.selection.EventBridge
-
-
diff --git a/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha05.ignore b/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha05.ignore
deleted file mode 100644
index d242801..0000000
--- a/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha05.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.recyclerview.selection.EventBridge:
-    Removed class androidx.recyclerview.selection.EventBridge
-
-
diff --git a/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha06.ignore b/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha06.ignore
deleted file mode 100644
index 21be473..0000000
--- a/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha06.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.recyclerview.selection.AutoScroller:
-    Removed class androidx.recyclerview.selection.AutoScroller
diff --git a/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha07.ignore b/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha07.ignore
deleted file mode 100644
index a94f59f..0000000
--- a/recyclerview/recyclerview-selection/api/restricted_1.1.0-alpha07.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.recyclerview.selection.AutoScroller:
-    Removed class androidx.recyclerview.selection.AutoScroller
-RemovedClass: androidx.recyclerview.selection.DefaultSelectionTracker:
-    Removed class androidx.recyclerview.selection.DefaultSelectionTracker
-
-
-RemovedMethod: androidx.recyclerview.selection.BandPredicate.NonDraggableArea#NonDraggableArea(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.selection.ItemDetailsLookup):
-    Removed constructor androidx.recyclerview.selection.BandPredicate.NonDraggableArea(androidx.recyclerview.widget.RecyclerView,androidx.recyclerview.selection.ItemDetailsLookup)
diff --git a/recyclerview/recyclerview-selection/api/restricted_1.1.0-beta01.ignore b/recyclerview/recyclerview-selection/api/restricted_1.1.0-beta01.ignore
deleted file mode 100644
index a94f59f..0000000
--- a/recyclerview/recyclerview-selection/api/restricted_1.1.0-beta01.ignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.recyclerview.selection.AutoScroller:
-    Removed class androidx.recyclerview.selection.AutoScroller
-RemovedClass: androidx.recyclerview.selection.DefaultSelectionTracker:
-    Removed class androidx.recyclerview.selection.DefaultSelectionTracker
-
-
-RemovedMethod: androidx.recyclerview.selection.BandPredicate.NonDraggableArea#NonDraggableArea(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.selection.ItemDetailsLookup):
-    Removed constructor androidx.recyclerview.selection.BandPredicate.NonDraggableArea(androidx.recyclerview.widget.RecyclerView,androidx.recyclerview.selection.ItemDetailsLookup)
diff --git a/recyclerview/recyclerview/api/restricted_1.1.0-alpha03.ignore b/recyclerview/recyclerview/api/restricted_1.1.0-alpha03.ignore
deleted file mode 100644
index 7be19d9..0000000
--- a/recyclerview/recyclerview/api/restricted_1.1.0-alpha03.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.recyclerview.widget.AsyncDifferConfig#getMainThreadExecutor():
-    Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.recyclerview.widget.AsyncDifferConfig.getMainThreadExecutor()
-
-
diff --git a/recyclerview/recyclerview/api/restricted_1.1.0-alpha04.ignore b/recyclerview/recyclerview/api/restricted_1.1.0-alpha04.ignore
deleted file mode 100644
index 7be19d9..0000000
--- a/recyclerview/recyclerview/api/restricted_1.1.0-alpha04.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.recyclerview.widget.AsyncDifferConfig#getMainThreadExecutor():
-    Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.recyclerview.widget.AsyncDifferConfig.getMainThreadExecutor()
-
-
diff --git a/recyclerview/recyclerview/api/restricted_1.1.0-alpha05.ignore b/recyclerview/recyclerview/api/restricted_1.1.0-alpha05.ignore
deleted file mode 100644
index 7be19d9..0000000
--- a/recyclerview/recyclerview/api/restricted_1.1.0-alpha05.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.recyclerview.widget.AsyncDifferConfig#getMainThreadExecutor():
-    Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.recyclerview.widget.AsyncDifferConfig.getMainThreadExecutor()
-
-
diff --git a/recyclerview/recyclerview/api/restricted_1.1.0-alpha06.ignore b/recyclerview/recyclerview/api/restricted_1.1.0-alpha06.ignore
deleted file mode 100644
index 7be19d9..0000000
--- a/recyclerview/recyclerview/api/restricted_1.1.0-alpha06.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.recyclerview.widget.AsyncDifferConfig#getMainThreadExecutor():
-    Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.recyclerview.widget.AsyncDifferConfig.getMainThreadExecutor()
-
-
diff --git a/recyclerview/recyclerview/api/restricted_1.1.0-alpha07.ignore b/recyclerview/recyclerview/api/restricted_1.1.0-alpha07.ignore
deleted file mode 100644
index 524bce1..0000000
--- a/recyclerview/recyclerview/api/restricted_1.1.0-alpha07.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.recyclerview.widget.AsyncDifferConfig#getMainThreadExecutor():
-    Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.recyclerview.widget.AsyncDifferConfig.getMainThreadExecutor()
diff --git a/recyclerview/recyclerview/api/restricted_1.1.0-beta01.ignore b/recyclerview/recyclerview/api/restricted_1.1.0-beta01.ignore
deleted file mode 100644
index 524bce1..0000000
--- a/recyclerview/recyclerview/api/restricted_1.1.0-beta01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.recyclerview.widget.AsyncDifferConfig#getMainThreadExecutor():
-    Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.recyclerview.widget.AsyncDifferConfig.getMainThreadExecutor()
diff --git a/room/common/api/2.2.0-alpha01.ignore b/room/common/api/2.2.0-alpha01.ignore
deleted file mode 100644
index 64ce5cf..0000000
--- a/room/common/api/2.2.0-alpha01.ignore
+++ /dev/null
@@ -1,25 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.room.ColumnInfo#defaultValue():
-    Added method androidx.room.ColumnInfo.defaultValue()
-AddedAbstractMethod: androidx.room.Delete#entity():
-    Added method androidx.room.Delete.entity()
-AddedAbstractMethod: androidx.room.Insert#entity():
-    Added method androidx.room.Insert.entity()
-AddedAbstractMethod: androidx.room.Relation#associateBy():
-    Added method androidx.room.Relation.associateBy()
-AddedAbstractMethod: androidx.room.Update#entity():
-    Added method androidx.room.Update.entity()
-
-
-ChangedType: androidx.room.Database#entities():
-    Method androidx.room.Database.entities has changed return type from Class[] to Class<?>[]
-ChangedType: androidx.room.Database#views():
-    Method androidx.room.Database.views has changed return type from Class[] to Class<?>[]
-ChangedType: androidx.room.ForeignKey#entity():
-    Method androidx.room.ForeignKey.entity has changed return type from Class to Class<?>
-ChangedType: androidx.room.Fts4#contentEntity():
-    Method androidx.room.Fts4.contentEntity has changed return type from Class to Class<?>
-ChangedType: androidx.room.RawQuery#observedEntities():
-    Method androidx.room.RawQuery.observedEntities has changed return type from Class[] to Class<?>[]
-ChangedType: androidx.room.Relation#entity():
-    Method androidx.room.Relation.entity has changed return type from Class to Class<?>
diff --git a/room/common/api/2.2.0-alpha02.ignore b/room/common/api/2.2.0-alpha02.ignore
deleted file mode 100644
index 51b51d5..0000000
--- a/room/common/api/2.2.0-alpha02.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.room.Database#entities():
-    Method androidx.room.Database.entities has changed return type from Class[] to Class<?>[]
-ChangedType: androidx.room.Database#views():
-    Method androidx.room.Database.views has changed return type from Class[] to Class<?>[]
-ChangedType: androidx.room.ForeignKey#entity():
-    Method androidx.room.ForeignKey.entity has changed return type from Class to Class<?>
-ChangedType: androidx.room.Fts4#contentEntity():
-    Method androidx.room.Fts4.contentEntity has changed return type from Class to Class<?>
-ChangedType: androidx.room.RawQuery#observedEntities():
-    Method androidx.room.RawQuery.observedEntities has changed return type from Class[] to Class<?>[]
-ChangedType: androidx.room.Relation#entity():
-    Method androidx.room.Relation.entity has changed return type from Class to Class<?>
diff --git a/room/common/api/2.2.0-alpha03.ignore b/room/common/api/2.2.0-alpha03.ignore
deleted file mode 100644
index 51b51d5..0000000
--- a/room/common/api/2.2.0-alpha03.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.room.Database#entities():
-    Method androidx.room.Database.entities has changed return type from Class[] to Class<?>[]
-ChangedType: androidx.room.Database#views():
-    Method androidx.room.Database.views has changed return type from Class[] to Class<?>[]
-ChangedType: androidx.room.ForeignKey#entity():
-    Method androidx.room.ForeignKey.entity has changed return type from Class to Class<?>
-ChangedType: androidx.room.Fts4#contentEntity():
-    Method androidx.room.Fts4.contentEntity has changed return type from Class to Class<?>
-ChangedType: androidx.room.RawQuery#observedEntities():
-    Method androidx.room.RawQuery.observedEntities has changed return type from Class[] to Class<?>[]
-ChangedType: androidx.room.Relation#entity():
-    Method androidx.room.Relation.entity has changed return type from Class to Class<?>
diff --git a/room/common/api/2.2.0-beta01.ignore b/room/common/api/2.2.0-beta01.ignore
deleted file mode 100644
index 51b51d5..0000000
--- a/room/common/api/2.2.0-beta01.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.room.Database#entities():
-    Method androidx.room.Database.entities has changed return type from Class[] to Class<?>[]
-ChangedType: androidx.room.Database#views():
-    Method androidx.room.Database.views has changed return type from Class[] to Class<?>[]
-ChangedType: androidx.room.ForeignKey#entity():
-    Method androidx.room.ForeignKey.entity has changed return type from Class to Class<?>
-ChangedType: androidx.room.Fts4#contentEntity():
-    Method androidx.room.Fts4.contentEntity has changed return type from Class to Class<?>
-ChangedType: androidx.room.RawQuery#observedEntities():
-    Method androidx.room.RawQuery.observedEntities has changed return type from Class[] to Class<?>[]
-ChangedType: androidx.room.Relation#entity():
-    Method androidx.room.Relation.entity has changed return type from Class to Class<?>
diff --git a/room/runtime/api/restricted_2.1.0-alpha05.ignore b/room/runtime/api/restricted_2.1.0-alpha05.ignore
deleted file mode 100644
index 83c78c1..0000000
--- a/room/runtime/api/restricted_2.1.0-alpha05.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.room.DatabaseConfiguration#DatabaseConfiguration(android.content.Context, String, androidx.sqlite.db.SupportSQLiteOpenHelper.Factory, androidx.room.RoomDatabase.MigrationContainer, java.util.List<androidx.room.RoomDatabase.Callback>, boolean, androidx.room.RoomDatabase.JournalMode, java.util.concurrent.Executor, boolean, java.util.Set<java.lang.Integer>):
-    Removed constructor androidx.room.DatabaseConfiguration(android.content.Context,String,androidx.sqlite.db.SupportSQLiteOpenHelper.Factory,androidx.room.RoomDatabase.MigrationContainer,java.util.List<androidx.room.RoomDatabase.Callback>,boolean,androidx.room.RoomDatabase.JournalMode,java.util.concurrent.Executor,boolean,java.util.Set<java.lang.Integer>)
-
-
diff --git a/room/runtime/api/restricted_2.1.0-alpha06.ignore b/room/runtime/api/restricted_2.1.0-alpha06.ignore
deleted file mode 100644
index 83c78c1..0000000
--- a/room/runtime/api/restricted_2.1.0-alpha06.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.room.DatabaseConfiguration#DatabaseConfiguration(android.content.Context, String, androidx.sqlite.db.SupportSQLiteOpenHelper.Factory, androidx.room.RoomDatabase.MigrationContainer, java.util.List<androidx.room.RoomDatabase.Callback>, boolean, androidx.room.RoomDatabase.JournalMode, java.util.concurrent.Executor, boolean, java.util.Set<java.lang.Integer>):
-    Removed constructor androidx.room.DatabaseConfiguration(android.content.Context,String,androidx.sqlite.db.SupportSQLiteOpenHelper.Factory,androidx.room.RoomDatabase.MigrationContainer,java.util.List<androidx.room.RoomDatabase.Callback>,boolean,androidx.room.RoomDatabase.JournalMode,java.util.concurrent.Executor,boolean,java.util.Set<java.lang.Integer>)
-
-
diff --git a/room/runtime/api/restricted_2.2.0-alpha01.ignore b/room/runtime/api/restricted_2.2.0-alpha01.ignore
deleted file mode 100644
index a1d60ff..0000000
--- a/room/runtime/api/restricted_2.2.0-alpha01.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.room.RoomDatabase#clearAllTables():
-    Added method androidx.room.RoomDatabase.clearAllTables()
-AddedAbstractMethod: androidx.room.RoomDatabase#createInvalidationTracker():
-    Added method androidx.room.RoomDatabase.createInvalidationTracker()
-AddedAbstractMethod: androidx.room.RoomDatabase#createOpenHelper(androidx.room.DatabaseConfiguration):
-    Added method androidx.room.RoomDatabase.createOpenHelper(androidx.room.DatabaseConfiguration)
diff --git a/room/runtime/api/restricted_2.2.0-alpha02.ignore b/room/runtime/api/restricted_2.2.0-alpha02.ignore
deleted file mode 100644
index 6984c60..0000000
--- a/room/runtime/api/restricted_2.2.0-alpha02.ignore
+++ /dev/null
@@ -1,19 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.room.InvalidationTracker#createLiveData(String[], boolean, java.util.concurrent.Callable<T>):
-    Method androidx.room.InvalidationTracker.createLiveData has changed return type from LiveData<T> to androidx.lifecycle.LiveData<T>
-ChangedType: androidx.room.InvalidationTracker#createLiveData(String[], java.util.concurrent.Callable<T>):
-    Method androidx.room.InvalidationTracker.createLiveData has changed return type from LiveData<T> to androidx.lifecycle.LiveData<T>
-
-
-InvalidNullConversion: androidx.room.InvalidationTracker#createLiveData(String[], boolean, java.util.concurrent.Callable<T>):
-    Attempted to remove @NonNull annotation from method androidx.room.InvalidationTracker.createLiveData(String[],boolean,java.util.concurrent.Callable<T>)
-InvalidNullConversion: androidx.room.InvalidationTracker#createLiveData(String[], java.util.concurrent.Callable<T>):
-    Attempted to remove @NonNull annotation from method androidx.room.InvalidationTracker.createLiveData(String[],java.util.concurrent.Callable<T>)
-
-
-RemovedMethod: androidx.room.paging.LimitOffsetDataSource#isInvalid():
-    Removed method androidx.room.paging.LimitOffsetDataSource.isInvalid()
-RemovedMethod: androidx.room.paging.LimitOffsetDataSource#loadInitial(LoadInitialParams, LoadInitialCallback<T>):
-    Removed method androidx.room.paging.LimitOffsetDataSource.loadInitial(LoadInitialParams,LoadInitialCallback<T>)
-RemovedMethod: androidx.room.paging.LimitOffsetDataSource#loadRange(LoadRangeParams, LoadRangeCallback<T>):
-    Removed method androidx.room.paging.LimitOffsetDataSource.loadRange(LoadRangeParams,LoadRangeCallback<T>)
diff --git a/room/runtime/api/restricted_2.2.0-alpha03.ignore b/room/runtime/api/restricted_2.2.0-alpha03.ignore
deleted file mode 100644
index 6984c60..0000000
--- a/room/runtime/api/restricted_2.2.0-alpha03.ignore
+++ /dev/null
@@ -1,19 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.room.InvalidationTracker#createLiveData(String[], boolean, java.util.concurrent.Callable<T>):
-    Method androidx.room.InvalidationTracker.createLiveData has changed return type from LiveData<T> to androidx.lifecycle.LiveData<T>
-ChangedType: androidx.room.InvalidationTracker#createLiveData(String[], java.util.concurrent.Callable<T>):
-    Method androidx.room.InvalidationTracker.createLiveData has changed return type from LiveData<T> to androidx.lifecycle.LiveData<T>
-
-
-InvalidNullConversion: androidx.room.InvalidationTracker#createLiveData(String[], boolean, java.util.concurrent.Callable<T>):
-    Attempted to remove @NonNull annotation from method androidx.room.InvalidationTracker.createLiveData(String[],boolean,java.util.concurrent.Callable<T>)
-InvalidNullConversion: androidx.room.InvalidationTracker#createLiveData(String[], java.util.concurrent.Callable<T>):
-    Attempted to remove @NonNull annotation from method androidx.room.InvalidationTracker.createLiveData(String[],java.util.concurrent.Callable<T>)
-
-
-RemovedMethod: androidx.room.paging.LimitOffsetDataSource#isInvalid():
-    Removed method androidx.room.paging.LimitOffsetDataSource.isInvalid()
-RemovedMethod: androidx.room.paging.LimitOffsetDataSource#loadInitial(LoadInitialParams, LoadInitialCallback<T>):
-    Removed method androidx.room.paging.LimitOffsetDataSource.loadInitial(LoadInitialParams,LoadInitialCallback<T>)
-RemovedMethod: androidx.room.paging.LimitOffsetDataSource#loadRange(LoadRangeParams, LoadRangeCallback<T>):
-    Removed method androidx.room.paging.LimitOffsetDataSource.loadRange(LoadRangeParams,LoadRangeCallback<T>)
diff --git a/room/runtime/api/restricted_2.2.0-beta01.ignore b/room/runtime/api/restricted_2.2.0-beta01.ignore
deleted file mode 100644
index 6984c60..0000000
--- a/room/runtime/api/restricted_2.2.0-beta01.ignore
+++ /dev/null
@@ -1,19 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.room.InvalidationTracker#createLiveData(String[], boolean, java.util.concurrent.Callable<T>):
-    Method androidx.room.InvalidationTracker.createLiveData has changed return type from LiveData<T> to androidx.lifecycle.LiveData<T>
-ChangedType: androidx.room.InvalidationTracker#createLiveData(String[], java.util.concurrent.Callable<T>):
-    Method androidx.room.InvalidationTracker.createLiveData has changed return type from LiveData<T> to androidx.lifecycle.LiveData<T>
-
-
-InvalidNullConversion: androidx.room.InvalidationTracker#createLiveData(String[], boolean, java.util.concurrent.Callable<T>):
-    Attempted to remove @NonNull annotation from method androidx.room.InvalidationTracker.createLiveData(String[],boolean,java.util.concurrent.Callable<T>)
-InvalidNullConversion: androidx.room.InvalidationTracker#createLiveData(String[], java.util.concurrent.Callable<T>):
-    Attempted to remove @NonNull annotation from method androidx.room.InvalidationTracker.createLiveData(String[],java.util.concurrent.Callable<T>)
-
-
-RemovedMethod: androidx.room.paging.LimitOffsetDataSource#isInvalid():
-    Removed method androidx.room.paging.LimitOffsetDataSource.isInvalid()
-RemovedMethod: androidx.room.paging.LimitOffsetDataSource#loadInitial(LoadInitialParams, LoadInitialCallback<T>):
-    Removed method androidx.room.paging.LimitOffsetDataSource.loadInitial(LoadInitialParams,LoadInitialCallback<T>)
-RemovedMethod: androidx.room.paging.LimitOffsetDataSource#loadRange(LoadRangeParams, LoadRangeCallback<T>):
-    Removed method androidx.room.paging.LimitOffsetDataSource.loadRange(LoadRangeParams,LoadRangeCallback<T>)
diff --git a/room/runtime/api/restricted_2.3.0-alpha02.ignore b/room/runtime/api/restricted_2.3.0-alpha02.ignore
deleted file mode 100644
index 696fe9a..0000000
--- a/room/runtime/api/restricted_2.3.0-alpha02.ignore
+++ /dev/null
@@ -1,53 +0,0 @@
-// Baseline format: 1.0
-AddedFinal: androidx.room.util.FtsTableInfo:
-    Class androidx.room.util.FtsTableInfo added 'final' qualifier
-AddedFinal: androidx.room.util.FtsTableInfo#FtsTableInfo(String, java.util.Set<java.lang.String>, String):
-    Constructor androidx.room.util.FtsTableInfo has added 'final' qualifier
-AddedFinal: androidx.room.util.FtsTableInfo#FtsTableInfo(String, java.util.Set<java.lang.String>, java.util.Set<java.lang.String>):
-    Constructor androidx.room.util.FtsTableInfo has added 'final' qualifier
-AddedFinal: androidx.room.util.TableInfo:
-    Class androidx.room.util.TableInfo added 'final' qualifier
-AddedFinal: androidx.room.util.TableInfo#TableInfo(String, java.util.Map<java.lang.String,androidx.room.util.TableInfo.Column>, java.util.Set<androidx.room.util.TableInfo.ForeignKey>):
-    Constructor androidx.room.util.TableInfo has added 'final' qualifier
-AddedFinal: androidx.room.util.TableInfo#TableInfo(String, java.util.Map<java.lang.String,androidx.room.util.TableInfo.Column>, java.util.Set<androidx.room.util.TableInfo.ForeignKey>, java.util.Set<androidx.room.util.TableInfo.Index>):
-    Constructor androidx.room.util.TableInfo has added 'final' qualifier
-AddedFinal: androidx.room.util.TableInfo.Column:
-    Class androidx.room.util.TableInfo.Column added 'final' qualifier
-AddedFinal: androidx.room.util.TableInfo.Column#Column(String, String, boolean, int):
-    Constructor androidx.room.util.TableInfo.Column has added 'final' qualifier
-AddedFinal: androidx.room.util.TableInfo.Column#Column(String, String, boolean, int, String, int):
-    Constructor androidx.room.util.TableInfo.Column has added 'final' qualifier
-AddedFinal: androidx.room.util.TableInfo.Column#isPrimaryKey():
-    Method androidx.room.util.TableInfo.Column.isPrimaryKey has added 'final' qualifier
-AddedFinal: androidx.room.util.TableInfo.ForeignKey:
-    Class androidx.room.util.TableInfo.ForeignKey added 'final' qualifier
-AddedFinal: androidx.room.util.TableInfo.ForeignKey#ForeignKey(String, String, String, java.util.List<java.lang.String>, java.util.List<java.lang.String>):
-    Constructor androidx.room.util.TableInfo.ForeignKey has added 'final' qualifier
-AddedFinal: androidx.room.util.TableInfo.Index:
-    Class androidx.room.util.TableInfo.Index added 'final' qualifier
-AddedFinal: androidx.room.util.TableInfo.Index#Index(String, boolean, java.util.List<java.lang.String>):
-    Constructor androidx.room.util.TableInfo.Index has added 'final' qualifier
-AddedFinal: androidx.room.util.ViewInfo:
-    Class androidx.room.util.ViewInfo added 'final' qualifier
-AddedFinal: androidx.room.util.ViewInfo#ViewInfo(String, String):
-    Constructor androidx.room.util.ViewInfo has added 'final' qualifier
-
-
-ChangedType: androidx.room.InvalidationTracker#createLiveData(String[], boolean, java.util.concurrent.Callable<T>):
-    Method androidx.room.InvalidationTracker.createLiveData has changed return type from LiveData<T> to androidx.lifecycle.LiveData<T>
-ChangedType: androidx.room.InvalidationTracker#createLiveData(String[], java.util.concurrent.Callable<T>):
-    Method androidx.room.InvalidationTracker.createLiveData has changed return type from LiveData<T> to androidx.lifecycle.LiveData<T>
-
-
-InvalidNullConversion: androidx.room.InvalidationTracker#createLiveData(String[], boolean, java.util.concurrent.Callable<T>):
-    Attempted to remove @NonNull annotation from method androidx.room.InvalidationTracker.createLiveData(String[],boolean,java.util.concurrent.Callable<T>)
-InvalidNullConversion: androidx.room.InvalidationTracker#createLiveData(String[], java.util.concurrent.Callable<T>):
-    Attempted to remove @NonNull annotation from method androidx.room.InvalidationTracker.createLiveData(String[],java.util.concurrent.Callable<T>)
-
-
-RemovedMethod: androidx.room.paging.LimitOffsetDataSource#isInvalid():
-    Removed method androidx.room.paging.LimitOffsetDataSource.isInvalid()
-RemovedMethod: androidx.room.paging.LimitOffsetDataSource#loadInitial(LoadInitialParams, LoadInitialCallback<T>):
-    Removed method androidx.room.paging.LimitOffsetDataSource.loadInitial(LoadInitialParams,LoadInitialCallback<T>)
-RemovedMethod: androidx.room.paging.LimitOffsetDataSource#loadRange(LoadRangeParams, LoadRangeCallback<T>):
-    Removed method androidx.room.paging.LimitOffsetDataSource.loadRange(LoadRangeParams,LoadRangeCallback<T>)
diff --git a/room/runtime/api/restricted_2.3.0-alpha01.ignore b/room/runtime/api/restricted_current.ignore
similarity index 100%
rename from room/runtime/api/restricted_2.3.0-alpha01.ignore
rename to room/runtime/api/restricted_current.ignore
diff --git a/slices/builders/api/restricted_1.1.0-alpha01.ignore b/slices/builders/api/restricted_1.1.0-alpha01.ignore
deleted file mode 100644
index 2232ab0..0000000
--- a/slices/builders/api/restricted_1.1.0-alpha01.ignore
+++ /dev/null
@@ -1,59 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.slice.builders.impl.ListBuilder#addSelection(androidx.slice.builders.SelectionBuilder):
-    Added method androidx.slice.builders.impl.ListBuilder.addSelection(androidx.slice.builders.SelectionBuilder)
-
-
-RemovedClass: androidx.slice.builders.impl.ListBuilderV1Impl:
-    Removed class androidx.slice.builders.impl.ListBuilderV1Impl
-
-
-RemovedMethod: androidx.slice.builders.GridRowBuilder#GridRowBuilder(androidx.slice.builders.ListBuilder):
-    Removed constructor androidx.slice.builders.GridRowBuilder(androidx.slice.builders.ListBuilder)
-RemovedMethod: androidx.slice.builders.GridRowBuilder#addCell(androidx.core.util.Consumer<androidx.slice.builders.GridRowBuilder.CellBuilder>):
-    Removed method androidx.slice.builders.GridRowBuilder.addCell(androidx.core.util.Consumer<androidx.slice.builders.GridRowBuilder.CellBuilder>)
-RemovedMethod: androidx.slice.builders.GridRowBuilder#setSeeMoreCell(androidx.core.util.Consumer<androidx.slice.builders.GridRowBuilder.CellBuilder>):
-    Removed method androidx.slice.builders.GridRowBuilder.setSeeMoreCell(androidx.core.util.Consumer<androidx.slice.builders.GridRowBuilder.CellBuilder>)
-RemovedMethod: androidx.slice.builders.GridRowBuilder.CellBuilder#CellBuilder(androidx.slice.builders.GridRowBuilder):
-    Removed constructor androidx.slice.builders.GridRowBuilder.CellBuilder(androidx.slice.builders.GridRowBuilder)
-RemovedMethod: androidx.slice.builders.GridRowBuilder.CellBuilder#CellBuilder(androidx.slice.builders.GridRowBuilder, android.net.Uri):
-    Removed constructor androidx.slice.builders.GridRowBuilder.CellBuilder(androidx.slice.builders.GridRowBuilder,android.net.Uri)
-RemovedMethod: androidx.slice.builders.ListBuilder#ListBuilder(android.content.Context, android.net.Uri):
-    Removed constructor androidx.slice.builders.ListBuilder(android.content.Context,android.net.Uri)
-RemovedMethod: androidx.slice.builders.ListBuilder#addGridRow(androidx.core.util.Consumer<androidx.slice.builders.GridRowBuilder>):
-    Removed method androidx.slice.builders.ListBuilder.addGridRow(androidx.core.util.Consumer<androidx.slice.builders.GridRowBuilder>)
-RemovedMethod: androidx.slice.builders.ListBuilder#addInputRange(androidx.core.util.Consumer<androidx.slice.builders.ListBuilder.InputRangeBuilder>):
-    Removed method androidx.slice.builders.ListBuilder.addInputRange(androidx.core.util.Consumer<androidx.slice.builders.ListBuilder.InputRangeBuilder>)
-RemovedMethod: androidx.slice.builders.ListBuilder#addRange(androidx.core.util.Consumer<androidx.slice.builders.ListBuilder.RangeBuilder>):
-    Removed method androidx.slice.builders.ListBuilder.addRange(androidx.core.util.Consumer<androidx.slice.builders.ListBuilder.RangeBuilder>)
-RemovedMethod: androidx.slice.builders.ListBuilder#addRow(androidx.core.util.Consumer<androidx.slice.builders.ListBuilder.RowBuilder>):
-    Removed method androidx.slice.builders.ListBuilder.addRow(androidx.core.util.Consumer<androidx.slice.builders.ListBuilder.RowBuilder>)
-RemovedMethod: androidx.slice.builders.ListBuilder#setColor(int):
-    Removed method androidx.slice.builders.ListBuilder.setColor(int)
-RemovedMethod: androidx.slice.builders.ListBuilder#setHeader(androidx.core.util.Consumer<androidx.slice.builders.ListBuilder.HeaderBuilder>):
-    Removed method androidx.slice.builders.ListBuilder.setHeader(androidx.core.util.Consumer<androidx.slice.builders.ListBuilder.HeaderBuilder>)
-RemovedMethod: androidx.slice.builders.ListBuilder#setKeywords(java.util.List<java.lang.String>):
-    Removed method androidx.slice.builders.ListBuilder.setKeywords(java.util.List<java.lang.String>)
-RemovedMethod: androidx.slice.builders.ListBuilder#setSeeMoreRow(androidx.core.util.Consumer<androidx.slice.builders.ListBuilder.RowBuilder>):
-    Removed method androidx.slice.builders.ListBuilder.setSeeMoreRow(androidx.core.util.Consumer<androidx.slice.builders.ListBuilder.RowBuilder>)
-RemovedMethod: androidx.slice.builders.ListBuilder.HeaderBuilder#HeaderBuilder(androidx.slice.builders.ListBuilder):
-    Removed constructor androidx.slice.builders.ListBuilder.HeaderBuilder(androidx.slice.builders.ListBuilder)
-RemovedMethod: androidx.slice.builders.ListBuilder.HeaderBuilder#HeaderBuilder(androidx.slice.builders.ListBuilder, android.net.Uri):
-    Removed constructor androidx.slice.builders.ListBuilder.HeaderBuilder(androidx.slice.builders.ListBuilder,android.net.Uri)
-RemovedMethod: androidx.slice.builders.ListBuilder.InputRangeBuilder#InputRangeBuilder(androidx.slice.builders.ListBuilder):
-    Removed constructor androidx.slice.builders.ListBuilder.InputRangeBuilder(androidx.slice.builders.ListBuilder)
-RemovedMethod: androidx.slice.builders.ListBuilder.RangeBuilder#RangeBuilder(androidx.slice.builders.ListBuilder):
-    Removed constructor androidx.slice.builders.ListBuilder.RangeBuilder(androidx.slice.builders.ListBuilder)
-RemovedMethod: androidx.slice.builders.ListBuilder.RowBuilder#RowBuilder(android.content.Context, android.net.Uri):
-    Removed constructor androidx.slice.builders.ListBuilder.RowBuilder(android.content.Context,android.net.Uri)
-RemovedMethod: androidx.slice.builders.ListBuilder.RowBuilder#RowBuilder(androidx.slice.builders.ListBuilder):
-    Removed constructor androidx.slice.builders.ListBuilder.RowBuilder(androidx.slice.builders.ListBuilder)
-RemovedMethod: androidx.slice.builders.ListBuilder.RowBuilder#RowBuilder(androidx.slice.builders.ListBuilder, android.net.Uri):
-    Removed constructor androidx.slice.builders.ListBuilder.RowBuilder(androidx.slice.builders.ListBuilder,android.net.Uri)
-RemovedMethod: androidx.slice.builders.TemplateSliceBuilder#checkCompatible(androidx.slice.SliceSpec, android.net.Uri):
-    Removed method androidx.slice.builders.TemplateSliceBuilder.checkCompatible(androidx.slice.SliceSpec,android.net.Uri)
-RemovedMethod: androidx.slice.builders.TemplateSliceBuilder#selectImpl(android.net.Uri):
-    Removed method androidx.slice.builders.TemplateSliceBuilder.selectImpl(android.net.Uri)
-RemovedMethod: androidx.slice.builders.impl.GridRowBuilderListV1Impl#GridRowBuilderListV1Impl(androidx.slice.builders.impl.ListBuilderV1Impl, androidx.slice.builders.GridRowBuilder):
-    Removed constructor androidx.slice.builders.impl.GridRowBuilderListV1Impl(androidx.slice.builders.impl.ListBuilderV1Impl,androidx.slice.builders.GridRowBuilder)
-
-
diff --git a/slices/core/api/1.0.0.ignore b/slices/core/api/1.0.0.ignore
deleted file mode 100644
index af504bb..0000000
--- a/slices/core/api/1.0.0.ignore
+++ /dev/null
@@ -1,2 +0,0 @@
-ae48d4b
-
diff --git a/slices/core/api/restricted_1.1.0-alpha01.ignore b/slices/core/api/restricted_1.1.0-alpha01.ignore
deleted file mode 100644
index 9843ccf..0000000
--- a/slices/core/api/restricted_1.1.0-alpha01.ignore
+++ /dev/null
@@ -1,27 +0,0 @@
-// Baseline format: 1.0
-RemovedClass: androidx.slice.SliceItemHolderParcelizer:
-    Removed class androidx.slice.SliceItemHolderParcelizer
-RemovedClass: androidx.slice.SliceItemParcelizer:
-    Removed class androidx.slice.SliceItemParcelizer
-RemovedClass: androidx.slice.SliceParcelizer:
-    Removed class androidx.slice.SliceParcelizer
-RemovedClass: androidx.slice.SliceSpecParcelizer:
-    Removed class androidx.slice.SliceSpecParcelizer
-
-
-RemovedMethod: androidx.slice.SliceItem#getTimestamp():
-    Removed method androidx.slice.SliceItem.getTimestamp()
-RemovedMethod: androidx.slice.SliceItemHolder#SliceItemHolder():
-    Removed constructor androidx.slice.SliceItemHolder()
-RemovedMethod: androidx.slice.SliceProvider#createPermissionIntent(android.content.Context, android.net.Uri, String):
-    Removed method androidx.slice.SliceProvider.createPermissionIntent(android.content.Context,android.net.Uri,String)
-RemovedMethod: androidx.slice.SliceProvider#createPermissionSlice(android.content.Context, android.net.Uri, String):
-    Removed method androidx.slice.SliceProvider.createPermissionSlice(android.content.Context,android.net.Uri,String)
-RemovedMethod: androidx.slice.SliceProvider#getPermissionString(android.content.Context, String):
-    Removed method androidx.slice.SliceProvider.getPermissionString(android.content.Context,String)
-RemovedMethod: androidx.slice.core.SliceQuery#stream(androidx.slice.Slice):
-    Removed method androidx.slice.core.SliceQuery.stream(androidx.slice.Slice)
-RemovedMethod: androidx.slice.core.SliceQuery#stream(androidx.slice.SliceItem):
-    Removed method androidx.slice.core.SliceQuery.stream(androidx.slice.SliceItem)
-
-
diff --git a/slices/core/api/restricted_1.1.0-alpha02.ignore b/slices/core/api/restricted_1.1.0-alpha02.ignore
deleted file mode 100644
index 03bee74..0000000
--- a/slices/core/api/restricted_1.1.0-alpha02.ignore
+++ /dev/null
@@ -1,15 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.slice.SliceManager#getPinnedSpecs(android.net.Uri):
-    Added method androidx.slice.SliceManager.getPinnedSpecs(android.net.Uri)
-
-
-RemovedMethod: androidx.slice.SliceProvider#createPermissionIntent(android.content.Context, android.net.Uri, String):
-    Removed method androidx.slice.SliceProvider.createPermissionIntent(android.content.Context,android.net.Uri,String)
-RemovedMethod: androidx.slice.SliceProvider#createPermissionSlice(android.content.Context, android.net.Uri, String):
-    Removed method androidx.slice.SliceProvider.createPermissionSlice(android.content.Context,android.net.Uri,String)
-RemovedMethod: androidx.slice.SliceProvider#getPermissionString(android.content.Context, String):
-    Removed method androidx.slice.SliceProvider.getPermissionString(android.content.Context,String)
-RemovedMethod: androidx.slice.core.SliceQuery#stream(androidx.slice.Slice):
-    Removed method androidx.slice.core.SliceQuery.stream(androidx.slice.Slice)
-RemovedMethod: androidx.slice.core.SliceQuery#stream(androidx.slice.SliceItem):
-    Removed method androidx.slice.core.SliceQuery.stream(androidx.slice.SliceItem)
diff --git a/transition/transition/api/1.2.0-alpha02.ignore b/transition/transition/api/1.2.0-alpha02.ignore
deleted file mode 100644
index b418466..0000000
--- a/transition/transition/api/1.2.0-alpha02.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.transition.Transition#getTargetTypes():
-    Method androidx.transition.Transition.getTargetTypes has changed return type from java.util.List<java.lang.Class> to java.util.List<java.lang.Class<?>>
diff --git a/transition/transition/api/1.2.0-beta01.ignore b/transition/transition/api/1.2.0-beta01.ignore
deleted file mode 100644
index b418466..0000000
--- a/transition/transition/api/1.2.0-beta01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-ChangedType: androidx.transition.Transition#getTargetTypes():
-    Method androidx.transition.Transition.getTargetTypes has changed return type from java.util.List<java.lang.Class> to java.util.List<java.lang.Class<?>>
diff --git a/transition/transition/api/restricted_1.4.0-beta01.ignore b/transition/transition/api/restricted_1.4.0-beta01.ignore
deleted file mode 100644
index c46825a..0000000
--- a/transition/transition/api/restricted_1.4.0-beta01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.transition.FragmentTransitionSupport#setListenerForTransitionEnd(Fragment, Object, androidx.core.os.CancellationSignal, Runnable):
-    Removed method androidx.transition.FragmentTransitionSupport.setListenerForTransitionEnd(Fragment,Object,androidx.core.os.CancellationSignal,Runnable)
diff --git a/transition/transition/api/restricted_1.4.0-alpha01.ignore b/transition/transition/api/restricted_current.ignore
similarity index 100%
rename from transition/transition/api/restricted_1.4.0-alpha01.ignore
rename to transition/transition/api/restricted_current.ignore
diff --git a/versionedparcelable/versionedparcelable/api/restricted_1.1.0-alpha02.ignore b/versionedparcelable/versionedparcelable/api/restricted_1.1.0-alpha02.ignore
deleted file mode 100644
index 13e19cd..0000000
--- a/versionedparcelable/versionedparcelable/api/restricted_1.1.0-alpha02.ignore
+++ /dev/null
@@ -1,27 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.versionedparcelable.ParcelField#defaultValue():
-    Added method androidx.versionedparcelable.ParcelField.defaultValue()
-AddedAbstractMethod: androidx.versionedparcelable.VersionedParcel#readCharSequence():
-    Added method androidx.versionedparcelable.VersionedParcel.readCharSequence()
-AddedAbstractMethod: androidx.versionedparcelable.VersionedParcel#writeCharSequence(CharSequence):
-    Added method androidx.versionedparcelable.VersionedParcel.writeCharSequence(CharSequence)
-AddedAbstractMethod: androidx.versionedparcelable.VersionedParcelize#factory():
-    Added method androidx.versionedparcelable.VersionedParcelize.factory()
-
-
-ChangedStatic: androidx.versionedparcelable.VersionedParcel#readFromParcel(String, androidx.versionedparcelable.VersionedParcel):
-    Method androidx.versionedparcelable.VersionedParcel.readFromParcel has changed 'static' qualifier
-ChangedStatic: androidx.versionedparcelable.VersionedParcel#writeToParcel(T, androidx.versionedparcelable.VersionedParcel):
-    Method androidx.versionedparcelable.VersionedParcel.writeToParcel has changed 'static' qualifier
-
-
-ChangedType: androidx.versionedparcelable.VersionedParcel#readParcelable():
-    Method androidx.versionedparcelable.VersionedParcel.readParcelable has changed return type from T (extends java.lang.Object) to T (extends android.os.Parcelable)
-ChangedType: androidx.versionedparcelable.VersionedParcel#readParcelable(T, int):
-    Method androidx.versionedparcelable.VersionedParcel.readParcelable has changed return type from T (extends java.lang.Object) to T (extends android.os.Parcelable)
-
-
-RemovedMethod: androidx.versionedparcelable.VersionedParcel#VersionedParcel():
-    Removed constructor androidx.versionedparcelable.VersionedParcel()
-
-
diff --git a/versionedparcelable/versionedparcelable/api/restricted_1.2.0-alpha01.ignore b/versionedparcelable/versionedparcelable/api/restricted_current.ignore
similarity index 100%
rename from versionedparcelable/versionedparcelable/api/restricted_1.2.0-alpha01.ignore
rename to versionedparcelable/versionedparcelable/api/restricted_current.ignore
diff --git a/work/workmanager-ktx/api/2.4.0-alpha03.ignore b/work/workmanager-ktx/api/2.4.0-alpha03.ignore
deleted file mode 100644
index 523b36f..0000000
--- a/work/workmanager-ktx/api/2.4.0-alpha03.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.work.CoroutineWorker#doWork(kotlin.coroutines.Continuation<? super androidx.work.ListenableWorker.Result>):
-    Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.work.CoroutineWorker.doWork(kotlin.coroutines.Continuation<? super androidx.work.ListenableWorker.Result>)
-InvalidNullConversion: androidx.work.OneTimeWorkRequestKt#OneTimeWorkRequestBuilder():
-    Attempted to remove @NonNull annotation from method androidx.work.OneTimeWorkRequestKt.OneTimeWorkRequestBuilder()
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(java.time.Duration):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(java.time.Duration)
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(java.time.Duration, java.time.Duration):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(java.time.Duration,java.time.Duration)
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(long, java.util.concurrent.TimeUnit):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(long,java.util.concurrent.TimeUnit)
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(long, java.util.concurrent.TimeUnit, long, java.util.concurrent.TimeUnit):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(long,java.util.concurrent.TimeUnit,long,java.util.concurrent.TimeUnit)
diff --git a/work/workmanager-ktx/api/2.4.0-beta01.ignore b/work/workmanager-ktx/api/2.4.0-beta01.ignore
deleted file mode 100644
index 523b36f..0000000
--- a/work/workmanager-ktx/api/2.4.0-beta01.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.work.CoroutineWorker#doWork(kotlin.coroutines.Continuation<? super androidx.work.ListenableWorker.Result>):
-    Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.work.CoroutineWorker.doWork(kotlin.coroutines.Continuation<? super androidx.work.ListenableWorker.Result>)
-InvalidNullConversion: androidx.work.OneTimeWorkRequestKt#OneTimeWorkRequestBuilder():
-    Attempted to remove @NonNull annotation from method androidx.work.OneTimeWorkRequestKt.OneTimeWorkRequestBuilder()
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(java.time.Duration):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(java.time.Duration)
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(java.time.Duration, java.time.Duration):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(java.time.Duration,java.time.Duration)
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(long, java.util.concurrent.TimeUnit):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(long,java.util.concurrent.TimeUnit)
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(long, java.util.concurrent.TimeUnit, long, java.util.concurrent.TimeUnit):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(long,java.util.concurrent.TimeUnit,long,java.util.concurrent.TimeUnit)
diff --git a/work/workmanager-ktx/api/restricted_1.0.0-rc01.ignore b/work/workmanager-ktx/api/restricted_1.0.0-rc01.ignore
deleted file mode 100644
index 65204ca..0000000
--- a/work/workmanager-ktx/api/restricted_1.0.0-rc01.ignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.work.DirectExecutor#DirectExecutor():
-    Removed constructor androidx.work.DirectExecutor()
-RemovedMethod: androidx.work.ListenableFutureKt#await(com.google.common.util.concurrent.ListenableFuture<R>, kotlin.coroutines.Continuation<? super R>):
-    Removed method androidx.work.ListenableFutureKt.await(com.google.common.util.concurrent.ListenableFuture<R>,kotlin.coroutines.Continuation<? super R>)
-
-
diff --git a/work/workmanager-ktx/api/restricted_2.4.0-alpha03.ignore b/work/workmanager-ktx/api/restricted_2.4.0-alpha03.ignore
deleted file mode 100644
index 523b36f..0000000
--- a/work/workmanager-ktx/api/restricted_2.4.0-alpha03.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.work.CoroutineWorker#doWork(kotlin.coroutines.Continuation<? super androidx.work.ListenableWorker.Result>):
-    Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.work.CoroutineWorker.doWork(kotlin.coroutines.Continuation<? super androidx.work.ListenableWorker.Result>)
-InvalidNullConversion: androidx.work.OneTimeWorkRequestKt#OneTimeWorkRequestBuilder():
-    Attempted to remove @NonNull annotation from method androidx.work.OneTimeWorkRequestKt.OneTimeWorkRequestBuilder()
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(java.time.Duration):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(java.time.Duration)
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(java.time.Duration, java.time.Duration):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(java.time.Duration,java.time.Duration)
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(long, java.util.concurrent.TimeUnit):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(long,java.util.concurrent.TimeUnit)
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(long, java.util.concurrent.TimeUnit, long, java.util.concurrent.TimeUnit):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(long,java.util.concurrent.TimeUnit,long,java.util.concurrent.TimeUnit)
diff --git a/work/workmanager-ktx/api/restricted_2.4.0-beta01.ignore b/work/workmanager-ktx/api/restricted_2.4.0-beta01.ignore
deleted file mode 100644
index 523b36f..0000000
--- a/work/workmanager-ktx/api/restricted_2.4.0-beta01.ignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.work.CoroutineWorker#doWork(kotlin.coroutines.Continuation<? super androidx.work.ListenableWorker.Result>):
-    Attempted to change method return from @NonNull to @Nullable: incompatible change for method androidx.work.CoroutineWorker.doWork(kotlin.coroutines.Continuation<? super androidx.work.ListenableWorker.Result>)
-InvalidNullConversion: androidx.work.OneTimeWorkRequestKt#OneTimeWorkRequestBuilder():
-    Attempted to remove @NonNull annotation from method androidx.work.OneTimeWorkRequestKt.OneTimeWorkRequestBuilder()
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(java.time.Duration):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(java.time.Duration)
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(java.time.Duration, java.time.Duration):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(java.time.Duration,java.time.Duration)
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(long, java.util.concurrent.TimeUnit):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(long,java.util.concurrent.TimeUnit)
-InvalidNullConversion: androidx.work.PeriodicWorkRequestKt#PeriodicWorkRequestBuilder(long, java.util.concurrent.TimeUnit, long, java.util.concurrent.TimeUnit):
-    Attempted to remove @NonNull annotation from method androidx.work.PeriodicWorkRequestKt.PeriodicWorkRequestBuilder(long,java.util.concurrent.TimeUnit,long,java.util.concurrent.TimeUnit)
diff --git a/work/workmanager-testing/api/2.4.0-alpha03.ignore b/work/workmanager-testing/api/2.4.0-alpha03.ignore
deleted file mode 100644
index c30fe58..0000000
--- a/work/workmanager-testing/api/2.4.0-alpha03.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.work.testing.TestListenableWorkerBuilderKt#TestListenableWorkerBuilder(android.content.Context, androidx.work.Data, java.util.List<? extends java.lang.String>, int, java.util.List<? extends android.net.Uri>, java.util.List<? extends java.lang.String>):
-    Attempted to remove @NonNull annotation from method androidx.work.testing.TestListenableWorkerBuilderKt.TestListenableWorkerBuilder(android.content.Context,androidx.work.Data,java.util.List<? extends java.lang.String>,int,java.util.List<? extends android.net.Uri>,java.util.List<? extends java.lang.String>)
-InvalidNullConversion: androidx.work.testing.TestWorkerBuilderKt#TestWorkerBuilder(android.content.Context, java.util.concurrent.Executor, androidx.work.Data, java.util.List<? extends java.lang.String>, int, java.util.List<? extends android.net.Uri>, java.util.List<? extends java.lang.String>):
-    Attempted to remove @NonNull annotation from method androidx.work.testing.TestWorkerBuilderKt.TestWorkerBuilder(android.content.Context,java.util.concurrent.Executor,androidx.work.Data,java.util.List<? extends java.lang.String>,int,java.util.List<? extends android.net.Uri>,java.util.List<? extends java.lang.String>)
diff --git a/work/workmanager-testing/api/2.4.0-beta01.ignore b/work/workmanager-testing/api/2.4.0-beta01.ignore
deleted file mode 100644
index c30fe58..0000000
--- a/work/workmanager-testing/api/2.4.0-beta01.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.work.testing.TestListenableWorkerBuilderKt#TestListenableWorkerBuilder(android.content.Context, androidx.work.Data, java.util.List<? extends java.lang.String>, int, java.util.List<? extends android.net.Uri>, java.util.List<? extends java.lang.String>):
-    Attempted to remove @NonNull annotation from method androidx.work.testing.TestListenableWorkerBuilderKt.TestListenableWorkerBuilder(android.content.Context,androidx.work.Data,java.util.List<? extends java.lang.String>,int,java.util.List<? extends android.net.Uri>,java.util.List<? extends java.lang.String>)
-InvalidNullConversion: androidx.work.testing.TestWorkerBuilderKt#TestWorkerBuilder(android.content.Context, java.util.concurrent.Executor, androidx.work.Data, java.util.List<? extends java.lang.String>, int, java.util.List<? extends android.net.Uri>, java.util.List<? extends java.lang.String>):
-    Attempted to remove @NonNull annotation from method androidx.work.testing.TestWorkerBuilderKt.TestWorkerBuilder(android.content.Context,java.util.concurrent.Executor,androidx.work.Data,java.util.List<? extends java.lang.String>,int,java.util.List<? extends android.net.Uri>,java.util.List<? extends java.lang.String>)
diff --git a/work/workmanager-testing/api/restricted_2.4.0-alpha03.ignore b/work/workmanager-testing/api/restricted_2.4.0-alpha03.ignore
deleted file mode 100644
index c30fe58..0000000
--- a/work/workmanager-testing/api/restricted_2.4.0-alpha03.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.work.testing.TestListenableWorkerBuilderKt#TestListenableWorkerBuilder(android.content.Context, androidx.work.Data, java.util.List<? extends java.lang.String>, int, java.util.List<? extends android.net.Uri>, java.util.List<? extends java.lang.String>):
-    Attempted to remove @NonNull annotation from method androidx.work.testing.TestListenableWorkerBuilderKt.TestListenableWorkerBuilder(android.content.Context,androidx.work.Data,java.util.List<? extends java.lang.String>,int,java.util.List<? extends android.net.Uri>,java.util.List<? extends java.lang.String>)
-InvalidNullConversion: androidx.work.testing.TestWorkerBuilderKt#TestWorkerBuilder(android.content.Context, java.util.concurrent.Executor, androidx.work.Data, java.util.List<? extends java.lang.String>, int, java.util.List<? extends android.net.Uri>, java.util.List<? extends java.lang.String>):
-    Attempted to remove @NonNull annotation from method androidx.work.testing.TestWorkerBuilderKt.TestWorkerBuilder(android.content.Context,java.util.concurrent.Executor,androidx.work.Data,java.util.List<? extends java.lang.String>,int,java.util.List<? extends android.net.Uri>,java.util.List<? extends java.lang.String>)
diff --git a/work/workmanager-testing/api/restricted_2.4.0-beta01.ignore b/work/workmanager-testing/api/restricted_2.4.0-beta01.ignore
deleted file mode 100644
index c30fe58..0000000
--- a/work/workmanager-testing/api/restricted_2.4.0-beta01.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-InvalidNullConversion: androidx.work.testing.TestListenableWorkerBuilderKt#TestListenableWorkerBuilder(android.content.Context, androidx.work.Data, java.util.List<? extends java.lang.String>, int, java.util.List<? extends android.net.Uri>, java.util.List<? extends java.lang.String>):
-    Attempted to remove @NonNull annotation from method androidx.work.testing.TestListenableWorkerBuilderKt.TestListenableWorkerBuilder(android.content.Context,androidx.work.Data,java.util.List<? extends java.lang.String>,int,java.util.List<? extends android.net.Uri>,java.util.List<? extends java.lang.String>)
-InvalidNullConversion: androidx.work.testing.TestWorkerBuilderKt#TestWorkerBuilder(android.content.Context, java.util.concurrent.Executor, androidx.work.Data, java.util.List<? extends java.lang.String>, int, java.util.List<? extends android.net.Uri>, java.util.List<? extends java.lang.String>):
-    Attempted to remove @NonNull annotation from method androidx.work.testing.TestWorkerBuilderKt.TestWorkerBuilder(android.content.Context,java.util.concurrent.Executor,androidx.work.Data,java.util.List<? extends java.lang.String>,int,java.util.List<? extends android.net.Uri>,java.util.List<? extends java.lang.String>)
diff --git a/work/workmanager/api/2.3.0-alpha02.ignore b/work/workmanager/api/2.3.0-alpha02.ignore
deleted file mode 100644
index d61bc87e..0000000
--- a/work/workmanager/api/2.3.0-alpha02.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.work.WorkManager#createCancelPendingIntent(android.content.Context, java.util.UUID):
-    Added method androidx.work.WorkManager.createCancelPendingIntent(android.content.Context,java.util.UUID)
diff --git a/work/workmanager/api/2.3.0-alpha03.ignore b/work/workmanager/api/2.3.0-alpha03.ignore
deleted file mode 100644
index 59678f1..0000000
--- a/work/workmanager/api/2.3.0-alpha03.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.work.WorkManager#createCancelPendingIntent(java.util.UUID):
-    Added method androidx.work.WorkManager.createCancelPendingIntent(java.util.UUID)
diff --git a/work/workmanager/api/2.3.0-alpha04.ignore b/work/workmanager/api/2.3.0-alpha04.ignore
deleted file mode 100644
index 59678f1..0000000
--- a/work/workmanager/api/2.3.0-alpha04.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.work.WorkManager#createCancelPendingIntent(java.util.UUID):
-    Added method androidx.work.WorkManager.createCancelPendingIntent(java.util.UUID)
diff --git a/work/workmanager/api/2.3.0-beta01.ignore b/work/workmanager/api/2.3.0-beta01.ignore
deleted file mode 100644
index 59678f1..0000000
--- a/work/workmanager/api/2.3.0-beta01.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.work.WorkManager#createCancelPendingIntent(java.util.UUID):
-    Added method androidx.work.WorkManager.createCancelPendingIntent(java.util.UUID)
diff --git a/work/workmanager/api/2.3.0-beta02.ignore b/work/workmanager/api/2.3.0-beta02.ignore
deleted file mode 100644
index 466970c..0000000
--- a/work/workmanager/api/2.3.0-beta02.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-RemovedMethod: androidx.work.ForegroundInfo#ForegroundInfo(android.app.Notification):
-    Removed constructor androidx.work.ForegroundInfo(android.app.Notification)
-RemovedMethod: androidx.work.ForegroundInfo#ForegroundInfo(android.app.Notification, int):
-    Removed constructor androidx.work.ForegroundInfo(android.app.Notification,int)
diff --git a/work/workmanager/api/2.4.0-alpha02.ignore b/work/workmanager/api/2.4.0-alpha02.ignore
deleted file mode 100644
index 2417a90..0000000
--- a/work/workmanager/api/2.4.0-alpha02.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.work.WorkManager#getWorkInfos(androidx.work.WorkQuery):
-    Added method androidx.work.WorkManager.getWorkInfos(androidx.work.WorkQuery)
-AddedAbstractMethod: androidx.work.WorkManager#getWorkInfosLiveData(androidx.work.WorkQuery):
-    Added method androidx.work.WorkManager.getWorkInfosLiveData(androidx.work.WorkQuery)
diff --git a/work/workmanager/api/2.4.0-alpha03.ignore b/work/workmanager/api/2.4.0-alpha03.ignore
deleted file mode 100644
index 2417a90..0000000
--- a/work/workmanager/api/2.4.0-alpha03.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.work.WorkManager#getWorkInfos(androidx.work.WorkQuery):
-    Added method androidx.work.WorkManager.getWorkInfos(androidx.work.WorkQuery)
-AddedAbstractMethod: androidx.work.WorkManager#getWorkInfosLiveData(androidx.work.WorkQuery):
-    Added method androidx.work.WorkManager.getWorkInfosLiveData(androidx.work.WorkQuery)
diff --git a/work/workmanager/api/2.4.0-beta01.ignore b/work/workmanager/api/2.4.0-beta01.ignore
deleted file mode 100644
index 2417a90..0000000
--- a/work/workmanager/api/2.4.0-beta01.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.work.WorkManager#getWorkInfos(androidx.work.WorkQuery):
-    Added method androidx.work.WorkManager.getWorkInfos(androidx.work.WorkQuery)
-AddedAbstractMethod: androidx.work.WorkManager#getWorkInfosLiveData(androidx.work.WorkQuery):
-    Added method androidx.work.WorkManager.getWorkInfosLiveData(androidx.work.WorkQuery)
diff --git a/work/workmanager/api/restricted_1.0.0-rc01.ignore b/work/workmanager/api/restricted_1.0.0-rc01.ignore
deleted file mode 100644
index 6ac98be..0000000
--- a/work/workmanager/api/restricted_1.0.0-rc01.ignore
+++ /dev/null
@@ -1,79 +0,0 @@
-// Baseline format: 1.0
-HiddenTypeParameter: androidx.work.impl.WorkDatabase#dependencyDao():
-    Method androidx.work.impl.WorkDatabase.dependencyDao() references hidden type androidx.work.impl.model.DependencyDao.
-HiddenTypeParameter: androidx.work.impl.WorkDatabase#systemIdInfoDao():
-    Method androidx.work.impl.WorkDatabase.systemIdInfoDao() references hidden type androidx.work.impl.model.SystemIdInfoDao.
-HiddenTypeParameter: androidx.work.impl.WorkDatabase#workNameDao():
-    Method androidx.work.impl.WorkDatabase.workNameDao() references hidden type androidx.work.impl.model.WorkNameDao.
-HiddenTypeParameter: androidx.work.impl.WorkDatabase#workSpecDao():
-    Method androidx.work.impl.WorkDatabase.workSpecDao() references hidden type androidx.work.impl.model.WorkSpecDao.
-HiddenTypeParameter: androidx.work.impl.WorkDatabase#workTagDao():
-    Method androidx.work.impl.WorkDatabase.workTagDao() references hidden type androidx.work.impl.model.WorkTagDao.
-HiddenTypeParameter: androidx.work.impl.background.greedy.GreedyScheduler#GreedyScheduler(androidx.work.impl.WorkManagerImpl, androidx.work.impl.constraints.WorkConstraintsTracker) parameter #1:
-    Parameter workConstraintsTracker references hidden type androidx.work.impl.constraints.WorkConstraintsTracker.
-HiddenTypeParameter: androidx.work.impl.background.systemjob.SystemJobScheduler#SystemJobScheduler(android.content.Context, androidx.work.impl.WorkManagerImpl, android.app.job.JobScheduler, androidx.work.impl.background.systemjob.SystemJobInfoConverter) parameter #3:
-    Parameter systemJobInfoConverter references hidden type androidx.work.impl.background.systemjob.SystemJobInfoConverter.
-HiddenTypeParameter: androidx.work.impl.constraints.trackers.ConstraintTracker#addListener(androidx.work.impl.constraints.ConstraintListener<T>) parameter #0:
-    Parameter listener references hidden type androidx.work.impl.constraints.ConstraintListener<T>.
-HiddenTypeParameter: androidx.work.impl.constraints.trackers.ConstraintTracker#removeListener(androidx.work.impl.constraints.ConstraintListener<T>) parameter #0:
-    Parameter listener references hidden type androidx.work.impl.constraints.ConstraintListener<T>.
-HiddenTypeParameter: androidx.work.impl.constraints.trackers.NetworkStateTracker#getInitialState():
-    Method androidx.work.impl.constraints.trackers.NetworkStateTracker.getInitialState() references hidden type androidx.work.impl.constraints.NetworkState.
-
-
-ReferencesHidden: androidx.work.impl.WorkDatabase#dependencyDao():
-    Class androidx.work.impl.model.DependencyDao is hidden but was referenced (as return type) from public method androidx.work.impl.WorkDatabase.dependencyDao()
-ReferencesHidden: androidx.work.impl.WorkDatabase#systemIdInfoDao():
-    Class androidx.work.impl.model.SystemIdInfoDao is hidden but was referenced (as return type) from public method androidx.work.impl.WorkDatabase.systemIdInfoDao()
-ReferencesHidden: androidx.work.impl.WorkDatabase#workNameDao():
-    Class androidx.work.impl.model.WorkNameDao is hidden but was referenced (as return type) from public method androidx.work.impl.WorkDatabase.workNameDao()
-ReferencesHidden: androidx.work.impl.WorkDatabase#workSpecDao():
-    Class androidx.work.impl.model.WorkSpecDao is hidden but was referenced (as return type) from public method androidx.work.impl.WorkDatabase.workSpecDao()
-ReferencesHidden: androidx.work.impl.WorkDatabase#workTagDao():
-    Class androidx.work.impl.model.WorkTagDao is hidden but was referenced (as return type) from public method androidx.work.impl.WorkDatabase.workTagDao()
-ReferencesHidden: androidx.work.impl.background.greedy.GreedyScheduler#GreedyScheduler(androidx.work.impl.WorkManagerImpl, androidx.work.impl.constraints.WorkConstraintsTracker) parameter #1:
-    Class androidx.work.impl.constraints.WorkConstraintsTracker is hidden but was referenced (as parameter type) from public parameter workConstraintsTracker in androidx.work.impl.background.greedy.GreedyScheduler(androidx.work.impl.WorkManagerImpl workManagerImpl, androidx.work.impl.constraints.WorkConstraintsTracker workConstraintsTracker)
-ReferencesHidden: androidx.work.impl.background.systemjob.SystemJobScheduler#SystemJobScheduler(android.content.Context, androidx.work.impl.WorkManagerImpl, android.app.job.JobScheduler, androidx.work.impl.background.systemjob.SystemJobInfoConverter) parameter #3:
-    Class androidx.work.impl.background.systemjob.SystemJobInfoConverter is not public but was referenced (as parameter type) from public parameter systemJobInfoConverter in androidx.work.impl.background.systemjob.SystemJobScheduler(android.content.Context context, androidx.work.impl.WorkManagerImpl workManager, android.app.job.JobScheduler jobScheduler, androidx.work.impl.background.systemjob.SystemJobInfoConverter systemJobInfoConverter)
-ReferencesHidden: androidx.work.impl.constraints.trackers.ConstraintTracker#addListener(androidx.work.impl.constraints.ConstraintListener<T>) parameter #0:
-    Class androidx.work.impl.constraints.ConstraintListener is hidden but was referenced (as parameter type) from public parameter listener in androidx.work.impl.constraints.trackers.ConstraintTracker.addListener(androidx.work.impl.constraints.ConstraintListener<T> listener)
-ReferencesHidden: androidx.work.impl.constraints.trackers.ConstraintTracker#removeListener(androidx.work.impl.constraints.ConstraintListener<T>) parameter #0:
-    Class androidx.work.impl.constraints.ConstraintListener is hidden but was referenced (as parameter type) from public parameter listener in androidx.work.impl.constraints.trackers.ConstraintTracker.removeListener(androidx.work.impl.constraints.ConstraintListener<T> listener)
-ReferencesHidden: androidx.work.impl.constraints.trackers.NetworkStateTracker#getInitialState():
-    Class androidx.work.impl.constraints.NetworkState is hidden but was referenced (as return type) from public method androidx.work.impl.constraints.trackers.NetworkStateTracker.getInitialState()
-
-
-RemovedClass: androidx.work.impl.WorkDatabase_Impl:
-    Removed class androidx.work.impl.WorkDatabase_Impl
-
-
-RemovedInterface: androidx.work.impl.background.greedy.GreedyScheduler:
-    Class androidx.work.impl.background.greedy.GreedyScheduler no longer implements androidx.work.impl.constraints.WorkConstraintsCallback
-RemovedInterface: androidx.work.impl.background.systemalarm.DelayMetCommandHandler:
-    Class androidx.work.impl.background.systemalarm.DelayMetCommandHandler no longer implements androidx.work.impl.constraints.WorkConstraintsCallback
-RemovedInterface: androidx.work.impl.workers.ConstraintTrackingWorker:
-    Class androidx.work.impl.workers.ConstraintTrackingWorker no longer implements androidx.work.impl.constraints.WorkConstraintsCallback
-
-
-RemovedMethod: androidx.work.impl.WorkManagerImpl#rescheduleEligibleWork():
-    Removed method androidx.work.impl.WorkManagerImpl.rescheduleEligibleWork()
-
-
-UnavailableSymbol: androidx.work.impl.WorkDatabase#dependencyDao():
-    Method androidx.work.impl.WorkDatabase.dependencyDao returns unavailable type DependencyDao
-UnavailableSymbol: androidx.work.impl.WorkDatabase#systemIdInfoDao():
-    Method androidx.work.impl.WorkDatabase.systemIdInfoDao returns unavailable type SystemIdInfoDao
-UnavailableSymbol: androidx.work.impl.WorkDatabase#workNameDao():
-    Method androidx.work.impl.WorkDatabase.workNameDao returns unavailable type WorkNameDao
-UnavailableSymbol: androidx.work.impl.WorkDatabase#workSpecDao():
-    Method androidx.work.impl.WorkDatabase.workSpecDao returns unavailable type WorkSpecDao
-UnavailableSymbol: androidx.work.impl.WorkDatabase#workTagDao():
-    Method androidx.work.impl.WorkDatabase.workTagDao returns unavailable type WorkTagDao
-UnavailableSymbol: androidx.work.impl.constraints.trackers.ConstraintTracker#addListener(androidx.work.impl.constraints.ConstraintListener<T>):
-    Parameter of unavailable type androidx.work.impl.constraints.ConstraintListener<T> in androidx.work.impl.constraints.trackers.ConstraintTracker.addListener()
-UnavailableSymbol: androidx.work.impl.constraints.trackers.ConstraintTracker#removeListener(androidx.work.impl.constraints.ConstraintListener<T>):
-    Parameter of unavailable type androidx.work.impl.constraints.ConstraintListener<T> in androidx.work.impl.constraints.trackers.ConstraintTracker.removeListener()
-UnavailableSymbol: androidx.work.impl.constraints.trackers.NetworkStateTracker#getInitialState():
-    Method androidx.work.impl.constraints.trackers.NetworkStateTracker.getInitialState returns unavailable type NetworkState
-
-
diff --git a/work/workmanager/api/restricted_2.4.0-alpha02.ignore b/work/workmanager/api/restricted_2.4.0-alpha02.ignore
deleted file mode 100644
index 2417a90..0000000
--- a/work/workmanager/api/restricted_2.4.0-alpha02.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.work.WorkManager#getWorkInfos(androidx.work.WorkQuery):
-    Added method androidx.work.WorkManager.getWorkInfos(androidx.work.WorkQuery)
-AddedAbstractMethod: androidx.work.WorkManager#getWorkInfosLiveData(androidx.work.WorkQuery):
-    Added method androidx.work.WorkManager.getWorkInfosLiveData(androidx.work.WorkQuery)
diff --git a/work/workmanager/api/restricted_2.4.0-alpha03.ignore b/work/workmanager/api/restricted_2.4.0-alpha03.ignore
deleted file mode 100644
index 2417a90..0000000
--- a/work/workmanager/api/restricted_2.4.0-alpha03.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.work.WorkManager#getWorkInfos(androidx.work.WorkQuery):
-    Added method androidx.work.WorkManager.getWorkInfos(androidx.work.WorkQuery)
-AddedAbstractMethod: androidx.work.WorkManager#getWorkInfosLiveData(androidx.work.WorkQuery):
-    Added method androidx.work.WorkManager.getWorkInfosLiveData(androidx.work.WorkQuery)
diff --git a/work/workmanager/api/restricted_2.4.0-beta01.ignore b/work/workmanager/api/restricted_2.4.0-beta01.ignore
deleted file mode 100644
index 2417a90..0000000
--- a/work/workmanager/api/restricted_2.4.0-beta01.ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Baseline format: 1.0
-AddedAbstractMethod: androidx.work.WorkManager#getWorkInfos(androidx.work.WorkQuery):
-    Added method androidx.work.WorkManager.getWorkInfos(androidx.work.WorkQuery)
-AddedAbstractMethod: androidx.work.WorkManager#getWorkInfosLiveData(androidx.work.WorkQuery):
-    Added method androidx.work.WorkManager.getWorkInfosLiveData(androidx.work.WorkQuery)