Quick gradle fix

`the` is replaced by `configure` when applicable rgegerger
VincentMasselis · Jun 4, 2024 · 6ca0c9c · 6ca0c9c
1 parent ec90730
commit 6ca0c9c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,4 @@ buildSrc/build/**
 .idea/vcs.xml
 .idea/migrations.xml
 .idea/deploymentTargetSelector.xml
+*.salive
diff --git a/app/phone/build.gradle.kts b/app/phone/build.gradle.kts
@@ -30,18 +30,7 @@ android {
     defaultConfig {
         applicationId = "com.masselis.tpmsadvanced"
         namespace = "com.masselis.tpmsadvanced"
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        // `useTestStorageService` enables the ability to store files when capturing screenshots.
-        // `clearPackageData` makes the Android Test Orchestrator run its "pm clear" command after
-        // each test invocation. This command ensures that the app's state is completely cleared
-        // between tests.
-        testInstrumentationRunnerArguments += mapOf(
-            "useTestStorageService" to "true",
-            "clearPackageData" to "true"
-        )
     }
-    testOptions.execution = "ANDROIDX_TEST_ORCHESTRATOR"
     if (isDecrypted) {
         signingConfigs.create("release") {
             val APP_KEY_ALIAS: String by rootProject.extra

diff --git a/buildSrc/src/main/kotlin/android-common.gradle.kts b/buildSrc/src/main/kotlin/android-common.gradle.kts
@@ -10,14 +10,23 @@ plugins {
 
 // `android {}` is unavailable since I only use the plugin com.android.base
 @Suppress("UnstableApiUsage")
-the<BaseExtension>().apply android@{
+configure<BaseExtension> android@{
     compileSdkVersion(libs.versions.sdk.compile.map { it.toInt() }.get())
     defaultConfig {
         minSdk = libs.versions.sdk.min.map { it.toInt() }.get()
         targetSdk = libs.versions.sdk.target.map { it.toInt() }.get()
         buildToolsVersion(libs.versions.build.tool.get())
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        // `useTestStorageService` enables the ability to store files when capturing screenshots.
+        // `clearPackageData` makes the Android Test Orchestrator run its "pm clear" command after
+        // each test invocation. This command ensures that the app's state is completely cleared
+        // between tests.
+        testInstrumentationRunnerArguments += mapOf(
+            "useTestStorageService" to "true",
+            "clearPackageData" to "true"
+        )
+        testOptions.execution = "ANDROIDX_TEST_ORCHESTRATOR"
     }
     compileOptions {
         // Using sdk 34 allow the usage of Java 17 compatibility

diff --git a/buildSrc/src/main/kotlin/com/masselis/tpmsadvanced/gitflow/GitflowPlugin.kt b/buildSrc/src/main/kotlin/com/masselis/tpmsadvanced/gitflow/GitflowPlugin.kt
@@ -21,10 +21,10 @@ import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.from
 import org.gradle.kotlin.dsl.property
-import org.gradle.kotlin.dsl.the
 
 public class GitflowPlugin : Plugin<Project> {
     override fun apply(project: Project): Unit = with(project) {
@@ -75,7 +75,7 @@ public class GitflowPlugin : Plugin<Project> {
         })
         subprojects {
             plugins.all {
-                if (this is LibraryPlugin) the<BaseExtension>().apply {
+                if (this is LibraryPlugin) configure<BaseExtension> {
                     afterEvaluate {
                         if (buildFeatures.buildConfig == true) productFlavors.all {
                             buildConfigField(
@@ -91,7 +91,7 @@ public class GitflowPlugin : Plugin<Project> {
                         }
                     }
                 }
-                if (this is AppPlugin) the<BaseAppModuleExtension>().apply {
+                if (this is AppPlugin) configure<BaseAppModuleExtension> {
                     defaultConfig.versionCode = versionCode.get()
                     defaultConfig.versionName = currentReleaseTag.get().toString()
                 }

diff --git a/buildSrc/src/main/kotlin/com/masselis/tpmsadvanced/playstore/PlayStorePlugin.kt b/buildSrc/src/main/kotlin/com/masselis/tpmsadvanced/playstore/PlayStorePlugin.kt
@@ -14,10 +14,10 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.from
 import org.gradle.kotlin.dsl.registerIfAbsent
-import org.gradle.kotlin.dsl.the
 
 @Suppress("UnstableApiUsage")
 public class PlayStorePlugin : Plugin<Project> {
@@ -29,7 +29,7 @@ public class PlayStorePlugin : Plugin<Project> {
             parameters.serviceAccountCredentials = ext.serviceAccountCredentials
         }
 
-        the<ApplicationAndroidComponentsExtension>().apply {
+        configure<ApplicationAndroidComponentsExtension> {
             onVariants { variant ->
                 if (variant.isMinifyEnabled.not())
                     return@onVariants

diff --git a/data/vehicle/build.gradle.kts b/data/vehicle/build.gradle.kts
@@ -8,13 +8,6 @@ plugins {
 
 android {
     namespace = "com.masselis.tpmsadvanced.data.vehicle"
-    defaultConfig {
-        // The following argument makes the Android Test Orchestrator run its
-        // "pm clear" command after each test invocation. This command ensures
-        // that the app's state is completely cleared between tests.
-        testInstrumentationRunnerArguments += "clearPackageData" to "true"
-    }
-    testOptions.execution = "ANDROIDX_TEST_ORCHESTRATOR"
 }
 
 dependencies {