[1.197.*] Pre-release merge (#654)

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt

@@ -25,21 +25,14 @@ import org.gradle.kotlin.dsl.findByType
 
 class AndroidCommonPlugin : Plugin<Project> {
 
-  private companion object {
-    const val COMPILE_SDK = 35
-    const val MIN_SDK = 26
-    const val TARGET_SDK = 34
-    const val SLIM_TESTS_PROPERTY = "slimTests"
-  }
-
   override fun apply(project: Project) {
     project.configureSlimTests()
     project.pluginManager.apply(AndroidCacheFixPlugin::class)
     project.extensions.configure<BaseExtension> {
-      compileSdkVersion(COMPILE_SDK)
+      compileSdkVersion(35)
       defaultConfig {
-        minSdk = MIN_SDK
-        targetSdk = TARGET_SDK
+        minSdk = 26
+        targetSdk = 35
       }
 
       packagingOptions {
@@ -64,7 +57,7 @@ class AndroidCommonPlugin : Plugin<Project> {
   }
 
   private fun Project.configureSlimTests() {
-    if (!providers.gradleProperty(SLIM_TESTS_PROPERTY).isPresent) {
+    if (!providers.gradleProperty("slimTests").isPresent) {
       return
     }
     // Disable unit test tasks on the release build type for Android Library projects

settings.gradle.kts

@@ -64,7 +64,7 @@ pluginManagement {
 
 plugins {
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-  id("com.gradle.develocity") version "3.18"
+  id("com.gradle.develocity") version "3.18.1"
 }
 
 develocity {