Merge "Upgrade to Android Lint 30.3.0-alpha01" am: baaa0e6929 am: 6468285312 am: 0cf852e1d3
Original change: https://android-review.googlesource.com/c/platform/tools/metalava/+/1972360
Change-Id: I67070833539f7e1f68d011863bd70eb6f3d8150f
diff --git a/Android.bp b/Android.bp
index 921deaf..d573be9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,6 +24,8 @@
],
java_resource_dirs: ["src/main/resources/"],
static_libs: [
+ "jsr305",
+ "jsr330",
"kotlin-reflect",
"metalava-tools-common-m2-deps",
"metalava-gradle-plugin-deps",
diff --git a/build.gradle.kts b/build.gradle.kts
index e8353bb..3e5539f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -67,7 +67,7 @@
logger.warn("Building using custom $customLintVersion version of Android Lint")
customLintVersion
} else {
- "30.1.0-alpha13"
+ "30.3.0-alpha01"
}
val kotlinVersion: String = "1.6.10"
diff --git a/src/test/java/com/android/tools/metalava/OptionsTest.kt b/src/test/java/com/android/tools/metalava/OptionsTest.kt
index a160cc9..0906e15 100644
--- a/src/test/java/com/android/tools/metalava/OptionsTest.kt
+++ b/src/test/java/com/android/tools/metalava/OptionsTest.kt
@@ -133,7 +133,7 @@
--java-source <level>
Sets the source level for Java source files; default is 1.8.
--kotlin-source <level>
- Sets the source level for Kotlin source files; default is 1.5.
+ Sets the source level for Kotlin source files; default is 1.6.
--sdk-home <dir>
If set, locate the `android.jar` file from the given Android SDK
--compile-sdk-version <api>
