[Oztechan/CCC#3555] Replace executions with provider based methods

SubMob · Jun 19, 2024 · 41e10bf · 41e10bf
1 parent 10b1900
commit 41e10bf
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/buildSrc/src/main/kotlin/ProjectSettings.kt b/buildSrc/src/main/kotlin/ProjectSettings.kt
@@ -3,7 +3,6 @@
  */
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
-import java.io.ByteArrayOutputStream
 
 object ProjectSettings {
  const val COMPILE_SDK_VERSION = 34
@@ -21,12 +20,8 @@ object ProjectSettings {
  project: Project
  ) = "$MAYOR_VERSION.$MINOR_VERSION.${gitCommitCount(project).toInt() - VERSION_DIF}"
 
- private fun gitCommitCount(project: Project): String {
- val os = ByteArrayOutputStream()
- project.exec {
- commandLine = "git rev-list --first-parent --count HEAD".split(" ")
- standardOutput = os
- }
- return String(os.toByteArray()).trim()
- }
+ @Suppress("UnstableApiUsage")
+ private fun gitCommitCount(project: Project): String = project.providers.exec {
+ commandLine("git rev-list --first-parent --count HEAD".split(" "))
+ }.standardOutput.asText.get().trim()
 }