@@ -2,12 +2,10 @@ package org.jlleitschuh.gradle.ktlint
2
2
3
3
import org.eclipse.jgit.lib.RepositoryBuilder
4
4
import org.gradle.api.DefaultTask
5
- import org.gradle.api.file.DirectoryProperty
6
5
import org.gradle.api.file.ProjectLayout
7
6
import org.gradle.api.model.ObjectFactory
8
7
import org.gradle.api.provider.Property
9
8
import org.gradle.api.tasks.Input
10
- import org.gradle.api.tasks.InputDirectory
11
9
import org.gradle.api.tasks.TaskAction
12
10
import org.intellij.lang.annotations.Language
13
11
import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
@@ -79,24 +77,24 @@ internal fun generateGitHook(
79
77
80
78
echo "Running ktlint over these files:"
81
79
echo "${' $' } CHANGED_FILES"
82
-
80
+
83
81
diff=.git/unstaged-ktlint-git-hook.diff
84
82
git diff --color=never > ${' $' } diff
85
83
if [ -s ${' $' } diff ]; then
86
84
git apply -R ${' $' } diff
87
85
fi
88
-
86
+
89
87
${generateGradleCommand(taskName, gradleRootDirPrefix)}
90
88
91
89
echo "Completed ktlint run."
92
90
${postCheck(shouldUpdateCommit)}
93
-
91
+
94
92
if [ -s ${' $' } diff ]; then
95
93
git apply --ignore-whitespace ${' $' } diff
96
94
fi
97
95
rm ${' $' } diff
98
96
unset diff
99
-
97
+
100
98
echo "Completed ktlint hook."
101
99
102
100
""" .trimIndent()
@@ -148,19 +146,13 @@ open class KtlintInstallGitHookTask @Inject constructor(
148
146
@get:Input
149
147
internal val hookName: Property <String > = objectFactory.property(String ::class .java)
150
148
151
- @get:InputDirectory
152
- internal val projectDir: DirectoryProperty = objectFactory.directoryProperty().apply {
153
- set(projectLayout.projectDirectory)
154
- }
149
+ private val projectDir = projectLayout.projectDirectory.asFile
155
150
156
- @get:InputDirectory
157
- internal val rootDirectory: DirectoryProperty = objectFactory.directoryProperty().apply {
158
- set(project.rootDir)
159
- }
151
+ private val rootDirectory = project.rootDir
160
152
161
153
@TaskAction
162
154
fun installHook () {
163
- val repo = RepositoryBuilder ().findGitDir(projectDir.get().asFile ).setMustExist(false ).build()
155
+ val repo = RepositoryBuilder ().findGitDir(projectDir).setMustExist(false ).build()
164
156
if (! repo.objectDatabase.exists()) {
165
157
logger.warn(" No git folder was found!" )
166
158
return
@@ -173,7 +165,7 @@ open class KtlintInstallGitHookTask @Inject constructor(
173
165
gitHookFile.createNewFile()
174
166
gitHookFile.setExecutable(true )
175
167
}
176
- val gradleRootDirPrefix = rootDirectory.get().asFile. relativeTo(repo.workTree).path
168
+ val gradleRootDirPrefix = rootDirectory.relativeTo(repo.workTree).path
177
169
178
170
if (gitHookFile.length() == 0L ) {
179
171
gitHookFile.writeText(
0 commit comments