Revert "passing common-source-path to metalava"
This reverts commit 80e3d3dbaad70b303d31ccd7892a01982ddd8ff6.
Reason for revert: build failure ab/11614415 target androidx
Change-Id: I4eee66c1757cb9a80ffe1217dc9a9b1721eae124
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/java/JavaCompileInputs.kt b/buildSrc/private/src/main/kotlin/androidx/build/java/JavaCompileInputs.kt
index acc3a04..fb1f4d0 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/java/JavaCompileInputs.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/java/JavaCompileInputs.kt
@@ -19,8 +19,8 @@
import androidx.build.getAndroidJar
import androidx.build.multiplatformExtension
import com.android.build.api.dsl.KotlinMultiplatformAndroidTarget
+import java.io.File
import org.gradle.api.Project
-import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.file.FileCollection
import org.gradle.api.tasks.SourceSet
import org.gradle.kotlin.dsl.get
@@ -34,10 +34,7 @@
// Source files to process
val sourcePaths: FileCollection,
- // Source files from the KMP common module of this project
- val commonModuleSourcePaths: FileCollection,
-
- // Dependencies (compiled classes) of [sourcePaths].
+ // Dependencies of [sourcePaths].
val dependencyClasspath: FileCollection,
// Android's boot classpath.
@@ -52,16 +49,10 @@
bootClasspath: FileCollection
): JavaCompileInputs {
val sourceCollection = getSourceCollection(variant, project)
- val commonModuleSourceCollection = getCommonModuleSourceCollection(variant, project)
val dependencyClasspath = variant.getCompileClasspath(null).filter { it.exists() }
- return JavaCompileInputs(
- sourcePaths = sourceCollection,
- commonModuleSourcePaths = commonModuleSourceCollection,
- dependencyClasspath = dependencyClasspath,
- bootClasspath = bootClasspath
- )
+ return JavaCompileInputs(sourceCollection, dependencyClasspath, bootClasspath)
}
/**
@@ -79,17 +70,17 @@
.trimIndent()
}
val jvmTarget = kmpExtension.targets.requirePlatform(KotlinPlatformType.jvm)
- val jvmCompilation = jvmTarget.findCompilation(
- compilationName = KotlinCompilation.MAIN_COMPILATION_NAME
- )
-
- val sourceCollection = jvmCompilation.sourceFiles()
-
- val commonModuleSourcePaths = jvmCompilation.commonModuleSourcePaths()
+ val sourceCollection =
+ project.files(
+ project.provider {
+ jvmTarget.sourceFiles(
+ compilationName = KotlinCompilation.MAIN_COMPILATION_NAME
+ )
+ }
+ )
return JavaCompileInputs(
sourcePaths = sourceCollection,
- commonModuleSourcePaths = commonModuleSourcePaths,
dependencyClasspath =
jvmTarget.compilations[KotlinCompilation.MAIN_COMPILATION_NAME]
.compileDependencyFiles,
@@ -114,14 +105,17 @@
val target = kmpExtension.targets.withType(
KotlinMultiplatformAndroidTarget::class.java
).single()
- val compilation = target.findCompilation(KotlinCompilation.MAIN_COMPILATION_NAME)
- val sourceCollection = compilation.sourceFiles()
-
- val commonModuleSourcePaths = compilation.commonModuleSourcePaths()
+ val sourceCollection =
+ project.files(
+ project.provider {
+ target.sourceFiles(
+ compilationName = KotlinCompilation.MAIN_COMPILATION_NAME
+ )
+ }
+ )
return JavaCompileInputs(
sourcePaths = sourceCollection,
- commonModuleSourcePaths = commonModuleSourcePaths,
dependencyClasspath =
target.compilations[KotlinCompilation.MAIN_COMPILATION_NAME]
.compileDependencyFiles,
@@ -134,12 +128,7 @@
val sourcePaths: FileCollection =
project.files(project.provider { sourceSet.allSource.srcDirs })
val dependencyClasspath = sourceSet.compileClasspath
- return JavaCompileInputs(
- sourcePaths = sourcePaths,
- commonModuleSourcePaths = project.files(),
- dependencyClasspath = dependencyClasspath,
- bootClasspath = project.getAndroidJar()
- )
+ return JavaCompileInputs(sourcePaths, dependencyClasspath, project.getAndroidJar())
}
@Suppress("DEPRECATION") // BaseVariant, SourceKind
@@ -148,55 +137,30 @@
project: Project
): FileCollection {
// If the project has the kotlin-multiplatform plugin, we want to return a combined
- // collection of all the source files inside '*main' source sets. i.e., given a module
- // with a common and Android source set, this will look inside commonMain and
- // androidMain.
- val taskDependencies = mutableListOf<Any>(variant.javaCompileProvider)
- val sourceCollection: ConfigurableFileCollection =
- project.multiplatformExtension?.let { kmpExtension ->
- kmpExtension.targets
- .requirePlatform(KotlinPlatformType.androidJvm)
- .findCompilation(compilationName = variant.name)
- .sourceFiles()
- }
- ?: project.files(
- project.provider {
- variant
- .getSourceFolders(com.android.build.gradle.api.SourceKind.JAVA)
- .map { folder ->
- for (builtBy in folder.builtBy) {
- taskDependencies.add(builtBy)
- }
- folder.dir
- }
- }
- )
-
- for (dep in taskDependencies) {
- sourceCollection.builtBy(dep)
- }
- return sourceCollection
- }
-
- @Suppress("DEPRECATION") // BaseVariant, SourceKind
- private fun getCommonModuleSourceCollection(
- variant: com.android.build.gradle.api.BaseVariant,
- project: Project
- ): FileCollection {
- // If the project has the kotlin-multiplatform plugin, we want to return a combined
// collection of all the source files inside '*main' source sets. I.e, given a module
// with a common and Android source set, this will look inside commonMain and
// androidMain.
val taskDependencies = mutableListOf<Any>(variant.javaCompileProvider)
- val sourceCollection: ConfigurableFileCollection =
+ val sourceFiles =
project.multiplatformExtension?.let { kmpExtension ->
- kmpExtension.targets
- .requirePlatform(KotlinPlatformType.androidJvm)
- .findCompilation(compilationName = variant.name)
- .commonModuleSourcePaths()
+ project.provider {
+ kmpExtension.targets
+ .requirePlatform(KotlinPlatformType.androidJvm)
+ .sourceFiles(compilationName = variant.name)
+ }
}
- ?: project.files()
+ ?: project.provider {
+ variant
+ .getSourceFolders(com.android.build.gradle.api.SourceKind.JAVA)
+ .map { folder ->
+ for (builtBy in folder.builtBy) {
+ taskDependencies.add(builtBy)
+ }
+ folder.dir
+ }
+ }
+ val sourceCollection = project.files(sourceFiles)
for (dep in taskDependencies) {
sourceCollection.builtBy(dep)
}
@@ -210,7 +174,7 @@
* @param compilationName The name of the compilation. A target might have separate
* compilations (e.g. main vs test for jvm or debug vs release for Android)
*/
- private fun KotlinTarget.findCompilation(compilationName: String): KotlinCompilation<*> {
+ private fun KotlinTarget.sourceFiles(compilationName: String): List<File> {
val selectedCompilation =
checkNotNull(compilations.findByName(compilationName)) {
"""
@@ -220,49 +184,16 @@
"""
.trimIndent()
}
- return selectedCompilation
- }
-
- private fun KotlinCompilation<*>.sourceFiles(): ConfigurableFileCollection {
- val kotlinCompilation = this
- return project.files(
- project.provider {
- kotlinCompilation.allKotlinSourceSets
- .flatMap {
- it.kotlin.sourceDirectories
- }
- .also {
- require(it.isNotEmpty()) {
- """
- Didn't find any source sets for $kotlinCompilation in ${project.path}.
- """
- .trimIndent()
- }
- }
+ return selectedCompilation.allKotlinSourceSets
+ .flatMap { it.kotlin.sourceDirectories }
+ .also {
+ require(it.isNotEmpty()) {
+ """
+ Didn't find any source sets for $selectedCompilation in ${project.path}.
+ """
+ .trimIndent()
}
- )
- }
-
- private fun KotlinCompilation<*>.commonModuleSourcePaths(): ConfigurableFileCollection {
- val kotlinCompilation = this
- return project.files(
- project.provider {
- kotlinCompilation.allKotlinSourceSets
- .flatMap {
- it.dependsOn
- }
- .distinct()
- .filter {
- it.dependsOn.isEmpty()
- }
- .flatMap {
- it.kotlin.sourceDirectories.files
- }
- .filter {
- it.exists()
- }
}
- )
}
/**
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt
index 7c59f11..f432494 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt
@@ -92,12 +92,7 @@
check(bootClasspath.files.isNotEmpty()) { "Android boot classpath not set." }
check(sourcePaths.files.isNotEmpty()) { "Source paths not set." }
- val inputs = JavaCompileInputs(
- sourcePaths = sourcePaths,
- commonModuleSourcePaths = commonModuleSourcePaths,
- dependencyClasspath = dependencyClasspath,
- bootClasspath = bootClasspath
- )
+ val inputs = JavaCompileInputs(sourcePaths, dependencyClasspath, bootClasspath)
val levelsArgs =
getGenerateApiLevelsArgs(
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt b/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
index 62b944a..3f18ee4 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
@@ -250,7 +250,9 @@
generateApiConfigs.forEach { (generateApiMode, apiLintMode) ->
generateApi(
metalavaClasspath,
- files,
+ files.bootClasspath,
+ files.dependencyClasspath,
+ files.sourcePaths.files,
apiLocation,
generateApiMode,
apiLintMode,
@@ -269,7 +271,9 @@
*/
private fun generateApi(
metalavaClasspath: FileCollection,
- files: JavaCompileInputs,
+ bootClasspath: FileCollection,
+ dependencyClasspath: FileCollection,
+ sourcePaths: Collection<File>,
outputLocation: ApiLocation,
generateApiMode: GenerateApiMode,
apiLintMode: ApiLintMode,
@@ -281,10 +285,9 @@
) {
val args =
getGenerateApiArgs(
- files.bootClasspath,
- files.dependencyClasspath,
- files.sourcePaths.files,
- files.commonModuleSourcePaths.files,
+ bootClasspath,
+ dependencyClasspath,
+ sourcePaths,
outputLocation,
generateApiMode,
apiLintMode,
@@ -302,7 +305,6 @@
bootClasspath: FileCollection,
dependencyClasspath: FileCollection,
sourcePaths: Collection<File>,
- commonModuleSourcePaths: Collection<File>,
outputLocation: ApiLocation?,
generateApiMode: GenerateApiMode,
apiLintMode: ApiLintMode,
@@ -316,16 +318,10 @@
(bootClasspath.files + dependencyClasspath.files).joinToString(File.pathSeparator),
"--source-path",
sourcePaths.filter { it.exists() }.joinToString(File.pathSeparator),
+ "--format=v4",
+ "--warnings-as-errors"
)
- if (commonModuleSourcePaths.isNotEmpty()) {
- args += listOf("--common-source-path", commonModuleSourcePaths.joinToString(":"))
- }
- args += listOf(
- "--format=v4",
- "--warnings-as-errors"
- )
-
pathToManifest?.let { args += listOf("--manifest", pathToManifest) }
if (outputLocation != null) {
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaTask.kt
index 17e6ba4..66e7772 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaTask.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaTask.kt
@@ -45,17 +45,13 @@
/** Android's boot classpath */
@get:Classpath lateinit var bootClasspath: FileCollection
- /** Dependencies (compiled classes) of [sourcePaths]. */
+ /** Dependencies of [sourcePaths]. */
@get:Classpath lateinit var dependencyClasspath: FileCollection
/** Source files against which API signatures will be validated. */
@get:[InputFiles PathSensitive(PathSensitivity.RELATIVE)]
var sourcePaths: FileCollection = project.files()
- /** Multiplatform source files from the module's common sourceset */
- @get:[InputFiles PathSensitive(PathSensitivity.RELATIVE)]
- var commonModuleSourcePaths: FileCollection = project.files()
-
@get:[Optional InputFile PathSensitive(PathSensitivity.NONE)]
abstract val manifestPath: RegularFileProperty
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaTasks.kt b/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaTasks.kt
index 9902dd5..38f7732 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaTasks.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaTasks.kt
@@ -210,7 +210,6 @@
private fun applyInputs(inputs: JavaCompileInputs, task: MetalavaTask) {
task.sourcePaths = inputs.sourcePaths
- task.commonModuleSourcePaths = inputs.commonModuleSourcePaths
task.dependsOn(inputs.sourcePaths)
task.dependencyClasspath = inputs.dependencyClasspath
task.bootClasspath = inputs.bootClasspath
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/metalava/RegenerateOldApisTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/metalava/RegenerateOldApisTask.kt
index 739fe9a..1dcc6f9 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/metalava/RegenerateOldApisTask.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/metalava/RegenerateOldApisTask.kt
@@ -110,14 +110,7 @@
val jars = getJars(runnerProject, mavenId)
val sources = getSources(runnerProject, mavenId + ":sources")
- return JavaCompileInputs(
- sourcePaths = sources,
- // TODO(b/330721660) parse META-INF/kotlin-project-structure-metadata.json for
- // common sources
- commonModuleSourcePaths = project.files(),
- dependencyClasspath = jars,
- bootClasspath = project.getAndroidJar()
- )
+ return JavaCompileInputs(sources, jars, project.getAndroidJar())
}
fun getJars(runnerProject: Project, mavenId: String): FileCollection {
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/metalava/UpdateBaselineTasks.kt b/buildSrc/private/src/main/kotlin/androidx/build/metalava/UpdateBaselineTasks.kt
index 47998b0..29bb09f 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/metalava/UpdateBaselineTasks.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/metalava/UpdateBaselineTasks.kt
@@ -61,7 +61,6 @@
bootClasspath,
dependencyClasspath,
sourcePaths.files.filter { it.exists() },
- commonModuleSourcePaths.files.filter { it.exists() },
null,
GenerateApiMode.PublicApi,
ApiLintMode.CheckBaseline(baselineFile, targetsJavaConsumers.get()),
diff --git a/lifecycle/lifecycle-runtime/build.gradle b/lifecycle/lifecycle-runtime/build.gradle
index 323d017..bcb9ce0 100644
--- a/lifecycle/lifecycle-runtime/build.gradle
+++ b/lifecycle/lifecycle-runtime/build.gradle
@@ -136,4 +136,5 @@
publish = Publish.SNAPSHOT_AND_RELEASE
inceptionYear "2017"
description "Android Lifecycle Runtime"
+ metalavaK2UastEnabled = true
}
diff --git a/lifecycle/lifecycle-viewmodel/api/current.txt b/lifecycle/lifecycle-viewmodel/api/current.txt
index 558185d..417a0af 100644
--- a/lifecycle/lifecycle-viewmodel/api/current.txt
+++ b/lifecycle/lifecycle-viewmodel/api/current.txt
@@ -43,8 +43,8 @@
ctor public ViewModelProvider(androidx.lifecycle.ViewModelStore store, androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras defaultCreationExtras);
ctor public ViewModelProvider(androidx.lifecycle.ViewModelStoreOwner owner);
ctor public ViewModelProvider(androidx.lifecycle.ViewModelStoreOwner owner, androidx.lifecycle.ViewModelProvider.Factory factory);
- method public static final androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStore store, optional androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
- method public static final androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStoreOwner owner, optional androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
+ method public static final androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStore store, androidx.lifecycle.ViewModelProvider.Factory factory, androidx.lifecycle.viewmodel.CreationExtras extras);
+ method public static final androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStoreOwner owner, androidx.lifecycle.ViewModelProvider.Factory factory, androidx.lifecycle.viewmodel.CreationExtras extras);
method @MainThread public operator <T extends androidx.lifecycle.ViewModel> T get(Class<T> modelClass);
method @MainThread public operator <T extends androidx.lifecycle.ViewModel> T get(String key, Class<T> modelClass);
method @MainThread public final operator <T extends androidx.lifecycle.ViewModel> T get(String key, kotlin.reflect.KClass<T> modelClass);
@@ -66,8 +66,8 @@
}
public static final class ViewModelProvider.Companion {
- method public androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStore store, optional androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
- method public androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStoreOwner owner, optional androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
+ method public androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStore store, androidx.lifecycle.ViewModelProvider.Factory factory, androidx.lifecycle.viewmodel.CreationExtras extras);
+ method public androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStoreOwner owner, androidx.lifecycle.ViewModelProvider.Factory factory, androidx.lifecycle.viewmodel.CreationExtras extras);
}
public static interface ViewModelProvider.Factory {
diff --git a/lifecycle/lifecycle-viewmodel/api/restricted_current.txt b/lifecycle/lifecycle-viewmodel/api/restricted_current.txt
index 558185d..417a0af 100644
--- a/lifecycle/lifecycle-viewmodel/api/restricted_current.txt
+++ b/lifecycle/lifecycle-viewmodel/api/restricted_current.txt
@@ -43,8 +43,8 @@
ctor public ViewModelProvider(androidx.lifecycle.ViewModelStore store, androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras defaultCreationExtras);
ctor public ViewModelProvider(androidx.lifecycle.ViewModelStoreOwner owner);
ctor public ViewModelProvider(androidx.lifecycle.ViewModelStoreOwner owner, androidx.lifecycle.ViewModelProvider.Factory factory);
- method public static final androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStore store, optional androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
- method public static final androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStoreOwner owner, optional androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
+ method public static final androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStore store, androidx.lifecycle.ViewModelProvider.Factory factory, androidx.lifecycle.viewmodel.CreationExtras extras);
+ method public static final androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStoreOwner owner, androidx.lifecycle.ViewModelProvider.Factory factory, androidx.lifecycle.viewmodel.CreationExtras extras);
method @MainThread public operator <T extends androidx.lifecycle.ViewModel> T get(Class<T> modelClass);
method @MainThread public operator <T extends androidx.lifecycle.ViewModel> T get(String key, Class<T> modelClass);
method @MainThread public final operator <T extends androidx.lifecycle.ViewModel> T get(String key, kotlin.reflect.KClass<T> modelClass);
@@ -66,8 +66,8 @@
}
public static final class ViewModelProvider.Companion {
- method public androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStore store, optional androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
- method public androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStoreOwner owner, optional androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
+ method public androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStore store, androidx.lifecycle.ViewModelProvider.Factory factory, androidx.lifecycle.viewmodel.CreationExtras extras);
+ method public androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStoreOwner owner, androidx.lifecycle.ViewModelProvider.Factory factory, androidx.lifecycle.viewmodel.CreationExtras extras);
}
public static interface ViewModelProvider.Factory {
diff --git a/lifecycle/lifecycle-viewmodel/src/androidMain/kotlin/androidx/lifecycle/ViewModelProvider.android.kt b/lifecycle/lifecycle-viewmodel/src/androidMain/kotlin/androidx/lifecycle/ViewModelProvider.android.kt
index 6909499..5e5f45f 100644
--- a/lifecycle/lifecycle-viewmodel/src/androidMain/kotlin/androidx/lifecycle/ViewModelProvider.android.kt
+++ b/lifecycle/lifecycle-viewmodel/src/androidMain/kotlin/androidx/lifecycle/ViewModelProvider.android.kt
@@ -344,7 +344,6 @@
public actual companion object {
@JvmStatic
- @Suppress("MissingJvmstatic")
public actual fun create(
owner: ViewModelStoreOwner,
factory: Factory,
@@ -352,7 +351,6 @@
): ViewModelProvider = ViewModelProvider(owner.viewModelStore, factory, extras)
@JvmStatic
- @Suppress("MissingJvmstatic")
public actual fun create(
store: ViewModelStore,
factory: Factory,
diff --git a/room/room-runtime/api/restricted_current.txt b/room/room-runtime/api/restricted_current.txt
index 7039636..4ca2f68 100644
--- a/room/room-runtime/api/restricted_current.txt
+++ b/room/room-runtime/api/restricted_current.txt
@@ -514,7 +514,7 @@
@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class TableInfo {
ctor @Deprecated public TableInfo(String name, java.util.Map<java.lang.String,androidx.room.util.TableInfo.Column> columns, java.util.Set<androidx.room.util.TableInfo.ForeignKey> foreignKeys);
- ctor public TableInfo(String name, java.util.Map<java.lang.String,androidx.room.util.TableInfo.Column> columns, java.util.Set<androidx.room.util.TableInfo.ForeignKey> foreignKeys, optional java.util.Set<androidx.room.util.TableInfo.Index>? indices);
+ ctor public TableInfo(String name, java.util.Map<java.lang.String,androidx.room.util.TableInfo.Column> columns, java.util.Set<androidx.room.util.TableInfo.ForeignKey> foreignKeys, java.util.Set<androidx.room.util.TableInfo.Index>? indices);
method @Deprecated public static androidx.room.util.TableInfo read(androidx.sqlite.db.SupportSQLiteDatabase database, String tableName);
method public static androidx.room.util.TableInfo read(androidx.sqlite.SQLiteConnection connection, String tableName);
field public static final int CREATED_FROM_DATABASE = 2; // 0x2
diff --git a/room/room-testing/api/api_lint.ignore b/room/room-testing/api/api_lint.ignore
deleted file mode 100644
index 3812179..0000000
--- a/room/room-testing/api/api_lint.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-MissingJvmstatic: androidx.room.testing.MigrationTestHelper#runMigrationsAndValidate(int, java.util.List<? extends androidx.room.migration.Migration>):
- A Kotlin method with default parameter values should be annotated with @JvmOverloads for better Java interoperability; see https://android.github.io/kotlin-guides/interop.html#function-overloads-for-defaults
diff --git a/room/room-testing/api/current.txt b/room/room-testing/api/current.txt
index 9d1d2db..becc3e0 100644
--- a/room/room-testing/api/current.txt
+++ b/room/room-testing/api/current.txt
@@ -12,7 +12,7 @@
method public void closeWhenFinished(androidx.sqlite.db.SupportSQLiteDatabase db);
method public final androidx.sqlite.SQLiteConnection createDatabase(int version);
method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public androidx.sqlite.db.SupportSQLiteDatabase createDatabase(String name, int version) throws java.io.IOException;
- method public final androidx.sqlite.SQLiteConnection runMigrationsAndValidate(int version, optional java.util.List<? extends androidx.room.migration.Migration> migrations);
+ method public final androidx.sqlite.SQLiteConnection runMigrationsAndValidate(int version, java.util.List<? extends androidx.room.migration.Migration> migrations);
method public androidx.sqlite.db.SupportSQLiteDatabase runMigrationsAndValidate(String name, int version, boolean validateDroppedTables, androidx.room.migration.Migration... migrations);
}
diff --git a/room/room-testing/api/restricted_current.txt b/room/room-testing/api/restricted_current.txt
index 9d1d2db..becc3e0 100644
--- a/room/room-testing/api/restricted_current.txt
+++ b/room/room-testing/api/restricted_current.txt
@@ -12,7 +12,7 @@
method public void closeWhenFinished(androidx.sqlite.db.SupportSQLiteDatabase db);
method public final androidx.sqlite.SQLiteConnection createDatabase(int version);
method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public androidx.sqlite.db.SupportSQLiteDatabase createDatabase(String name, int version) throws java.io.IOException;
- method public final androidx.sqlite.SQLiteConnection runMigrationsAndValidate(int version, optional java.util.List<? extends androidx.room.migration.Migration> migrations);
+ method public final androidx.sqlite.SQLiteConnection runMigrationsAndValidate(int version, java.util.List<? extends androidx.room.migration.Migration> migrations);
method public androidx.sqlite.db.SupportSQLiteDatabase runMigrationsAndValidate(String name, int version, boolean validateDroppedTables, androidx.room.migration.Migration... migrations);
}
