diff --git a/annotations-optional/build.gradle b/annotations-optional/build.gradle index b0aeb765e..2d53f8ab2 100644 --- a/annotations-optional/build.gradle +++ b/annotations-optional/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'library' - id 'publish' + id 'com.squareup.anvil.library' + id 'com.squareup.anvil.publish' } publish { diff --git a/annotations/build.gradle b/annotations/build.gradle index 3e05b8704..ec6825491 100644 --- a/annotations/build.gradle +++ b/annotations/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'library' - id 'publish' + id 'com.squareup.anvil.library' + id 'com.squareup.anvil.publish' } publish { diff --git a/build-logic/build.gradle b/build-logic/build.gradle index 88cc23b47..eb73d224f 100644 --- a/build-logic/build.gradle +++ b/build-logic/build.gradle @@ -6,16 +6,16 @@ plugins { gradlePlugin { plugins { - module { - id = "library" + library { + id = "com.squareup.anvil.library" implementationClass = "com.squareup.anvil.LibraryPlugin" } root { - id = "root" + id = "com.squareup.anvil.root" implementationClass = "com.squareup.anvil.RootPlugin" } publish { - id = "publish" + id = "com.squareup.anvil.publish" implementationClass = "com.squareup.anvil.PublishConventionPlugin" } } diff --git a/build-logic/src/main/kotlin/com/squareup/anvil/KtlintConventionPlugin.kt b/build-logic/src/main/kotlin/com/squareup/anvil/KtlintConventionPlugin.kt index 25a5904a7..bc9940e34 100644 --- a/build-logic/src/main/kotlin/com/squareup/anvil/KtlintConventionPlugin.kt +++ b/build-logic/src/main/kotlin/com/squareup/anvil/KtlintConventionPlugin.kt @@ -12,8 +12,6 @@ open class KtlintConventionPlugin : Plugin { override fun apply(target: Project) { target.plugins.apply(KtlintPlugin::class.java) - target.plugins.apply(org.jlleitschuh.gradle.ktlint.KtlintPlugin::class.java) - target.extensions.configure(KtlintExtension::class.java) { ktlint -> ktlint.version.set(target.libsCatalog.version("ktlint")) ktlint.verbose.set(true) diff --git a/build.gradle b/build.gradle index 4f3b585e3..a2ab6aa4d 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { alias(libs.plugins.kotlin.multiplatform) apply false alias(libs.plugins.ktlint) apply false alias(libs.plugins.mavenPublishBase) apply false - id 'root' + id 'com.squareup.anvil.root' } boolean isCi = (System.getenv('CI') ?: 'false').toBoolean() diff --git a/compiler-api/build.gradle b/compiler-api/build.gradle index 342c99bb4..9ba2cf149 100644 --- a/compiler-api/build.gradle +++ b/compiler-api/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'library' - id 'publish' + id 'com.squareup.anvil.library' + id 'com.squareup.anvil.publish' } publish { diff --git a/compiler-utils/build.gradle b/compiler-utils/build.gradle index dc6bf4012..e0c3f9bcb 100644 --- a/compiler-utils/build.gradle +++ b/compiler-utils/build.gradle @@ -1,9 +1,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'library' + id 'com.squareup.anvil.library' id 'java-test-fixtures' - id 'publish' + id 'com.squareup.anvil.publish' } publish { diff --git a/compiler/build.gradle b/compiler/build.gradle index 04fa12b15..f61455962 100644 --- a/compiler/build.gradle +++ b/compiler/build.gradle @@ -1,10 +1,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'library' + id 'com.squareup.anvil.library' alias libs.plugins.kotlin.kapt alias libs.plugins.buildconfig - id 'publish' + id 'com.squareup.anvil.publish' } buildConfig { diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle index de337b712..8a6821875 100644 --- a/gradle-plugin/build.gradle +++ b/gradle-plugin/build.gradle @@ -1,9 +1,9 @@ plugins { - id 'library' + id 'com.squareup.anvil.library' alias libs.plugins.gradlePublish alias libs.plugins.buildconfig id 'java-gradle-plugin' - id 'publish' + id 'com.squareup.anvil.publish' } buildConfig {