Fix some lint warnings in gradle files

ubergeek42 · Nov 23, 2024 · 333b839 · 333b839
1 parent afa24fa
commit 333b839
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -86,7 +86,7 @@ android {
                 storePassword = project.properties["devStorePassword"] as String
                 keyAlias = project.properties["devKeyAlias"] as String
                 keyPassword = project.properties["devKeyPassword"] as String
-            } catch (e: Exception) {
+            } catch (_: Exception) {
                 project.logger.warn("WARNING: Set the values devStorefile, devStorePassword, " +
                         "devKeyAlias, and devKeyPassword " +
                         "in ~/.gradle/gradle.properties to sign the release.")
@@ -107,7 +107,7 @@ android {
                           "../cats/proguard-rules.pro")
             // kotlinx-coroutines-core debug-only artifact
             // see https://github.com/Kotlin/kotlinx.coroutines#avoiding-including-the-debug-infrastructure-in-the-resulting-apk
-            packagingOptions {
+            packaging {
                 resources.excludes += "DebugProbesKt.bin"
             }
         }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -78,7 +78,7 @@ plugins {
 }
 
 fun isNonStable(version: String): Boolean {
-    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
+    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
     val regex = "^[0-9,.v-]+(-r)?$".toRegex()
     val isStable = stableKeyword || regex.matches(version)
     return isStable.not()

diff --git a/cats/build.gradle.kts b/cats/build.gradle.kts
@@ -19,7 +19,6 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        targetSdk = 34
         minSdk = 16
         consumerProguardFile("proguard-rules.pro")
     }
@@ -35,9 +34,9 @@ tasks.withType<JavaCompile> {
 
         val args = arrayOf("-showWeaveInfo",
                            "-1.5",
-                           "-inpath", destinationDir.toString(),
+                           "-inpath", destinationDirectory.asFile.get().toString(),
                            "-aspectpath", classpath.asPath,
-                           "-d", destinationDir.toString(),
+                           "-d", destinationDirectory.asFile.get().toString(),
                            "-classpath", classpath.asPath,
                            "-bootclasspath", android.bootClasspath.joinToString(File.pathSeparator))