From 3af5002edbf3e4aa5a050ae60d4bb5e876332ce9 Mon Sep 17 00:00:00 2001 From: Guillermo Mazzola Date: Mon, 18 Dec 2023 02:36:36 +0100 Subject: [PATCH] Updated root project tasks script --- build.gradle.kts | 5 +++-- plugin/build.gradle.kts | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fe0da60..a964a20 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ plugins { base + `maven-publish` alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.jvm) apply false alias(libs.plugins.kotlin.multiplatform) apply false @@ -26,12 +27,12 @@ tasks.check { dependsOn(jacocoTestReport.reportTask, pluginBuild.task(":$name")) } -tasks.register(PublishingPlugin.PUBLISH_LIFECYCLE_TASK_NAME) { +tasks.publish { dependsOn(pluginBuild.task(":$name")) finalizedBy(tasks.reportPublications) } -tasks.register(MavenPublishPlugin.PUBLISH_LOCAL_LIFECYCLE_TASK_NAME) { +tasks.publishToMavenLocal { dependsOn(pluginBuild.task(":$name")) finalizedBy(tasks.reportPublications) } diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 991dd5d..638c167 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -1,5 +1,3 @@ -import org.gradle.api.internal.catalog.ExternalModuleDependencyFactory - plugins { alias(libs.plugins.kotlin.jvm) alias(libs.plugins.gradle.pluginPublish) @@ -25,9 +23,6 @@ dependencies { fun DependencyHandler.plugin(dependency: Provider) = dependency.get().run { create("$pluginId:$pluginId.gradle.plugin:$version") } - fun DependencyHandler.plugin(dependency: ExternalModuleDependencyFactory.PluginNotationSupplier) = - plugin(dependency.asProvider()) - compileOnly(gradleKotlinDsl()) compileOnly(plugin(libs.plugins.kotlin.jvm))