Ensure compileOnly classpath and default ktlint runtime are kept in…

… sync
jeremymailen · Sep 11, 2022 · 2fd861d · 2fd861d
1 parent a778787
commit 2fd861d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -61,7 +61,7 @@ dependencies {
         "ktlint-reporter-plain",
         "ktlint-reporter-sarif",
         "ktlint-ruleset-experimental",
-        "ktlint-ruleset-standard"
+        "ktlint-ruleset-standard",
     ).forEach { module ->
         compileOnly("com.pinterest.ktlint:$module:${Versions.ktlint}")
         testImplementation("com.pinterest.ktlint:$module:${Versions.ktlint}")
@@ -85,7 +85,13 @@ tasks {
         outputs.file(propertiesFile)
 
         doLast {
-            propertiesFile.writeText("version = $projectVersion")
+            propertiesFile.writeText(
+                """
+                version = $projectVersion
+                ktlint_version = ${Versions.ktlint}
+                
+                """.trimIndent(),
+            )
         }
     }
 

diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/KotlinterExtension.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/KotlinterExtension.kt
@@ -1,6 +1,7 @@
 package org.jmailen.gradle.kotlinter
 
 import org.jmailen.gradle.kotlinter.support.ReporterType
+import org.jmailen.gradle.kotlinter.support.versionProperties
 
 open class KotlinterExtension {
     companion object {
@@ -18,5 +19,5 @@ open class KotlinterExtension {
 
     var disabledRules = DEFAULT_DISABLED_RULES
 
-    var ktlintVersion = "0.47.1"
+    var ktlintVersion = versionProperties.ktlintVersion()
 }
diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/support/VersionProperties.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/support/VersionProperties.kt
@@ -2,10 +2,14 @@ package org.jmailen.gradle.kotlinter.support
 
 import java.util.Properties
 
-class VersionProperties : Properties() {
+internal val versionProperties by lazy(::VersionProperties)
+
+internal class VersionProperties : Properties() {
     init {
         load(this.javaClass.getResourceAsStream("/version.properties"))
     }
 
-    fun version(): String = getProperty("version")
+    fun kotlinterVersion(): String = getProperty("version")
+
+    fun ktlintVersion(): String = getProperty("ktlint_version")
 }
diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/GitHookTasks.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/GitHookTasks.kt
@@ -5,7 +5,7 @@ import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
-import org.jmailen.gradle.kotlinter.support.VersionProperties
+import org.jmailen.gradle.kotlinter.support.versionProperties
 import java.io.File
 
 abstract class InstallPreCommitHookTask : InstallHookTask("pre-commit") {
@@ -111,11 +111,9 @@ abstract class InstallHookTask(@get:Internal val hookFileName: String) : Default
     }
 
     companion object {
-        private val version = VersionProperties().version()
-
         internal const val startHook = "\n##### KOTLINTER HOOK START #####"
 
-        internal val hookVersion = "##### KOTLINTER $version #####"
+        internal val hookVersion = "##### KOTLINTER ${versionProperties.kotlinterVersion()} #####"
 
         internal const val endHook = "##### KOTLINTER HOOK END #####\n"