From aa58e663c18782eb4d93f37bfff7029d58ead291 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Thu, 10 Nov 2022 22:59:42 -0500 Subject: [PATCH] Backed out changeset 216ebef85b80 (bug 1791878) for causing bug 1799002. --- build.gradle | 4 ++-- mobile/android/annotations/build.gradle | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 8be7930ce823..9be32eedf5a5 100644 --- a/build.gradle +++ b/build.gradle @@ -110,11 +110,11 @@ buildscript { } } - ext.kotlin_version = '1.7.20' + ext.kotlin_version = '1.6.21' dependencies { classpath 'org.mozilla.apilint:apilint:0.5.2' - classpath 'com.android.tools.build:gradle:7.3.0' + classpath 'com.android.tools.build:gradle:7.2.2' classpath 'org.apache.commons:commons-exec:1.3' classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.10.0' classpath 'org.tomlj:tomlj:1.0.0' diff --git a/mobile/android/annotations/build.gradle b/mobile/android/annotations/build.gradle index 95f15b1d6aea..59dae64075b5 100644 --- a/mobile/android/annotations/build.gradle +++ b/mobile/android/annotations/build.gradle @@ -2,12 +2,9 @@ buildDir "${topobjdir}/gradle/build/mobile/android/annotations" apply plugin: 'java' -// lint should be X+23.Y.Z of gradle_plugin version, according to: -// http://googlesamples.github.io/android-custom-lint-rules/api-guide.html#example:samplelintcheckgithubproject/lintversion? - dependencies { - implementation 'com.android.tools.lint:lint:30.3.0' - implementation 'com.android.tools.lint:lint-checks:30.3.0' + implementation 'com.android.tools.lint:lint:30.2.2' + implementation 'com.android.tools.lint:lint-checks:30.2.2' } sourceCompatibility = JavaVersion.VERSION_11