diff options
| author | Yuriy Solodkyy <solodkyy@google.com> | 2021-11-23 00:09:36 +0000 |
|---|---|---|
| committer | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-11-23 00:41:54 +0000 |
| commit | ae7cefb9b546ec93440a514cfd3516486439e20e (patch) | |
| tree | bb6fadf09be6326ceb6d30124ccde4b695248ec6 /android-lint/src | |
| parent | 899f6431b36340667062c521ab2ea4e3746cbda8 (diff) | |
| download | idea-ae7cefb9b546ec93440a514cfd3516486439e20e.tar.gz | |
Rename modelVersion to agpVersion
since it represent the version of the Android Gradle plugin rather than
the version of any model.
Also, make it not nullable as it is reported since first versions of the
AGP.
Bug: n/a
Test: n/a
Change-Id: I18563c9b382023a7dfa07dbbbf60b658e2aab1ae
Diffstat (limited to 'android-lint/src')
| -rw-r--r-- | android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt | 4 | ||||
| -rw-r--r-- | android-lint/src/com/android/tools/idea/lint/model/LintModelFactory.kt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt b/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt index e8af11ffcf2..271ab52cb82 100644 --- a/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt +++ b/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt @@ -81,7 +81,7 @@ class AndroidLintIdeSupport : LintIdeSupport() { override fun getBaselineFile(client: LintIdeClient, module: Module): File? { val model = AndroidModuleModel.get(module) ?: return null - val version = model.modelVersion ?: return null + val version = model.agpVersion ?: return null if (version.isAtLeast(2, 3, 1)) { val options = model.androidProject.lintOptions try { @@ -104,7 +104,7 @@ class AndroidLintIdeSupport : LintIdeSupport() { override fun getSeverityOverrides(module: Module): Map<String, Int>? { val model = AndroidModuleModel.get(module) ?: return null - val version = model.modelVersion ?: return null + val version = model.agpVersion ?: return null if (version.isAtLeast(2, 3, 1)) { val options = model.androidProject.lintOptions try { diff --git a/android-lint/src/com/android/tools/idea/lint/model/LintModelFactory.kt b/android-lint/src/com/android/tools/idea/lint/model/LintModelFactory.kt index f69a53ba764..b3093365be5 100644 --- a/android-lint/src/com/android/tools/idea/lint/model/LintModelFactory.kt +++ b/android-lint/src/com/android/tools/idea/lint/model/LintModelFactory.kt @@ -589,7 +589,7 @@ class LintModelFactory : LintModelModuleLoader { } private fun getGradleVersion(project: IdeAndroidProject): GradleVersion? { - return GradleVersion.tryParse(project.modelVersion) + return GradleVersion.tryParse(project.agpVersion) } private fun getNamespacingMode(project: IdeAndroidProject): LintModelNamespacingMode { |