Move unicode dump outside build directory to be able use clear task a… (

#134) …s before
OptimumCode · Jun 14, 2024 · 138650b · 138650b
1 parent fcf9f70
commit 138650b
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 20 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -34,8 +34,8 @@ jobs:
     - name: Cache unicode data
       uses: actions/cache@v4
       with:
-        path: build/unicode_dump
-        key: unicode-dump-${{ hashFiles('build/unicode_dump/*') }}
+        path: unicode_dump
+        key: unicode-dump-${{ hashFiles('unicode_dump/*') }}
         restore-keys: |
             unicode-dump-
     - name: Setup Gradle

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -51,8 +51,8 @@ jobs:
       - name: Cache unicode data
         uses: actions/cache@v4
         with:
-          path: build/unicode_dump
-          key: unicode-dump-${{ hashFiles('build/unicode_dump/*') }}
+          path: unicode_dump
+          key: unicode-dump-${{ hashFiles('unicode_dump/*') }}
           restore-keys: |
             unicode-dump-
       - name: Setup Gradle

diff --git a/.github/workflows/platform-benchmark.yml b/.github/workflows/platform-benchmark.yml
@@ -63,8 +63,8 @@ jobs:
       - name: Cache unicode data
         uses: actions/cache@v4
         with:
-          path: build/unicode_dump
-          key: unicode-dump-${{ hashFiles('build/unicode_dump/*') }}
+          path: unicode_dump
+          key: unicode-dump-${{ hashFiles('unicode_dump/*') }}
           restore-keys: |
             unicode-dump-
       - name: Setup Gradle

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -34,8 +34,8 @@ jobs:
     - name: Cache unicode data
       uses: actions/cache@v4
       with:
-        path: build/unicode_dump
-        key: unicode-dump-${{ hashFiles('build/unicode_dump/*') }}
+        path: unicode_dump
+        key: unicode-dump-${{ hashFiles('unicode_dump/*') }}
         restore-keys: |
           unicode-dump-
     - name: Setup Gradle

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -55,8 +55,8 @@ jobs:
       - name: Cache unicode data
         uses: actions/cache@v4
         with:
-          path: build/unicode_dump
-          key: unicode-dump-${{ hashFiles('build/unicode_dump/*') }}
+          path: unicode_dump
+          key: unicode-dump-${{ hashFiles('unicode_dump/*') }}
           restore-keys: |
             unicode-dump-
       - name: Setup Gradle

diff --git a/.github/workflows/snapshot_release.yml b/.github/workflows/snapshot_release.yml
@@ -46,8 +46,8 @@ jobs:
       - name: Cache unicode data
         uses: actions/cache@v4
         with:
-          path: build/unicode_dump
-          key: unicode-dump-${{ hashFiles('build/unicode_dump/*') }}
+          path: unicode_dump
+          key: unicode-dump-${{ hashFiles('unicode_dump/*') }}
           restore-keys: |
             unicode-dump-
       - name: Build with Gradle

diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,8 @@ out/
 
 .gradle/
 
+# downloaded data for unicode characters
+unicode_dump/
+
 # to keep the local secrets from been published
 local.properties
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,19 +35,19 @@ dependencies {
   generatorConfiguration(project(":generator"))
 }
 
-val dumpDir: Provider<Directory> = layout.buildDirectory.dir("unicode_dump")
+val dumpDir: File = layout.projectDirectory.dir("unicode_dump").asFile
 
 val dumpCharacterData by tasks.register<JavaExec>("dumpCharacterData") {
   onlyIf {
-    dumpDir.get().asFile.run { !exists() || listFiles().isNullOrEmpty() }
+    dumpDir.run { !exists() || listFiles().isNullOrEmpty() }
   }
   outputs.dir(dumpDir)
   classpath(generatorConfiguration)
   mainClass.set("io.github.optimumcode.unocode.generator.Main")
   args(
     "dump",
     "-o",
-    dumpDir.get(),
+    dumpDir,
   )
 }
 
@@ -66,7 +66,7 @@ val generateCharacterDirectionData by tasks.register<JavaExec>("generateCharacte
     "-o",
     generatedSourceDirectory.get(),
     "-d",
-    dumpDir.get(),
+    dumpDir,
   )
 }
 
@@ -85,12 +85,16 @@ val generateCharacterCategoryData by tasks.register<JavaExec>("generateCharacter
     "-o",
     generatedSourceDirectory.get(),
     "-d",
-    dumpDir.get(),
+    dumpDir,
   )
 }
 
 val generateDerivedProperties by tasks.register<JavaExec>("generateDerivedProperties") {
-  val dataFile = layout.projectDirectory.dir("generator").dir("data").file("rfc5895_appendix_b_1.txt")
+  val dataFile =
+    layout.projectDirectory
+      .dir("generator")
+      .dir("data")
+      .file("rfc5895_appendix_b_1.txt")
   inputs.file(dataFile)
   outputs.dir(generatedSourceDirectory)
 
@@ -108,7 +112,11 @@ val generateDerivedProperties by tasks.register<JavaExec>("generateDerivedProper
 }
 
 val generateJoiningTypes by tasks.register<JavaExec>("generateJoiningTypes") {
-  val dataFile = layout.projectDirectory.dir("generator").dir("data").file("DerivedJoiningType.txt")
+  val dataFile =
+    layout.projectDirectory
+      .dir("generator")
+      .dir("data")
+      .file("DerivedJoiningType.txt")
   inputs.file(dataFile)
   outputs.dir(generatedSourceDirectory)
 
@@ -181,7 +189,11 @@ kotlin {
         api(libs.kotlin.serialization.json)
         api(libs.uri)
         // When using approach like above you won't be able to add because block
-        implementation(libs.kotlin.codepoints.get().toString()) {
+        implementation(
+          libs.kotlin.codepoints
+            .get()
+            .toString(),
+        ) {
           because("simplifies work with unicode codepoints")
         }
         implementation(libs.normalize.get().toString()) {