Refactor plugin to use composite build

.github/workflows/build.yml

@@ -28,8 +28,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Publish Plugin to Maven Local
-        run: PLUGIN_ONLY=true ./gradlew :plugin:publishToMavenLocal
+      - name: Build Plugin
+        run: ./gradlew -p plugin build
 
       - name: Build Sample App (assembleDebug)
         run: ./gradlew :sample:assembleDebug

build.gradle.kts

@@ -1,12 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.dsl) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.kotlin.compose) apply false
-    alias(libs.plugins.gradleup.shadow) apply false
 }

gradle/libs.versions.toml

@@ -1,7 +1,6 @@
 [versions]
 agp = "9.1.0"
 kotlin = "2.3.10"
-kotlinDsl = "6.5.5"
 kotlinSerialization = "1.10.0"
 coreKtx = "1.17.0"
 junit = "4.13.2"
@@ -17,8 +16,6 @@ ksp = "2.3.6"
 hilt = "2.59.2"
 hiltNavigationCompose = "1.3.0"
 navigation = "2.9.7"
-gradle-plugin-publish = "2.1.0"
-shadow = "9.3.2"
 
 [libraries]
 junit = { group = "junit", name = "junit", version.ref = "junit" }
@@ -42,7 +39,6 @@ androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-man
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
 androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
-kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinSerialization" }
 kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinSerialization" }
 room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
 room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
@@ -52,17 +48,10 @@ hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.r
 hilt-core = { group = "com.google.dagger", name = "hilt-core", version.ref = "hilt" }
 
 [plugins]
-java-gradle-plugin = { id = "java-gradle-plugin" }
-gradle-plugin-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-plugin-publish" }
-maven-publish = { id = "maven-publish" }
-signing = { id = "signing" }
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-kotlin-dsl = { id = "org.gradle.kotlin.kotlin-dsl", version.ref = "kotlinDsl" }
 android-application = { id = "com.android.application", version.ref = "agp" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 androidx-room = { id = "androidx.room", version.ref = "room" }
-gradleup-shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }

plugin/build.gradle.kts

@@ -1,11 +1,10 @@
 plugins {
     alias(libs.plugins.kotlin.jvm)
-    alias(libs.plugins.kotlin.dsl)
     alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.java.gradle.plugin)
-    alias(libs.plugins.maven.publish)
+    `java-gradle-plugin`
+    `maven-publish`
     alias(libs.plugins.gradle.plugin.publish)
-    alias(libs.plugins.signing)
+    signing
     alias(libs.plugins.gradleup.shadow)
 }
 
@@ -45,7 +44,7 @@ gradlePlugin {
 }
 
 tasks.jar {
-    enabled = false
+    archiveClassifier.set("plain")
 }
 
 tasks.shadowJar {

plugin/gradle/libs.versions.toml

@@ -0,0 +1,14 @@
+[versions]
+kotlin = "2.3.10"
+kotlinSerialization = "1.10.0"
+gradle-plugin-publish = "2.1.0"
+shadow = "9.3.2"
+
+[libraries]
+kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinSerialization" }
+
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+gradle-plugin-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-plugin-publish" }
+gradleup-shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }

plugin/settings.gradle.kts

@@ -0,0 +1,15 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        mavenCentral()
+    }
+}
+
+rootProject.name = "plugin"

plugin/src/main/kotlin/jp/ntsk/room/schema/docs/plugin/RoomSchemaDocsPlugin.kt

@@ -11,11 +11,11 @@ class RoomSchemaDocsPlugin : Plugin<Project> {
         val extension =
             project.extensions.create("roomSchemaDocs", RoomSchemaDocsExtension::class.java)
 
-        project.tasks.register("generateRoomSchemaDocs") {
-            group = "documentation"
-            description = "Generate Mermaid ER diagrams from Room schema JSON files."
+        project.tasks.register("generateRoomSchemaDocs") { task ->
+            task.group = "documentation"
+            task.description = "Generate Mermaid ER diagrams from Room schema JSON files."
 
-            doLast {
+            task.doLast {
                 val schemaDir = File(extension.resolveSchemaDir())
                 val outputDir = File(extension.resolveOutputDir())
 
@@ -40,7 +40,7 @@ class RoomSchemaDocsPlugin : Plugin<Project> {
 
                 jsonFiles
                     .forEach { file ->
-                        logger.lifecycle(file.toPath().toString())
+                        task.logger.lifecycle(file.toPath().toString())
 
                         val relativePath = schemaDir.toPath().relativize(file.toPath()).toString()
                         val outputFile = File(outputDir, relativePath.replace(".json", ".md"))
@@ -50,7 +50,7 @@ class RoomSchemaDocsPlugin : Plugin<Project> {
                         val erDiagram = writer.write(roomSchema)
 
                         outputFile.writeText(erDiagram)
-                        logger.lifecycle("Generated ER diagram: ${outputFile.absolutePath}")
+                        task.logger.lifecycle("Generated ER diagram: ${outputFile.absolutePath}")
                     }
             }
         }

sample/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.androidx.room)
-    id("jp.ntsk.room-schema-docs") version "1.4.0"
+    id("jp.ntsk.room-schema-docs")
 }
 
 android {

settings.gradle.kts

@@ -1,8 +1,6 @@
 pluginManagement {
+    includeBuild("./plugin")
     repositories {
-        if (System.getenv("PLUGIN_ONLY")?.toBoolean() != true) {
-            mavenLocal()
-        }
         google {
             content {
                 includeGroupByRegex("com\\.android.*")
@@ -17,16 +15,10 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        if (System.getenv("PLUGIN_ONLY")?.toBoolean() != true) {
-            mavenLocal()
-        }
         google()
         mavenCentral()
     }
 }
 
 rootProject.name = "room-schema-docs-gradle-plugin"
-if (System.getenv("PLUGIN_ONLY")?.toBoolean() != true) {
-    include(":sample")
-}
-include(":plugin")
+include(":sample")