From 3ae105df92d4bd000d1950cb79837d201d5b229b Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 1 Jun 2021 15:05:05 +0530 Subject: Configure Spotless for all projects and tweak Dagger flags (#1427) --- buildSrc/src/main/java/PasswordStorePlugin.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'buildSrc/src/main/java/PasswordStorePlugin.kt') diff --git a/buildSrc/src/main/java/PasswordStorePlugin.kt b/buildSrc/src/main/java/PasswordStorePlugin.kt index 5db8c893..0705de82 100644 --- a/buildSrc/src/main/java/PasswordStorePlugin.kt +++ b/buildSrc/src/main/java/PasswordStorePlugin.kt @@ -7,8 +7,6 @@ import com.android.build.gradle.TestedExtension import com.android.build.gradle.internal.dsl.BaseAppModuleExtension import com.android.build.gradle.internal.plugins.AppPlugin import com.android.build.gradle.internal.plugins.LibraryPlugin -import com.diffplug.gradle.spotless.SpotlessExtension -import com.diffplug.gradle.spotless.SpotlessPlugin import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.plugins.JavaLibraryPlugin @@ -20,6 +18,7 @@ import org.gradle.kotlin.dsl.withType import org.gradle.plugins.signing.SigningExtension import org.gradle.plugins.signing.SigningPlugin import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension +import org.jetbrains.kotlin.gradle.internal.Kapt3GradleSubplugin import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -53,15 +52,15 @@ class PasswordStorePlugin : Plugin { project.extensions.getByType().configureBuildSigning(project) project.extensions.getByType().configureCommonAndroidOptions() } - is SpotlessPlugin -> { - project.extensions.getByType().configureSpotless() - } is SigningPlugin -> { project.extensions.getByType().configureBuildSigning() } is KotlinPluginWrapper -> { project.configureExplicitApi() } + is Kapt3GradleSubplugin -> { + project.configureKapt() + } } } } -- cgit v1.2.3