Merge "Upgrade lint and AGP used by lint check projects" into androidx-main
diff --git a/activity/activity-compose-lint/build.gradle b/activity/activity-compose-lint/build.gradle
index 7ace495..88a73b5 100644
--- a/activity/activity-compose-lint/build.gradle
+++ b/activity/activity-compose-lint/build.gradle
@@ -32,7 +32,7 @@
BundleInsideHelper.forInsideLintJar(project)
dependencies {
- compileOnly(libs.androidLintMinComposeApi)
+ compileOnly(libs.androidLintMinApi)
compileOnly(libs.kotlinStdlib)
bundleInside(projectOrArtifact(":compose:lint:common"))
diff --git a/activity/activity-compose-lint/src/test/java/androidx/activity/compose/lint/ApiLintVersionsTest.kt b/activity/activity-compose-lint/src/test/java/androidx/activity/compose/lint/ApiLintVersionsTest.kt
index 678b024..b43a3f6 100644
--- a/activity/activity-compose-lint/src/test/java/androidx/activity/compose/lint/ApiLintVersionsTest.kt
+++ b/activity/activity-compose-lint/src/test/java/androidx/activity/compose/lint/ApiLintVersionsTest.kt
@@ -33,6 +33,6 @@
val registry = ActivityComposeIssueRegistry()
assertThat(registry.api).isEqualTo(CURRENT_API)
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/activity/activity-lint/build.gradle b/activity/activity-lint/build.gradle
index 857884f..7dabcfd 100644
--- a/activity/activity-lint/build.gradle
+++ b/activity/activity-lint/build.gradle
@@ -29,7 +29,7 @@
}
dependencies {
- compileOnly(libs.androidBuilderModelMin)
+ compileOnly("com.android.tools.build:builder-model:8.1.0")
compileOnly(libs.androidLintMinApi)
compileOnly(libs.kotlinStdlib)
diff --git a/activity/activity-lint/src/test/java/androidx/activity/lint/ApiLintVersionsTest.kt b/activity/activity-lint/src/test/java/androidx/activity/lint/ApiLintVersionsTest.kt
index 4e977bd..4057ef2 100644
--- a/activity/activity-lint/src/test/java/androidx/activity/lint/ApiLintVersionsTest.kt
+++ b/activity/activity-lint/src/test/java/androidx/activity/lint/ApiLintVersionsTest.kt
@@ -35,6 +35,6 @@
assertThat(registry.api).isEqualTo(CURRENT_API)
// Intentionally fails in IDE, because we use different API version in
// studio and command line
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/appcompat/appcompat-lint/src/main/kotlin/androidx/appcompat/AppCompatIssueRegistry.kt b/appcompat/appcompat-lint/src/main/kotlin/androidx/appcompat/AppCompatIssueRegistry.kt
index 3f42ecbc..ec5c2f3 100644
--- a/appcompat/appcompat-lint/src/main/kotlin/androidx/appcompat/AppCompatIssueRegistry.kt
+++ b/appcompat/appcompat-lint/src/main/kotlin/androidx/appcompat/AppCompatIssueRegistry.kt
@@ -28,10 +28,11 @@
import androidx.appcompat.widget.TextViewCompoundDrawablesXmlDetector
import com.android.tools.lint.client.api.IssueRegistry
import com.android.tools.lint.client.api.Vendor
+import com.android.tools.lint.detector.api.CURRENT_API
@Suppress("UnstableApiUsage")
class AppCompatIssueRegistry : IssueRegistry() {
- override val minApi = 10 // Only compatible with the latest lint
+ override val minApi = CURRENT_API
override val api = 14
override val issues
get() =
diff --git a/appcompat/appcompat-lint/src/test/kotlin/androidx/appcompat/lint/ApiLintVersionsTest.kt b/appcompat/appcompat-lint/src/test/kotlin/androidx/appcompat/lint/ApiLintVersionsTest.kt
index 90d1cb1..69d79d8 100644
--- a/appcompat/appcompat-lint/src/test/kotlin/androidx/appcompat/lint/ApiLintVersionsTest.kt
+++ b/appcompat/appcompat-lint/src/test/kotlin/androidx/appcompat/lint/ApiLintVersionsTest.kt
@@ -37,6 +37,6 @@
// We hardcode version registry.api to the version that is used to run tests.
assertEquals("registry.api matches version used to run tests", CURRENT_API, registry.api)
// Intentionally fails in IDE, because we use different API version in Studio and CLI.
- assertEquals("registry.minApi is set to minimum level of 10", 10, registry.minApi)
+ assertEquals("registry.minApi is set to minimum level of 14", 14, registry.minApi)
}
}
diff --git a/compose/animation/animation-core-lint/build.gradle b/compose/animation/animation-core-lint/build.gradle
index fcdf271..c2b4e1a 100644
--- a/compose/animation/animation-core-lint/build.gradle
+++ b/compose/animation/animation-core-lint/build.gradle
@@ -32,7 +32,7 @@
BundleInsideHelper.forInsideLintJar(project)
dependencies {
- compileOnly libs.androidLintMinComposeApi
+ compileOnly libs.androidLintMinApi
compileOnly libs.kotlinStdlib
bundleInside(project(":compose:lint:common"))
diff --git a/compose/animation/animation-core-lint/src/test/java/androidx/compose/animation/core/lint/ApiLintVersionsTest.kt b/compose/animation/animation-core-lint/src/test/java/androidx/compose/animation/core/lint/ApiLintVersionsTest.kt
index b4fbec9..85867aa 100644
--- a/compose/animation/animation-core-lint/src/test/java/androidx/compose/animation/core/lint/ApiLintVersionsTest.kt
+++ b/compose/animation/animation-core-lint/src/test/java/androidx/compose/animation/core/lint/ApiLintVersionsTest.kt
@@ -34,6 +34,6 @@
val registry = AnimationCoreIssueRegistry()
assertThat(registry.api).isEqualTo(CURRENT_API)
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/compose/animation/animation-lint/build.gradle b/compose/animation/animation-lint/build.gradle
index ce9b351..d54be94 100644
--- a/compose/animation/animation-lint/build.gradle
+++ b/compose/animation/animation-lint/build.gradle
@@ -32,7 +32,7 @@
BundleInsideHelper.forInsideLintJar(project)
dependencies {
- compileOnly libs.androidLintMinComposeApi
+ compileOnly libs.androidLintMinApi
compileOnly libs.kotlinStdlib
bundleInside(project(":compose:lint:common"))
diff --git a/compose/animation/animation-lint/src/test/java/androidx/compose/animation/lint/ApiLintVersionsTest.kt b/compose/animation/animation-lint/src/test/java/androidx/compose/animation/lint/ApiLintVersionsTest.kt
index 3b758c0..587cd58 100644
--- a/compose/animation/animation-lint/src/test/java/androidx/compose/animation/lint/ApiLintVersionsTest.kt
+++ b/compose/animation/animation-lint/src/test/java/androidx/compose/animation/lint/ApiLintVersionsTest.kt
@@ -34,6 +34,6 @@
val registry = AnimationIssueRegistry()
assertThat(registry.api).isEqualTo(CURRENT_API)
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/compose/foundation/foundation-lint/build.gradle b/compose/foundation/foundation-lint/build.gradle
index e82ecd9..9e7d33c 100644
--- a/compose/foundation/foundation-lint/build.gradle
+++ b/compose/foundation/foundation-lint/build.gradle
@@ -32,7 +32,7 @@
BundleInsideHelper.forInsideLintJar(project)
dependencies {
- compileOnly(libs.androidLintMinComposeApi)
+ compileOnly(libs.androidLintMinApi)
compileOnly(libs.kotlinStdlib)
bundleInside(project(":compose:lint:common"))
diff --git a/compose/foundation/foundation-lint/src/test/java/androidx/compose/foundation/lint/ApiLintVersionsTest.kt b/compose/foundation/foundation-lint/src/test/java/androidx/compose/foundation/lint/ApiLintVersionsTest.kt
index 9a857e5..2f0f5ba 100644
--- a/compose/foundation/foundation-lint/src/test/java/androidx/compose/foundation/lint/ApiLintVersionsTest.kt
+++ b/compose/foundation/foundation-lint/src/test/java/androidx/compose/foundation/lint/ApiLintVersionsTest.kt
@@ -34,6 +34,6 @@
val registry = FoundationIssueRegistry()
assertThat(registry.api).isEqualTo(CURRENT_API)
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/compose/lint/common/build.gradle b/compose/lint/common/build.gradle
index 9fdd9c8..df4ccb9 100644
--- a/compose/lint/common/build.gradle
+++ b/compose/lint/common/build.gradle
@@ -29,7 +29,7 @@
}
dependencies {
- compileOnly(libs.androidLintMinComposeApi)
+ compileOnly(libs.androidLintMinApi)
compileOnly(libs.kotlinStdlib)
api(libs.kotlinMetadataJvm) { exclude group: "org.jetbrains.kotlin" }
diff --git a/compose/material/material-lint/build.gradle b/compose/material/material-lint/build.gradle
index 4c8e995..9ce4e1a 100644
--- a/compose/material/material-lint/build.gradle
+++ b/compose/material/material-lint/build.gradle
@@ -32,7 +32,7 @@
BundleInsideHelper.forInsideLintJar(project)
dependencies {
- compileOnly libs.androidLintMinComposeApi
+ compileOnly libs.androidLintMinApi
compileOnly libs.kotlinStdlib
bundleInside(project(":compose:lint:common"))
diff --git a/compose/material/material-lint/src/test/java/androidx/compose/material/lint/ApiLintVersionsTest.kt b/compose/material/material-lint/src/test/java/androidx/compose/material/lint/ApiLintVersionsTest.kt
index 0b7531f..170c861 100644
--- a/compose/material/material-lint/src/test/java/androidx/compose/material/lint/ApiLintVersionsTest.kt
+++ b/compose/material/material-lint/src/test/java/androidx/compose/material/lint/ApiLintVersionsTest.kt
@@ -34,6 +34,6 @@
val registry = MaterialIssueRegistry()
assertThat(registry.api).isEqualTo(CURRENT_API)
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/compose/material3/material3-lint/build.gradle b/compose/material3/material3-lint/build.gradle
index 233c1ae..78c355f 100644
--- a/compose/material3/material3-lint/build.gradle
+++ b/compose/material3/material3-lint/build.gradle
@@ -32,7 +32,7 @@
BundleInsideHelper.forInsideLintJar(project)
dependencies {
- compileOnly libs.androidLintMinComposeApi
+ compileOnly libs.androidLintMinApi
compileOnly libs.kotlinStdlib
bundleInside(project(":compose:lint:common"))
diff --git a/compose/material3/material3-lint/src/test/java/androidx/compose/material3/lint/ApiLintVersionsTest.kt b/compose/material3/material3-lint/src/test/java/androidx/compose/material3/lint/ApiLintVersionsTest.kt
index 6bb46ba..a6c5321 100644
--- a/compose/material3/material3-lint/src/test/java/androidx/compose/material3/lint/ApiLintVersionsTest.kt
+++ b/compose/material3/material3-lint/src/test/java/androidx/compose/material3/lint/ApiLintVersionsTest.kt
@@ -34,6 +34,6 @@
val registry = Material3IssueRegistry()
assertThat(registry.api).isEqualTo(CURRENT_API)
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/compose/runtime/runtime-saveable-lint/build.gradle b/compose/runtime/runtime-saveable-lint/build.gradle
index 5e09a4c..24676c6 100644
--- a/compose/runtime/runtime-saveable-lint/build.gradle
+++ b/compose/runtime/runtime-saveable-lint/build.gradle
@@ -32,7 +32,7 @@
BundleInsideHelper.forInsideLintJar(project)
dependencies {
- compileOnly(libs.androidLintMinComposeApi)
+ compileOnly(libs.androidLintMinApi)
compileOnly(libs.kotlinStdlib)
bundleInside(projectOrArtifact(":compose:lint:common"))
diff --git a/compose/runtime/runtime-saveable-lint/src/test/java/androidx/compose/runtime/saveable/lint/ApiLintVersionsTest.kt b/compose/runtime/runtime-saveable-lint/src/test/java/androidx/compose/runtime/saveable/lint/ApiLintVersionsTest.kt
index 1e21d66..8859c7e 100644
--- a/compose/runtime/runtime-saveable-lint/src/test/java/androidx/compose/runtime/saveable/lint/ApiLintVersionsTest.kt
+++ b/compose/runtime/runtime-saveable-lint/src/test/java/androidx/compose/runtime/saveable/lint/ApiLintVersionsTest.kt
@@ -34,6 +34,6 @@
val registry = RuntimeSaveableIssueRegistry()
assertThat(registry.api).isEqualTo(CURRENT_API)
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/compose/ui/ui-graphics-lint/build.gradle b/compose/ui/ui-graphics-lint/build.gradle
index 8583313..15a0201 100644
--- a/compose/ui/ui-graphics-lint/build.gradle
+++ b/compose/ui/ui-graphics-lint/build.gradle
@@ -32,7 +32,7 @@
BundleInsideHelper.forInsideLintJar(project)
dependencies {
- compileOnly libs.androidLintMinComposeApi
+ compileOnly libs.androidLintMinApi
compileOnly(libs.kotlinStdlib)
bundleInside(project(":compose:lint:common"))
diff --git a/compose/ui/ui-graphics-lint/src/test/java/androidx/compose/ui/graphics/lint/ApiLintVersionsTest.kt b/compose/ui/ui-graphics-lint/src/test/java/androidx/compose/ui/graphics/lint/ApiLintVersionsTest.kt
index e3f2599..7f4eee2 100644
--- a/compose/ui/ui-graphics-lint/src/test/java/androidx/compose/ui/graphics/lint/ApiLintVersionsTest.kt
+++ b/compose/ui/ui-graphics-lint/src/test/java/androidx/compose/ui/graphics/lint/ApiLintVersionsTest.kt
@@ -34,6 +34,6 @@
val registry = UiGraphicsIssueRegistry()
assertThat(registry.api).isEqualTo(CURRENT_API)
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/compose/ui/ui-test-manifest-lint/src/test/java/androix/compose/ui/test/manifest/lint/ApiLintVersionsTest.kt b/compose/ui/ui-test-manifest-lint/src/test/java/androix/compose/ui/test/manifest/lint/ApiLintVersionsTest.kt
index f04f18b..9e2cfd2 100644
--- a/compose/ui/ui-test-manifest-lint/src/test/java/androix/compose/ui/test/manifest/lint/ApiLintVersionsTest.kt
+++ b/compose/ui/ui-test-manifest-lint/src/test/java/androix/compose/ui/test/manifest/lint/ApiLintVersionsTest.kt
@@ -40,6 +40,6 @@
registry.api
)
// Since we don't publish this lint registry, minApi can match the api version.
- Assert.assertEquals("registry.minApi matches registry.api", 10, registry.minApi)
+ Assert.assertEquals("registry.minApi matches registry.api", 14, registry.minApi)
}
}
diff --git a/fragment/fragment-lint/src/main/java/androidx/fragment/lint/UseRequireInsteadOfGet.kt b/fragment/fragment-lint/src/main/java/androidx/fragment/lint/UseRequireInsteadOfGet.kt
index ec209cd..a01676a 100644
--- a/fragment/fragment-lint/src/main/java/androidx/fragment/lint/UseRequireInsteadOfGet.kt
+++ b/fragment/fragment-lint/src/main/java/androidx/fragment/lint/UseRequireInsteadOfGet.kt
@@ -193,7 +193,7 @@
// Grab the source of this argument as it's represented.
val source =
nearestNonQualifiedReferenceParent.valueArguments[0]
- .skipParenthesizedExprDown()!!
+ .skipParenthesizedExprDown()
.asSourceString()
val parentToReplace =
nearestNonQualifiedReferenceParent
diff --git a/fragment/fragment-lint/src/test/java/androidx/fragment/lint/ApiLintVersionsTest.kt b/fragment/fragment-lint/src/test/java/androidx/fragment/lint/ApiLintVersionsTest.kt
index 5ffc19a..e0acf7b 100644
--- a/fragment/fragment-lint/src/test/java/androidx/fragment/lint/ApiLintVersionsTest.kt
+++ b/fragment/fragment-lint/src/test/java/androidx/fragment/lint/ApiLintVersionsTest.kt
@@ -35,6 +35,6 @@
assertThat(registry.api).isEqualTo(CURRENT_API)
// Intentionally fails in IDE, because we use different API version in
// studio and command line
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/fragment/fragment-testing-lint/src/test/java/androidx/fragment/testing/lint/ApiLintVersionsTest.kt b/fragment/fragment-testing-lint/src/test/java/androidx/fragment/testing/lint/ApiLintVersionsTest.kt
index fc79cb6..b4d74c2 100644
--- a/fragment/fragment-testing-lint/src/test/java/androidx/fragment/testing/lint/ApiLintVersionsTest.kt
+++ b/fragment/fragment-testing-lint/src/test/java/androidx/fragment/testing/lint/ApiLintVersionsTest.kt
@@ -35,6 +35,6 @@
assertThat(registry.api).isEqualTo(CURRENT_API)
// Intentionally fails in IDE, because we use different API version in
// studio and command line
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/fragment/fragment-testing-manifest-lint/src/test/java/androidx/fragment/testing/manifest/lint/ApiLintVersionsTest.kt b/fragment/fragment-testing-manifest-lint/src/test/java/androidx/fragment/testing/manifest/lint/ApiLintVersionsTest.kt
index bc638dd..5ef7bf8b 100644
--- a/fragment/fragment-testing-manifest-lint/src/test/java/androidx/fragment/testing/manifest/lint/ApiLintVersionsTest.kt
+++ b/fragment/fragment-testing-manifest-lint/src/test/java/androidx/fragment/testing/manifest/lint/ApiLintVersionsTest.kt
@@ -35,6 +35,6 @@
assertThat(registry.api).isEqualTo(CURRENT_API)
// Intentionally fails in IDE, because we use different API version in
// studio and command line
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6420c84..3280d9c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,9 +11,7 @@
androidStudio = "2024.1.2.5"
# -----------------------------------------------------------------------------
-androidGradlePluginMin = "7.0.4"
-androidLintMin = "30.0.4"
-androidLintMinCompose = "30.0.0"
+androidLintMin = "31.1.0"
androidxTestRunner = "1.6.0-rc01"
androidxTestRules = "1.6.0-rc01"
androidxTestMonitor = "1.7.0-rc01"
@@ -67,7 +65,6 @@
[libraries]
agpTestingPlatformCoreProto = { module = "com.google.testing.platform:core-proto", version = "0.0.8-alpha08" }
androidAccessibilityFramework = { module = "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework", version = { strictly = "2.1" } }
-androidBuilderModelMin = { module = "com.android.tools.build:builder-model", version.ref = "androidGradlePluginMin" }
androidGradlePluginApi = { module = "com.android.tools.build:gradle-api", version.ref = "androidGradlePlugin" }
androidGradlePluginz = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
androidLayoutlibApi = { module = "com.android.tools.layoutlib:layoutlib-api", version.ref = "androidLint" }
@@ -75,7 +72,6 @@
androidLintMin = { module = "com.android.tools.lint:lint", version.ref = "androidLintMin" }
androidLintApi = { module = "com.android.tools.lint:lint-api", version.ref = "androidLint" }
androidLintMinApi = { module = "com.android.tools.lint:lint-api", version.ref = "androidLintMin" }
-androidLintMinComposeApi = { module = "com.android.tools.lint:lint-api", version.ref = "androidLintMinCompose" }
androidLintChecks = { module = "com.android.tools.lint:lint-checks", version.ref = "androidLint" }
androidLintChecksMin = { module = "com.android.tools.lint:lint-checks", version.ref = "androidLintMin" }
androidLintTests = { module = "com.android.tools.lint:lint-tests", version.ref = "androidLint" }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index bb895a9..217a773 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -33,13 +33,10 @@
<trust group="com.android.tools.build.jetifier" reason="b/215430394"/>
<trust group="com.android.tools.metalava" reason="developed by our own team, not signed yet"/>
<trust group="com.android.ndk.thirdparty" reason="b/215430394"/>
- <trust group="^com[.]android($|([.].*))" regex="true" version="7.0.4" reason="old version, before signing"/>
<trust group="^com[.]android($|([.].*))" regex="true" version="7.3.0" reason="old version, before signing"/>
<trust group="^com[.]android($|([.].*))" regex="true" version="8.0.0" reason="old version, before signing"/>
<trust group="^com[.]android($|([.].*))" regex="true" version="8.1.0" reason="old version, before signing"/>
<trust group="^com[.]android($|([.].*))" regex="true" version="8.5.0-alpha05" reason="old version, before signing"/>
- <trust group="^com[.]android($|([.].*))" regex="true" version="30.0.0" reason="old version, before signing"/>
- <trust group="^com[.]android($|([.].*))" regex="true" version="30.0.4" reason="old version, before signing"/>
<trust group="^com[.]android($|([.].*))" regex="true" version="30.3.0" reason="old version, before signing"/>
<trust group="^com[.]android($|([.].*))" regex="true" version="31.0.0" reason="old version, before signing"/>
<trust group="^com[.]android($|([.].*))" regex="true" version="31.1.0" reason="old version, before signing"/>
diff --git a/lifecycle/lifecycle-livedata-core-lint/src/main/java/androidx/lifecycle/lint/LiveDataCoreIssueRegistry.kt b/lifecycle/lifecycle-livedata-core-lint/src/main/java/androidx/lifecycle/lint/LiveDataCoreIssueRegistry.kt
index 1f9ec9b..a5ed954 100644
--- a/lifecycle/lifecycle-livedata-core-lint/src/main/java/androidx/lifecycle/lint/LiveDataCoreIssueRegistry.kt
+++ b/lifecycle/lifecycle-livedata-core-lint/src/main/java/androidx/lifecycle/lint/LiveDataCoreIssueRegistry.kt
@@ -18,10 +18,11 @@
import com.android.tools.lint.client.api.IssueRegistry
import com.android.tools.lint.client.api.Vendor
+import com.android.tools.lint.detector.api.CURRENT_API
@Suppress("UnstableApiUsage")
class LiveDataCoreIssueRegistry : IssueRegistry() {
- override val minApi = 10 // Only compatible with the latest lint
+ override val minApi = CURRENT_API
override val api = 14
override val issues
get() = listOf(NonNullableMutableLiveDataDetector.ISSUE)
diff --git a/lifecycle/lifecycle-livedata-core-lint/src/test/java/androidx/lifecycle/livedata/core/lint/ApiLintVersionsTest.kt b/lifecycle/lifecycle-livedata-core-lint/src/test/java/androidx/lifecycle/livedata/core/lint/ApiLintVersionsTest.kt
index 8c252b8..239322b 100644
--- a/lifecycle/lifecycle-livedata-core-lint/src/test/java/androidx/lifecycle/livedata/core/lint/ApiLintVersionsTest.kt
+++ b/lifecycle/lifecycle-livedata-core-lint/src/test/java/androidx/lifecycle/livedata/core/lint/ApiLintVersionsTest.kt
@@ -37,6 +37,6 @@
// We hardcode version registry.api to the version that is used to run tests.
assertEquals("registry.api matches version used to run tests", CURRENT_API, registry.api)
// Intentionally fails in IDE, because we use different API version in Studio and CLI.
- assertEquals("registry.minApi is set to minimum level of 10", 10, registry.minApi)
+ assertEquals("registry.minApi is set to minimum level of 14", 14, registry.minApi)
}
}
diff --git a/lifecycle/lifecycle-runtime-lint/src/test/java/androidx/lifecycle/runtime/lint/ApiLintVersionsTest.kt b/lifecycle/lifecycle-runtime-lint/src/test/java/androidx/lifecycle/runtime/lint/ApiLintVersionsTest.kt
index 70c1464..8668b5e 100644
--- a/lifecycle/lifecycle-runtime-lint/src/test/java/androidx/lifecycle/runtime/lint/ApiLintVersionsTest.kt
+++ b/lifecycle/lifecycle-runtime-lint/src/test/java/androidx/lifecycle/runtime/lint/ApiLintVersionsTest.kt
@@ -36,6 +36,6 @@
Assert.assertEquals(CURRENT_API, registry.api)
// Intentionally fails in IDE, because we use different API version in
// studio and command line
- Assert.assertEquals(10, registry.minApi)
+ Assert.assertEquals(14, registry.minApi)
}
}
diff --git a/lifecycle/lifecycle-runtime-testing-lint/src/test/java/androidx/lifecycle/runtime/testing/lint/ApiLintVersionsTest.kt b/lifecycle/lifecycle-runtime-testing-lint/src/test/java/androidx/lifecycle/runtime/testing/lint/ApiLintVersionsTest.kt
index 16a50360..9e0a9ee 100644
--- a/lifecycle/lifecycle-runtime-testing-lint/src/test/java/androidx/lifecycle/runtime/testing/lint/ApiLintVersionsTest.kt
+++ b/lifecycle/lifecycle-runtime-testing-lint/src/test/java/androidx/lifecycle/runtime/testing/lint/ApiLintVersionsTest.kt
@@ -36,6 +36,6 @@
Assert.assertEquals(CURRENT_API, registry.api)
// Intentionally fails in IDE, because we use different API version in
// studio and command line
- Assert.assertEquals(10, registry.minApi)
+ Assert.assertEquals(14, registry.minApi)
}
}
diff --git a/navigation/navigation-common-lint/src/test/java/androidx/navigation/common/lint/ApiLintVersionsTest.kt b/navigation/navigation-common-lint/src/test/java/androidx/navigation/common/lint/ApiLintVersionsTest.kt
index db5df70..7b89e6c 100644
--- a/navigation/navigation-common-lint/src/test/java/androidx/navigation/common/lint/ApiLintVersionsTest.kt
+++ b/navigation/navigation-common-lint/src/test/java/androidx/navigation/common/lint/ApiLintVersionsTest.kt
@@ -31,6 +31,6 @@
val registry = NavigationCommonIssueRegistry()
assertThat(registry.api).isEqualTo(CURRENT_API)
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/navigation/navigation-compose-lint/build.gradle b/navigation/navigation-compose-lint/build.gradle
index 74f87b8..2aad4a6 100644
--- a/navigation/navigation-compose-lint/build.gradle
+++ b/navigation/navigation-compose-lint/build.gradle
@@ -32,7 +32,7 @@
BundleInsideHelper.forInsideLintJar(project)
dependencies {
- compileOnly(libs.androidLintMinComposeApi)
+ compileOnly(libs.androidLintMinApi)
compileOnly(libs.kotlinStdlib)
bundleInside(projectOrArtifact(":compose:lint:common"))
diff --git a/navigation/navigation-runtime-lint/src/test/java/androidx/navigation/runtime/lint/ApiLintVersionsTest.kt b/navigation/navigation-runtime-lint/src/test/java/androidx/navigation/runtime/lint/ApiLintVersionsTest.kt
index 64f4740..6714f3d 100644
--- a/navigation/navigation-runtime-lint/src/test/java/androidx/navigation/runtime/lint/ApiLintVersionsTest.kt
+++ b/navigation/navigation-runtime-lint/src/test/java/androidx/navigation/runtime/lint/ApiLintVersionsTest.kt
@@ -31,6 +31,6 @@
val registry = NavigationRuntimeIssueRegistry()
assertThat(registry.api).isEqualTo(CURRENT_API)
- assertThat(registry.minApi).isEqualTo(10)
+ assertThat(registry.minApi).isEqualTo(14)
}
}
diff --git a/recyclerview/recyclerview-lint/src/test/java/androidx/recyclerview/lint/ApiLintVersionsTest.kt b/recyclerview/recyclerview-lint/src/test/java/androidx/recyclerview/lint/ApiLintVersionsTest.kt
index cae6708..4b926be 100644
--- a/recyclerview/recyclerview-lint/src/test/java/androidx/recyclerview/lint/ApiLintVersionsTest.kt
+++ b/recyclerview/recyclerview-lint/src/test/java/androidx/recyclerview/lint/ApiLintVersionsTest.kt
@@ -36,6 +36,6 @@
// We hardcode version registry.api to the version that is used to run tests.
assertEquals("registry.api matches version used to run tests", CURRENT_API, registry.api)
// Intentionally fails in IDE, because we use different API version in Studio and CLI.
- assertEquals("registry.minApi is set to minimum level of 10", 10, registry.minApi)
+ assertEquals("registry.minApi is set to minimum level of 14", 14, registry.minApi)
}
}
diff --git a/startup/startup-runtime-lint/src/test/java/androidx/startup/lint/ApiLintVersionsTest.kt b/startup/startup-runtime-lint/src/test/java/androidx/startup/lint/ApiLintVersionsTest.kt
index 596f449..78a293b 100644
--- a/startup/startup-runtime-lint/src/test/java/androidx/startup/lint/ApiLintVersionsTest.kt
+++ b/startup/startup-runtime-lint/src/test/java/androidx/startup/lint/ApiLintVersionsTest.kt
@@ -36,6 +36,6 @@
// We hardcode version registry.api to the version that is used to run tests.
assertEquals("registry.api matches version used to run tests", CURRENT_API, registry.api)
// Intentionally fails in IDE, because we use different API version in Studio and CLI.
- assertEquals("registry.minApi is set to minimum level of 10", 10, registry.minApi)
+ assertEquals("registry.minApi is set to minimum level of 14", 14, registry.minApi)
}
}
diff --git a/work/work-lint/src/test/java/androidx/work/lint/ApiLintVersionsTest.kt b/work/work-lint/src/test/java/androidx/work/lint/ApiLintVersionsTest.kt
index 372dbc7..a491e8d 100644
--- a/work/work-lint/src/test/java/androidx/work/lint/ApiLintVersionsTest.kt
+++ b/work/work-lint/src/test/java/androidx/work/lint/ApiLintVersionsTest.kt
@@ -36,6 +36,6 @@
// We hardcode version registry.api to the version that is used to run tests.
assertEquals("registry.api matches version used to run tests", CURRENT_API, registry.api)
// Intentionally fails in IDE, because we use different API version in Studio and CLI.
- assertEquals("registry.minApi is set to minimum level of 10", 10, registry.minApi)
+ assertEquals("registry.minApi is set to minimum level of 14", 14, registry.minApi)
}
}
