diff --git a/build.gradle.kts b/build.gradle.kts index c0bdb77..ac5e924 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -95,25 +95,7 @@ mavenPublishing { } } -publishing { - // Both plugins should be deployed as a single artifact to ensure they can be setup automatically - publications { - - create("Compositor") { - from(components["java"]) - - groupId = namespace - artifactId = rootProject.name.lowercase() - version = property("version") as String - } - } -} - gradlePlugin { - // Since we provide two plugins together that we want deployed as a single plugin, we should disable this to avoid - // publishing either of them separately when running through deployment pipelines. - isAutomatedPublishing = false - plugins { // This is the main plugin. Unlike others, it needs to be applied under the settings.gradle file. // This plugin is responsible for reading the composites file if it exists, and attempting to parse @@ -123,12 +105,5 @@ gradlePlugin { id = "$namespace.compositor" implementationClass = "$group.Compositor" } - // This plugin handles generating the gradle tasks for creating/deleting or enabling/disabling the - // composites file. It should not be applied manually, and should instead be auto-loaded in via - // the settings plugin provided above. - create("Compositor-Project-Auto") { - id = "$namespace.compositor-project-auto" - implementationClass = "$group.CompositorProjectAuto" - } } } diff --git a/src/main/kotlin/xyz/atrius/Compositor.kt b/src/main/kotlin/xyz/atrius/Compositor.kt index 9da0c0e..fec100e 100644 --- a/src/main/kotlin/xyz/atrius/Compositor.kt +++ b/src/main/kotlin/xyz/atrius/Compositor.kt @@ -61,6 +61,6 @@ class Compositor : Plugin { } private fun Settings.applyProjectPlugin() = gradle.beforeProject { - it.pluginManager.apply("io.github.atriusx.compositor-project-auto") + it.rootProject.pluginManager.apply(CompositorProjectAuto::class.java) } } \ No newline at end of file