move setting of default values (#373)

* move setting of default values

* correct default values

* move layout

---------

Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>

Author: Machine-Maker

paperweight-core/src/main/kotlin/io/papermc/paperweight/checkstyle/PaperCheckstyle.kt

@@ -27,14 +27,19 @@ import io.papermc.paperweight.checkstyle.tasks.PaperCheckstyleTask
 import io.papermc.paperweight.util.*
 import io.papermc.paperweight.util.constants.*
 import io.papermc.paperweight.util.path
+import javax.inject.Inject
 import kotlin.io.path.readText
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.file.ProjectLayout
 import org.gradle.api.plugins.quality.CheckstyleExtension
 import org.gradle.kotlin.dsl.*
 
 abstract class PaperCheckstyle : Plugin<Project> {
 
+    @get:Inject
+    abstract val layout: ProjectLayout
+
     override fun apply(target: Project) {
         val ext = target.extensions.create<PaperCheckstyleExt>(PAPER_CHECKSTYLE_EXTENSION)
         target.plugins.apply(PaperCheckstylePlugin::class.java)
@@ -46,11 +51,15 @@ abstract class PaperCheckstyle : Plugin<Project> {
         val mergeCheckstyleConfigs by target.tasks.registering<MergeCheckstyleConfigs>()
 
         target.tasks.withType(PaperCheckstyleTask::class.java).configureEach {
-            rootPath.convention(project.rootDir.path)
+            rootPath.convention(layout.settingsDirectory.asFile.path)
             directoriesToSkip.convention(ext.directoriesToSkipFile.map { it.path.readText().trim().split("\n").toSet() })
             typeUseAnnotations.convention(ext.typeUseAnnotationsFile.map { it.path.readText().trim().split("\n") })
             customJavadocTags.convention(ext.customJavadocTags)
             configOverride.convention(mergeCheckstyleConfigs.flatMap { it.mergedConfigFile })
+            reports.xml.required.convention(true)
+            reports.html.required.convention(true)
+            maxHeapSize.convention("2g")
+            configDirectory.convention(layout.settingsDirectory.dir(".checkstyle"))
         }
     }
 }

paperweight-core/src/main/kotlin/io/papermc/paperweight/checkstyle/tasks/PaperCheckstyleTask.kt

@@ -25,9 +25,7 @@ package io.papermc.paperweight.checkstyle.tasks
 import io.papermc.paperweight.checkstyle.JavadocTag
 import io.papermc.paperweight.util.*
 import java.nio.file.Paths
-import javax.inject.Inject
 import kotlin.io.path.*
-import org.gradle.api.file.ProjectLayout
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.internal.file.FileOperations
 import org.gradle.api.plugins.quality.Checkstyle
@@ -59,16 +57,6 @@ abstract class PaperCheckstyleTask : Checkstyle() {
     @get:Optional
     abstract val configOverride: RegularFileProperty
 
-    @get:Inject
-    abstract val layout: ProjectLayout
-
-    init {
-        reports.xml.required.convention(true)
-        reports.html.required.convention(true)
-        maxHeapSize.convention("2g")
-        configDirectory.convention(layout.settingsDirectory.dir(".checkstyle"))
-    }
-
     @TaskAction
     override fun run() {
         if (configOverride.isPresent && configOverride.path.exists()) {