make plugin work without main/java dir

sergei-lapin · May 5, 2022 · 6bb9111 · 6bb9111
1 parent 130564a
commit 6bb9111
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/plugins/gradle/build.gradle b/plugins/gradle/build.gradle
@@ -12,7 +12,7 @@ repositories {
 }
 
 group = "com.sergei-lapin.napt"
-version = "1.11"
+version = "1.12"
 
 java {
     toolchain {

diff --git a/plugins/gradle/src/main/java/com/slapin/napt/NaptGradlePlugin.kt b/plugins/gradle/src/main/java/com/slapin/napt/NaptGradlePlugin.kt
@@ -33,12 +33,13 @@ class NaptGradlePlugin : Plugin<Project> {
     }
 
     private fun Project.bindTriggerCreation(extension: NaptGradleExtension) {
+
         val createTrigger =
             tasks.register(
                 "createNaptTrigger",
                 CreateNaptTrigger::class.java,
             ) { task ->
-                task.javaDirectory.set(layout.projectDirectory.dir("src/main/java"))
+                task.mainSourceSetDir.set(layout.projectDirectory.dir("src/main"))
                 task.projectName.set(name)
                 task.packagePrefix.set(extension.naptTriggerPackagePrefix)
                 task.group = "napt"
@@ -60,7 +61,7 @@ class NaptGradlePlugin : Plugin<Project> {
                 "cleanNaptTrigger",
                 CleanNaptTrigger::class.java,
             ) { task ->
-                task.javaDirectory.set(layout.projectDirectory.dir("src/main/java"))
+                task.mainSourceSetDir.set(layout.projectDirectory.dir("src/main"))
                 task.group = "napt"
                 task.description = "Removes NaptTrigger.java if present"
             }

diff --git a/plugins/gradle/src/main/java/com/slapin/napt/task/CleanNaptTrigger.kt b/plugins/gradle/src/main/java/com/slapin/napt/task/CleanNaptTrigger.kt
@@ -11,11 +11,11 @@ abstract class CleanNaptTrigger : DefaultTask() {
 
     @get:InputDirectory
     @get:PathSensitive(PathSensitivity.RELATIVE)
-    abstract val javaDirectory: DirectoryProperty
+    abstract val mainSourceSetDir: DirectoryProperty
 
     @TaskAction
     fun run() {
-        val trigger = javaDirectory.get().file("NaptTrigger.java").asFile
+        val trigger = mainSourceSetDir.file("java/NaptTrigger.java").get().asFile
         didWork = trigger.exists()
         if (trigger.exists()) trigger.delete()
     }

diff --git a/plugins/gradle/src/main/java/com/slapin/napt/task/CreateNaptTrigger.kt b/plugins/gradle/src/main/java/com/slapin/napt/task/CreateNaptTrigger.kt
@@ -13,13 +13,13 @@ abstract class CreateNaptTrigger : DefaultTask() {
 
     @get:InputDirectory
     @get:PathSensitive(PathSensitivity.RELATIVE)
-    abstract val javaDirectory: DirectoryProperty
+    abstract val mainSourceSetDir: DirectoryProperty
 
     @get:Input @get:Optional abstract val packagePrefix: Property<String>
 
     @get:OutputFile
     val output: Provider<RegularFile>
-        get() = javaDirectory.map { directory -> directory.file("NaptTrigger.java") }
+        get() = mainSourceSetDir.file("java/NaptTrigger.java")
 
     @TaskAction
     fun run() {

diff --git a/...va/com/slapin/napt/sample/MainActivity.kt → ...in/com/slapin/napt/sample/MainActivity.kt b/...va/com/slapin/napt/sample/MainActivity.kt → ...in/com/slapin/napt/sample/MainActivity.kt
diff --git a/...t/sample/MainActivityComponentBridge.java → ...t/sample/MainActivityComponentBridge.java b/...t/sample/MainActivityComponentBridge.java → ...t/sample/MainActivityComponentBridge.java