From 2fef222d72b9f93659f80f8a74c6140c07928763 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Wed, 10 Dec 2025 11:44:31 +0100 Subject: [PATCH] Replace `extensions.getByType()` with shorthand notation `the()` --- .../kotlin/AndroidApplicationComposeConventionPlugin.kt | 6 ++---- .../src/main/kotlin/AndroidApplicationConventionPlugin.kt | 4 ++-- .../kotlin/AndroidApplicationJacocoConventionPlugin.kt | 8 +++----- .../main/kotlin/AndroidLibraryComposeConventionPlugin.kt | 5 ++--- .../main/kotlin/AndroidLibraryJacocoConventionPlugin.kt | 8 +++----- .../google/samples/apps/nowinandroid/ProjectExtensions.kt | 4 ++-- 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt index 0a33b719f..a6273bb05 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt @@ -19,16 +19,14 @@ import com.google.samples.apps.nowinandroid.configureAndroidCompose import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.apply -import org.gradle.kotlin.dsl.getByType +import org.gradle.kotlin.dsl.the class AndroidApplicationComposeConventionPlugin : Plugin { override fun apply(target: Project) { with(target) { apply(plugin = "com.android.application") apply(plugin = "org.jetbrains.kotlin.plugin.compose") - - val extension = extensions.getByType() - configureAndroidCompose(extension) + configureAndroidCompose(the()) } } } diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index 93fe307e8..95bbe6127 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -24,7 +24,7 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.configure -import org.gradle.kotlin.dsl.getByType +import org.gradle.kotlin.dsl.the class AndroidApplicationConventionPlugin : Plugin { override fun apply(target: Project) { @@ -43,7 +43,7 @@ class AndroidApplicationConventionPlugin : Plugin { } extensions.configure { configurePrintApksTask(this) - configureBadgingTasks(extensions.getByType(), this) + configureBadgingTasks(the(), this) } } } diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt index b0eece41d..ab37f2a92 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt @@ -20,21 +20,19 @@ import com.google.samples.apps.nowinandroid.configureJacoco import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.apply -import org.gradle.kotlin.dsl.getByType +import org.gradle.kotlin.dsl.the class AndroidApplicationJacocoConventionPlugin : Plugin { override fun apply(target: Project) { with(target) { apply(plugin = "jacoco") - val androidExtension = extensions.getByType() - - androidExtension.buildTypes.configureEach { + the().buildTypes.configureEach { enableAndroidTestCoverage = true enableUnitTestCoverage = true } - configureJacoco(extensions.getByType()) + configureJacoco(the()) } } } diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt index 18cd2bd7d..8372ecc97 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt @@ -19,7 +19,7 @@ import com.google.samples.apps.nowinandroid.configureAndroidCompose import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.apply -import org.gradle.kotlin.dsl.getByType +import org.gradle.kotlin.dsl.the class AndroidLibraryComposeConventionPlugin : Plugin { override fun apply(target: Project) { @@ -27,8 +27,7 @@ class AndroidLibraryComposeConventionPlugin : Plugin { apply(plugin = "com.android.library") apply(plugin = "org.jetbrains.kotlin.plugin.compose") - val extension = extensions.getByType() - configureAndroidCompose(extension) + configureAndroidCompose(the()) } } } diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryJacocoConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryJacocoConventionPlugin.kt index d249e4cbf..ff74130dd 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryJacocoConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryJacocoConventionPlugin.kt @@ -20,21 +20,19 @@ import com.google.samples.apps.nowinandroid.configureJacoco import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.apply -import org.gradle.kotlin.dsl.getByType +import org.gradle.kotlin.dsl.the class AndroidLibraryJacocoConventionPlugin : Plugin { override fun apply(target: Project) { with(target) { apply(plugin = "jacoco") - val androidExtension = extensions.getByType() - - androidExtension.buildTypes.configureEach { + the().buildTypes.configureEach { enableAndroidTestCoverage = true enableUnitTestCoverage = true } - configureJacoco(extensions.getByType()) + configureJacoco(the()) } } } diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/ProjectExtensions.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/ProjectExtensions.kt index e45d7f2e1..013e7b849 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/ProjectExtensions.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/ProjectExtensions.kt @@ -19,7 +19,7 @@ package com.google.samples.apps.nowinandroid import org.gradle.api.Project import org.gradle.api.artifacts.VersionCatalog import org.gradle.api.artifacts.VersionCatalogsExtension -import org.gradle.kotlin.dsl.getByType +import org.gradle.kotlin.dsl.the val Project.libs - get(): VersionCatalog = extensions.getByType().named("libs") + get(): VersionCatalog = the().named("libs")