Update dependencies

Add override api field

Author: thirdegg

build.gradle

@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.3.20'
+    ext.kotlin_version = '1.5.30'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sat Mar 02 12:40:29 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip

lint-rules-android/build.gradle

@@ -2,7 +2,8 @@ apply plugin: 'java-library'
 apply plugin: "kotlin"
 
 buildscript {
-    ext.kotlin_version = '1.3.20'
+    ext.kotlin_version = '1.5.30'
+    ext.lint_api_version = '30.0.2'
 
     repositories {
         mavenCentral()
@@ -14,10 +15,15 @@ buildscript {
 }
 
 dependencies {
-    compileOnly "com.android.tools.lint:lint-api:26.3.1"
+    compileOnly "com.android.tools.lint:lint-api:$lint_api_version"
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    testImplementation "com.android.tools.lint:lint:26.3.1"
-    testImplementation "com.android.tools.lint:lint-tests:26.3.1"
+
+    testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    testImplementation "com.android.tools.lint:lint:$lint_api_version"
+    testImplementation "com.android.tools.lint:lint-tests:$lint_api_version"
+
+    testCompile 'junit:junit:4.12'
+    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 }
 
 jar {

lint-rules-android/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.i90g.checkexceptlint" />
+    package="com.thirdegg.checking_exceptions_lint" />

…les/android/CheckedExceptionsDetector.kt …es/android/CheckingExceptionsDetector.ktlint-rules-android/src/main/java/com/thirdegg/lintrules/android/CheckedExceptionsDetector.kt renamed to lint-rules-android/src/main/java/com/thirdegg/lintrules/android/CheckingExceptionsDetector.kt lint-rules-android/src/main/java/com/thirdegg/lintrules/android/CheckedExceptionsDetector.kt renamed to lint-rules-android/src/main/java/com/thirdegg/lintrules/android/CheckingExceptionsDetector.kt

@@ -73,20 +73,15 @@ class CheckedExceptionsDetector : Detector(), Detector.UastScanner {
 
     override fun createUastHandler(context: JavaContext) = object : UElementHandler() {
 
-        init {
-//            println(context.uastFile?.asRecursiveLogString())
-        }
-
         override fun visitCallExpression(node: UCallExpression) {
 
-            val call = node
-            val method = call.resolve() ?: return
-            val uMethod = context.uastContext.getMethod(method)
+            val method = node.resolve() ?: return
+            val uMethod = UastFacade.convertElement(method, null, UMethod::class.java) as UMethod
 
             var throwsExceptions = HashMap<String, HashSet<String>>()
 
             // Find @Throws in annotation expression
-            for (annotation in uMethod.annotations) {
+            for (annotation in uMethod.uAnnotations) {
                 if (annotation.qualifiedName != "kotlin.jvm.Throws") continue
                 for (throwsException in findNamedExpressionsInAnnotation(annotation)) {
                     throwsExceptions[throwsException.canonicalText] = findClassParents(throwsException)
@@ -119,9 +114,9 @@ class CheckedExceptionsDetector : Detector(), Detector.UastScanner {
 
 
             // Remove catched
-            for (element in call.withContainingElements) {
+            for (element in node.withContainingElements) {
                 if (element !is UMethod) continue
-                for (child in element.annotations) {
+                for (child in element.uAnnotations) {
                     for (classInAnnotation in findNamedExpressionsInAnnotation(child)) {
                         throwsExceptions = throwsExceptions.filterTo(HashMap()) {
                             !it.value.contains(classInAnnotation.canonicalText)
@@ -131,7 +126,7 @@ class CheckedExceptionsDetector : Detector(), Detector.UastScanner {
                 break
             }
 
-            for (element in call.withContainingElements) {
+            for (element in node.withContainingElements) {
                 if (element !is UTryExpression) continue
                 for (catchCause in element.catchClauses) {
                     catchCause.types.forEach { catch ->
@@ -145,7 +140,7 @@ class CheckedExceptionsDetector : Detector(), Detector.UastScanner {
 
             for (exceptions in throwsExceptions) {
                 context.report(
-                    ISSUE_PATTERN, call, context.getNameLocation(call),
+                    ISSUE_PATTERN, node, context.getNameLocation(node),
                     "Unhandled exception: ${exceptions.key}"
                 )
             }

lint-rules-android/src/main/java/com/thirdegg/lintrules/android/LintRulesRegistry.kt

@@ -7,4 +7,6 @@ class LintRulesRegistry: IssueRegistry() {
 
     override val issues: List<Issue> = listOf(ISSUE_PATTERN)
 
+    override val api: Int = CURRENT_API
+
 }