From 227ac276529153f81ffc66d67442f6f1eb7237dd Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Sat, 21 May 2022 12:44:51 +0200
Subject: [PATCH] make gradle zip directory drop helper function nicer

---
 .../main/kotlin/dev/adamko/kafkatorio/gradle/extensions.kt | 7 ++++++-
 modules/events-mod/build.gradle.kts                        | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/gradle/extensions.kt b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/gradle/extensions.kt
index 3bb8f13..ba24bdc 100644
--- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/gradle/extensions.kt
+++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/gradle/extensions.kt
@@ -74,5 +74,10 @@ fun Directory.filesChecksum() = asFileTree
 
 
 /** Drop the first [count] directories from the path */
-fun FileCopyDetails.dropDirectories(count: Int = 1): RelativePath =
+fun FileCopyDetails.dropDirectories(count: Int): RelativePath =
   RelativePath(true, *relativePath.segments.drop(count).toTypedArray())
+
+
+/** Drop the first directory from the path */
+fun FileCopyDetails.dropDirectory(): RelativePath =
+  dropDirectories(1)
diff --git a/modules/events-mod/build.gradle.kts b/modules/events-mod/build.gradle.kts
index 4277a63..d9819c1 100644
--- a/modules/events-mod/build.gradle.kts
+++ b/modules/events-mod/build.gradle.kts
@@ -1,7 +1,7 @@
 import dev.adamko.kafkatorio.factoriomod.FactorioModPublishTask
 import dev.adamko.kafkatorio.gradle.asConsumer
 import dev.adamko.kafkatorio.gradle.asProvider
-import dev.adamko.kafkatorio.gradle.dropDirectories
+import dev.adamko.kafkatorio.gradle.dropDirectory
 import dev.adamko.kafkatorio.gradle.factorioModAttributes
 import dev.adamko.kafkatorio.gradle.typescriptAttributes
 import dev.adamko.kafkatorio.task.TypescriptToLuaTask
@@ -99,7 +99,7 @@ val installEventsTsSchema by tasks.registering(Sync::class) {
       }
   ) {
     // drop the first directory inside the zip
-    eachFile { relativePath = dropDirectories() }
+    eachFile { relativePath = dropDirectory() }
     includeEmptyDirs = false
   }
   into(outputDir)