Upgrade to AGP 7.1.0-beta01.
Test: ./gradlew bOS
Change-Id: I85cd268c5627e16bfa9d0804e0611da6d3905dab
diff --git a/annotation/annotation-experimental-lint/src/test/kotlin/androidx/annotation/experimental/lint/RequiresOptInDetectorTest.kt b/annotation/annotation-experimental-lint/src/test/kotlin/androidx/annotation/experimental/lint/RequiresOptInDetectorTest.kt
index 7d64b72..c618fc3 100644
--- a/annotation/annotation-experimental-lint/src/test/kotlin/androidx/annotation/experimental/lint/RequiresOptInDetectorTest.kt
+++ b/annotation/annotation-experimental-lint/src/test/kotlin/androidx/annotation/experimental/lint/RequiresOptInDetectorTest.kt
@@ -86,16 +86,22 @@
src/sample/optin/UseJavaExperimentalClassFromJava.java:31: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
AnnotatedJavaClass experimentalObject = new AnnotatedJavaClass();
~~~~~~~~~~~~~~~~~~~~~~~~
+src/sample/optin/UseJavaExperimentalClassFromJava.java:32: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
+ return experimentalObject.field;
+ ~~~~~
src/sample/optin/UseJavaExperimentalClassFromJava.java:39: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
AnnotatedJavaClass experimentalObject = new AnnotatedJavaClass();
~~~~~~~~~~~~~~~~~~~~~~~~
src/sample/optin/UseJavaExperimentalClassFromJava.java:40: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
return experimentalObject.method();
~~~~~~
+src/sample/optin/UseJavaExperimentalClassFromJava.java:47: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
+ return AnnotatedJavaClass.FIELD_STATIC;
+ ~~~~~~~~~~~~
src/sample/optin/UseJavaExperimentalClassFromJava.java:54: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
return AnnotatedJavaClass.methodStatic();
~~~~~~~~~~~~
-4 errors, 0 warnings
+6 errors, 0 warnings
""".trimIndent()
/* ktlint-enable max-line-length */
@@ -117,7 +123,10 @@
src/sample/optin/UseJavaExperimentalMultipleMarkersFromJava.java:33: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation2 or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation2.class) [UnsafeOptInUsageError]
AnnotatedJavaClass2 experimentalObject2 = new AnnotatedJavaClass2();
~~~~~~~~~~~~~~~~~~~~~~~~~
-1 errors, 0 warnings
+src/sample/optin/UseJavaExperimentalMultipleMarkersFromJava.java:34: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation2 or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation2.class) [UnsafeOptInUsageError]
+ return experimentalObject.method() + experimentalObject2.field;
+ ~~~~~
+2 errors, 0 warnings
""".trimIndent()
/* ktlint-enable max-line-length */
@@ -140,12 +149,18 @@
src/sample/optin/UseJavaExperimentalFromKt.kt:28: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
val experimentalObject = AnnotatedJavaClass()
~~~~~~~~~~~~~~~~~~
+src/sample/optin/UseJavaExperimentalFromKt.kt:29: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
+ return experimentalObject.field
+ ~~~~~
src/sample/optin/UseJavaExperimentalFromKt.kt:36: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
val experimentalObject = AnnotatedJavaClass()
~~~~~~~~~~~~~~~~~~
src/sample/optin/UseJavaExperimentalFromKt.kt:37: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
return experimentalObject.method()
~~~~~~
+src/sample/optin/UseJavaExperimentalFromKt.kt:44: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
+ return AnnotatedJavaClass.FIELD_STATIC
+ ~~~~~~~~~~~~
src/sample/optin/UseJavaExperimentalFromKt.kt:51: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
return AnnotatedJavaClass.methodStatic()
~~~~~~~~~~~~
@@ -161,7 +176,10 @@
src/sample/optin/UseJavaExperimentalFromKt.kt:99: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
return AnnotatedJavaMembers.methodStatic()
~~~~~~~~~~~~
-8 errors, 0 warnings
+src/sample/optin/UseJavaExperimentalFromKt.kt:108: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation2 or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation2.class) [UnsafeOptInUsageError]
+ return experimentalObject.method() + AnnotatedJavaClass2.FIELD_STATIC
+ ~~~~~~~~~~~~
+11 errors, 0 warnings
""".trimIndent()
/* ktlint-enable max-line-length */
@@ -188,6 +206,9 @@
src/sample/optin/UseKtExperimentalFromJava.java:29: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalKotlinAnnotation or @OptIn(markerClass = sample.optin.ExperimentalKotlinAnnotation.class) [UnsafeOptInUsageError]
return experimentalObject.method();
~~~~~~
+src/sample/optin/UseKtExperimentalFromJava.java:56: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalKotlinAnnotation2 or @OptIn(markerClass = sample.optin.ExperimentalKotlinAnnotation2.class) [UnsafeOptInUsageError]
+ return experimentalObject.method() + AnnotatedKotlinClass2.fieldStatic;
+ ~~~~~~~~~~~
src/sample/optin/UseKtExperimentalFromJava.java:97: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalKotlinAnnotation or @OptIn(markerClass = sample.optin.ExperimentalKotlinAnnotation.class) [UnsafeOptInUsageError]
AnnotatedKotlinMembers.methodStatic();
~~~~~~~~~~~~
@@ -200,7 +221,7 @@
src/sample/optin/UseKtExperimentalFromJava.java:108: Error: This declaration is opt-in and its usage should be marked with @sample.optin.ExperimentalJavaAnnotation or @OptIn(markerClass = sample.optin.ExperimentalJavaAnnotation.class) [UnsafeOptInUsageError]
new AnnotatedKotlinMembers().methodWithJavaMarker();
~~~~~~~~~~~~~~~~~~~~
-6 errors, 0 warnings
+7 errors, 0 warnings
""".trimIndent()
/* ktlint-enable max-line-length */
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt b/buildSrc/private/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt
index 4503a9f..bb68b35 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt
@@ -131,14 +131,38 @@
":camera:integration-tests:camera-testapp-view:GenerateTestConfigurationdebugAndroidTest",
":camera:integration-tests:camera-testapp-view:mergeLibDexDebug",
":camera:integration-tests:camera-testapp-view:packageDebug",
- "configureCMakeDebug",
- "buildCMakeDebug",
- "configureCMakeRelWithDebInfo",
- "buildCMakeRelWithDebInfo",
- ":appsearch:appsearch-local-storage:buildCMakeDebug[icing]",
- ":appsearch:appsearch-local-storage:buildCMakeRelWithDebInfo[icing]",
- ":external:libyuv:buildCMakeDebug[yuv]",
- ":external:libyuv:buildCMakeRelWithDebInfo[yuv]",
+ "configureCMakeDebug[armeabi-v7a]",
+ "configureCMakeDebug[arm64-v8a]",
+ "configureCMakeDebug[x86]",
+ "configureCMakeDebug[x86_64]",
+ "buildCMakeDebug[armeabi-v7a]",
+ "buildCMakeDebug[arm64-v8a]",
+ "buildCMakeDebug[x86]",
+ "buildCMakeDebug[x86_64]",
+ "configureCMakeRelWithDebInfo[armeabi-v7a]",
+ "configureCMakeRelWithDebInfo[arm64-v8a]",
+ "configureCMakeRelWithDebInfo[x86]",
+ "configureCMakeRelWithDebInfo[x86_64]",
+ "buildCMakeRelWithDebInfo[armeabi-v7a]",
+ "buildCMakeRelWithDebInfo[arm64-v8a]",
+ "buildCMakeRelWithDebInfo[x86]",
+ "buildCMakeRelWithDebInfo[x86_64]",
+ ":appsearch:appsearch-local-storage:buildCMakeDebug[armeabi-v7a][icing]",
+ ":appsearch:appsearch-local-storage:buildCMakeDebug[arm64-v8a][icing]",
+ ":appsearch:appsearch-local-storage:buildCMakeDebug[x86][icing]",
+ ":appsearch:appsearch-local-storage:buildCMakeDebug[x86_64][icing]",
+ ":appsearch:appsearch-local-storage:buildCMakeRelWithDebInfo[armeabi-v7a][icing]",
+ ":appsearch:appsearch-local-storage:buildCMakeRelWithDebInfo[arm64-v8a][icing]",
+ ":appsearch:appsearch-local-storage:buildCMakeRelWithDebInfo[x86][icing]",
+ ":appsearch:appsearch-local-storage:buildCMakeRelWithDebInfo[x86_64][icing]",
+ ":external:libyuv:buildCMakeDebug[armeabi-v7a][yuv]",
+ ":external:libyuv:buildCMakeDebug[arm64-v8a][yuv]",
+ ":external:libyuv:buildCMakeDebug[x86][yuv]",
+ ":external:libyuv:buildCMakeDebug[x86_64][yuv]",
+ ":external:libyuv:buildCMakeRelWithDebInfo[armeabi-v7a][yuv]",
+ ":external:libyuv:buildCMakeRelWithDebInfo[arm64-v8a][yuv]",
+ ":external:libyuv:buildCMakeRelWithDebInfo[x86][yuv]",
+ ":external:libyuv:buildCMakeRelWithDebInfo[x86_64][yuv]",
":hilt:hilt-navigation-compose:kaptGenerateStubsDebugKotlin",
":hilt:hilt-navigation-compose:kaptGenerateStubsReleaseKotlin",
":lint-checks:integration-tests:copyDebugAndroidLintReports",
diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle
index 26487d1..7759d0a 100644
--- a/camera/camera-core/build.gradle
+++ b/camera/camera-core/build.gradle
@@ -66,17 +66,6 @@
androidTestImplementation(project(":internal-testutils-truth"))
}
-// Needed for the above compileOnly(project(':external:libyuv')) dep to work around b/194735614
-afterEvaluate {
- tasks.named("configureCMakeDebug").configure {
- dependsOn(":external:libyuv:prefabDebugPackage")
- }
-
- tasks.named("configureCMakeRelWithDebInfo").configure {
- dependsOn(":external:libyuv:prefabReleasePackage")
- }
-}
-
android {
defaultConfig {
multiDexEnabled = true
diff --git a/compose/ui/ui-lint/src/test/java/androidx/compose/ui/lint/ComposedModifierDetectorTest.kt b/compose/ui/ui-lint/src/test/java/androidx/compose/ui/lint/ComposedModifierDetectorTest.kt
index 2a11064..68036e2 100644
--- a/compose/ui/ui-lint/src/test/java/androidx/compose/ui/lint/ComposedModifierDetectorTest.kt
+++ b/compose/ui/ui-lint/src/test/java/androidx/compose/ui/lint/ComposedModifierDetectorTest.kt
@@ -21,6 +21,7 @@
import androidx.compose.lint.test.Stubs
import androidx.compose.lint.test.compiledStub
import com.android.tools.lint.checks.infrastructure.LintDetectorTest
+import com.android.tools.lint.checks.infrastructure.TestMode
import com.android.tools.lint.detector.api.Detector
import com.android.tools.lint.detector.api.Issue
import org.junit.Test
@@ -137,6 +138,7 @@
Stubs.Composable,
Stubs.Modifier
)
+ .skipTestModes(TestMode.WHITESPACE) // b/202187519, remove when upgrading to 7.1.0
.run()
.expect(
"""
@@ -226,6 +228,7 @@
Stubs.Modifier,
Stubs.Remember
)
+ .skipTestModes(TestMode.WHITESPACE) // b/202187519, remove when upgrading to 7.1.0
.run()
.expectClean()
}
diff --git a/development/build_log_simplifier/messages.ignore b/development/build_log_simplifier/messages.ignore
index 3839e03..bbf365b 100644
--- a/development/build_log_simplifier/messages.ignore
+++ b/development/build_log_simplifier/messages.ignore
@@ -215,8 +215,10 @@
\$SUPPORT/compose/runtime/runtime/compose\-runtime\-benchmark/src/androidTest/AndroidManifest\.xml:[0-9]+:[0-9]+\-[0-9]+:[0-9]+ Warning:
# > Task :compose:ui:ui:compileKotlinMetadata
w: Runtime JAR files in the classpath should have the same version\. These files were found in the classpath:
+\$CHECKOUT/prebuilts/androidx/external/org/jetbrains/kotlin/kotlin\-reflect/[0-9]+\.[0-9]+\.[0-9]+/kotlin\-reflect\-[0-9]+\.[0-9]+\.[0-9]+\.jar \(version [0-9]+\.[0-9]+\)
\$CHECKOUT/prebuilts/androidx/external/org/jetbrains/kotlin/kotlin\-stdlib/[0-9]+\.[0-9]+\.[0-9]+-?[A-Z0-9]*/kotlin\-stdlib\-[0-9]+\.[0-9]+\.[0-9]+-?[A-Z0-9]*\.jar \(version [0-9]+\.[0-9]+-?[A-Z0-9]*\)
\$CHECKOUT/prebuilts/androidx/external/org/jetbrains/kotlin/kotlin\-stdlib\-common/[0-9]+\.[0-9]+\.[0-9]+-?[A-Z0-9]*/kotlin\-stdlib\-common\-[0-9]+\.[0-9]+\.[0-9]+-?[A-Z0-9]*\.jar \(version [0-9]+\.[0-9]+-?[A-Z0-9]*\)
+w: Consider providing an explicit dependency on kotlin\-reflect [0-9]+\.[0-9]+ to prevent strange errors
w: Some runtime JAR files in the classpath have an incompatible version\. Consider removing them from the classpath
w: \$SUPPORT/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/DepthSortedSet\.kt: \([0-9]+, [0-9]+\): The corresponding parameter in the supertype 'Comparator' is named 'a'\. This may cause problems when calling this function with named arguments\.
w: \$SUPPORT/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/DepthSortedSet\.kt: \([0-9]+, [0-9]+\): The corresponding parameter in the supertype 'Comparator' is named 'b'\. This may cause problems when calling this function with named arguments\.
@@ -301,6 +303,8 @@
\$SUPPORT/benchmark/integration\-tests/startup\-benchmark/src/androidTest/AndroidManifest\.xml:[0-9]+:[0-9]+\-[0-9]+:[0-9]+ Warning:
# > Task :leanback:leanback-paging:generateApi
w\: Runtime JAR files in the classpath have the version [0-9]+\.[0-9]+\, which is older than the API version [0-9]+\.[0-9]+\. Consider using the runtime of version [0-9]+\.[0-9]+\, or pass \'\-api\-version [0-9]+\.[0-9]+\' explicitly to restrict the available APIs to the runtime of version [0-9]+\.[0-9]+\. You can also pass \'\-language\-version [0-9]+\.[0-9]+\' instead\, which will restrict not only the APIs to the specified version\, but also the language features
+w: \$CHECKOUT/prebuilts/androidx/external/org/jetbrains/kotlin/kotlin\-stdlib\-jdk[0-9]+/[0-9]+\.[0-9]+\.[0-9]+/kotlin\-stdlib\-jdk[0-9]+\-[0-9]+\.[0-9]+\.[0-9]+\.jar: Runtime JAR file has version [0-9]+\.[0-9]+ which is older than required for API version [0-9]+\.[0-9]+
+w: \$CHECKOUT/prebuilts/androidx/external/org/jetbrains/kotlin/kotlin\-reflect/[0-9]+\.[0-9]+\.[0-9]+/kotlin\-reflect\-[0-9]+\.[0-9]+\.[0-9]+\.jar: Runtime JAR file has version [0-9]+\.[0-9]+ which is older than required for API version [0-9]+\.[0-9]+
w\: \$CHECKOUT\/prebuilts\/androidx\/external\/org\/jetbrains\/kotlin\/kotlin\-stdlib\/[0-9]+\.[0-9]+\.[0-9]+\/kotlin\-stdlib\-[0-9]+\.[0-9]+\.[0-9]+\.jar\: Runtime JAR file has version [0-9]+\.[0-9]+ which is older than required for API version [0-9]+\.[0-9]+
w\: \$CHECKOUT\/prebuilts\/androidx\/external\/org\/jetbrains\/kotlin\/kotlin\-stdlib\-common\/[0-9]+\.[0-9]+\.[0-9]+\/kotlin\-stdlib\-common\-[0-9]+\.[0-9]+\.[0-9]+\.jar\: Runtime JAR file has version [0-9]+\.[0-9]+ which is older than required for API version [0-9]+\.[0-9]+
# > Task :compose:material:material:icons:generator:zipHtmlResultsOfTest
diff --git a/development/update_studio.sh b/development/update_studio.sh
index 978e9b2..c19ecc2 100755
--- a/development/update_studio.sh
+++ b/development/update_studio.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Get versions
-AGP_VERSION=${1:-7.1.0-alpha08}
-STUDIO_VERSION_STRING=${2:-"Android Studio Bumblebee (2021.1.1) Canary 8"}
+AGP_VERSION=${1:-7.1.0-beta01}
+STUDIO_VERSION_STRING=${2:-"Android Studio Bumblebee (2021.1.1) Beta 1"}
STUDIO_IFRAME_LINK=`curl "https://developer.android.com/studio/archive.html" | grep iframe | sed "s/.*src=\"\([a-zA-Z0-9\/\._]*\)\".*/https:\/\/android-dot-devsite-v2-prod.appspot.com\1/g"`
STUDIO_LINK=`curl -s $STUDIO_IFRAME_LINK | grep -C30 "$STUDIO_VERSION_STRING" | grep Linux | tail -n 1 | sed 's/.*a href="\(.*\).*"/\1/g'`
STUDIO_VERSION=`echo $STUDIO_LINK | sed "s/.*ide-zips\/\(.*\)\/android-studio-.*/\1/g"`
diff --git a/external/libyuv/build.gradle b/external/libyuv/build.gradle
index 4bc70ac..cfe4d03 100644
--- a/external/libyuv/build.gradle
+++ b/external/libyuv/build.gradle
@@ -52,4 +52,17 @@
name "yuv"
}
}
+}
+
+// Entire block is to workaround b/203448887
+afterEvaluate {
+ tasks.named("bundleDebugLocalLintAar").configure {
+ it.dependsOn("prefabDebugConfigurePackage")
+ }
+ tasks.named("bundleReleaseAar").configure {
+ it.dependsOn("prefabReleaseConfigurePackage")
+ }
+ tasks.named("reportLibraryMetrics").configure {
+ it.dependsOn("prefabReleaseConfigurePackage")
+ }
}
\ No newline at end of file
diff --git a/fragment/fragment-lint/src/test/java/androidx/fragment/lint/UseGetLayoutInflaterTest.kt b/fragment/fragment-lint/src/test/java/androidx/fragment/lint/UseGetLayoutInflaterTest.kt
index 79c3c9e..44ab7be 100644
--- a/fragment/fragment-lint/src/test/java/androidx/fragment/lint/UseGetLayoutInflaterTest.kt
+++ b/fragment/fragment-lint/src/test/java/androidx/fragment/lint/UseGetLayoutInflaterTest.kt
@@ -18,6 +18,7 @@
import androidx.fragment.lint.stubs.DIALOG_FRAGMENT
import com.android.tools.lint.checks.infrastructure.LintDetectorTest
+import com.android.tools.lint.checks.infrastructure.TestMode
import com.android.tools.lint.detector.api.Detector
import com.android.tools.lint.detector.api.Issue
import org.junit.Test
@@ -160,6 +161,7 @@
fun `java expect fail dialog fragment with fix`() {
lint().files(dialogFragmentStubJava)
.allowCompilationErrors(true) // b/193540422
+ .skipTestModes(TestMode.WHITESPACE) // b/203246909
.run()
.expect(
"""
diff --git a/fragment/fragment-lint/src/test/java/androidx/fragment/lint/UseRequireInsteadOfGetTest.kt b/fragment/fragment-lint/src/test/java/androidx/fragment/lint/UseRequireInsteadOfGetTest.kt
index 5e96cad..656ae16 100644
--- a/fragment/fragment-lint/src/test/java/androidx/fragment/lint/UseRequireInsteadOfGetTest.kt
+++ b/fragment/fragment-lint/src/test/java/androidx/fragment/lint/UseRequireInsteadOfGetTest.kt
@@ -20,6 +20,7 @@
import com.android.tools.lint.checks.infrastructure.LintDetectorTest.kotlin
import com.android.tools.lint.checks.infrastructure.TestLintTask
import com.android.tools.lint.checks.infrastructure.TestLintTask.lint
+import com.android.tools.lint.checks.infrastructure.TestMode
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
@@ -140,6 +141,7 @@
).indented()
)
.allowCompilationErrors(false)
+ .skipTestModes(TestMode.WHITESPACE) // b/203246909
.run()
.expect(
"""
@@ -256,6 +258,7 @@
).indented()
)
.allowCompilationErrors(false)
+ .skipTestModes(TestMode.WHITESPACE) // b/203246909
.run()
.expect(
"""
@@ -339,6 +342,7 @@
).indented()
)
.allowCompilationErrors(false)
+ .skipTestModes(TestMode.WHITESPACE) // b/203246909
.run()
.expect(
"""
@@ -450,6 +454,7 @@
).indented()
)
.allowCompilationErrors(false)
+ .skipTestModes(TestMode.WHITESPACE) // b/203246909
.run()
.expect(
"""
@@ -679,6 +684,7 @@
).indented()
)
.allowCompilationErrors(false)
+ .skipTestModes(TestMode.WHITESPACE) // b/203246909
.run()
.expect(
"""
@@ -719,6 +725,7 @@
).indented()
)
.allowCompilationErrors(false)
+ .skipTestModes(TestMode.WHITESPACE) // b/203246909
.run()
.expect(
"""
@@ -828,6 +835,7 @@
).indented()
)
.allowCompilationErrors(false)
+ .skipTestModes(TestMode.WHITESPACE) // b/203246909
.run()
.expect(
"""
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 970508f..6e2ed6c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,13 +2,13 @@
# -----------------------------------------------------------------------------
# All of the following should be updated in sync.
# -----------------------------------------------------------------------------
-androidGradlePlugin = "7.1.0-alpha08"
+androidGradlePlugin = "7.1.0-beta01"
# NOTE: When updating the lint version we also need to update the `api` version
# supported by `IssueRegistry`'s.' For e.g. r.android.com/1331903
-androidLint = "30.1.0-alpha08"
+androidLint = "30.1.0-beta01"
# Once you have a chosen version of AGP to upgrade to, go to
# https://developer.android.com/studio/archive and find the matching version of Studio.
-androidStudio = "2021.1.1.8"
+androidStudio = "2021.1.1.14"
# -----------------------------------------------------------------------------
androidLintMin = "27.2.1"
diff --git a/lifecycle/lifecycle-livedata-core-ktx-lint/src/test/java/androidx/lifecycle/livedata/core/lint/NonNullableMutableLiveDataDetectorTest.kt b/lifecycle/lifecycle-livedata-core-ktx-lint/src/test/java/androidx/lifecycle/livedata/core/lint/NonNullableMutableLiveDataDetectorTest.kt
index b6c0412..f6e42c3 100644
--- a/lifecycle/lifecycle-livedata-core-ktx-lint/src/test/java/androidx/lifecycle/livedata/core/lint/NonNullableMutableLiveDataDetectorTest.kt
+++ b/lifecycle/lifecycle-livedata-core-ktx-lint/src/test/java/androidx/lifecycle/livedata/core/lint/NonNullableMutableLiveDataDetectorTest.kt
@@ -23,6 +23,7 @@
import com.android.tools.lint.checks.infrastructure.LintDetectorTest
import com.android.tools.lint.checks.infrastructure.TestFile
import com.android.tools.lint.checks.infrastructure.TestLintResult
+import com.android.tools.lint.checks.infrastructure.TestMode
import com.android.tools.lint.detector.api.Detector
import com.android.tools.lint.detector.api.Issue
import org.junit.Ignore
@@ -39,6 +40,7 @@
private fun check(vararg files: TestFile): TestLintResult {
return lint().files(*files, *STUBS)
+ .skipTestModes(TestMode.WHITESPACE) // b/203246682
.run()
}
diff --git a/lifecycle/lifecycle-runtime-ktx-lint/src/test/java/androidx/lifecycle/runtime/lint/LifecycleWhenChecksTest.kt b/lifecycle/lifecycle-runtime-ktx-lint/src/test/java/androidx/lifecycle/runtime/lint/LifecycleWhenChecksTest.kt
index c264180..dbba1ac 100644
--- a/lifecycle/lifecycle-runtime-ktx-lint/src/test/java/androidx/lifecycle/runtime/lint/LifecycleWhenChecksTest.kt
+++ b/lifecycle/lifecycle-runtime-ktx-lint/src/test/java/androidx/lifecycle/runtime/lint/LifecycleWhenChecksTest.kt
@@ -24,6 +24,7 @@
import com.android.tools.lint.checks.infrastructure.TestFiles.kt
import com.android.tools.lint.checks.infrastructure.TestLintResult
import com.android.tools.lint.checks.infrastructure.TestLintTask
+import com.android.tools.lint.checks.infrastructure.TestMode
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
@@ -35,6 +36,7 @@
return TestLintTask.lint()
.files(VIEW_STUB, LIFECYCLE_STUB, COROUTINES_STUB, kt(template(body)))
.allowCompilationErrors(true) // b/193267317
+ .skipTestModes(TestMode.IF_TO_WHEN) // b/203245752
.issues(ISSUE)
.run()
}
diff --git a/room/room-compiler/lint-baseline.xml b/room/room-compiler/lint-baseline.xml
index 0867719..9f067b1 100644
--- a/room/room-compiler/lint-baseline.xml
+++ b/room/room-compiler/lint-baseline.xml
@@ -1,4 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.2.0-dev" type="baseline" client="gradle" dependencies="false" name="AGP (7.2.0-dev)" variant="all" version="7.2.0-dev">
+<issues format="6" by="lint 7.1.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (7.1.0-beta01)" variant="all" version="7.1.0-beta01">
+
+ <issue
+ id="VisibleForTests"
+ message="This method should only be accessed from tests or within private scope"
+ errorLine1=" val candidate = NullSafeTypeConverter(delegate = converter)"
+ errorLine2=" ~~~~~~~~~">
+ <location
+ file="src/main/kotlin/androidx/room/solver/NullAwareTypeConverterStore.kt"
+ line="60"
+ column="66"/>
+ </issue>
</issues>
