refactor: reorganization

ngyewch · Jul 9, 2024 · ed572df · ed572df
1 parent 23f8ed8
commit ed572df
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,6 @@
-/.gradle/
 /.tap/
 /build/
 /node_modules/
 /tsconfig.tsbuildinfo
 /serde-smile
 /dist/
-
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -18,14 +18,22 @@ tasks:
     cmds:
       - pnpm run test
 
+  build-test-data-generator:
+    dir: tools/test-data-generator
+    cmds:
+      - task build
+
   generateTestData:
     desc: Generate test data
+    deps: [ build-test-data-generator ]
     cmds:
-      - ./gradlew run --args="generateTestData --recursive src/test/data/basic build/basic/tests/basic"
+      - $TOOLDIR/bin/test-data-generator generateTestData --recursive src/test/data/basic build/basic/tests/basic
       - cp -r build/basic/tests/basic/* src/test/data/basic/
-      - ./gradlew run --args="generateTestData --recursive --compare-reference serde-smile/tests build/serde-smile/tests"
+      - $TOOLDIR/bin/test-data-generator generateTestData --recursive --compare-reference serde-smile/tests build/serde-smile/tests
       - rm -rf src/test/data/serde-smile
       - cp -r build/serde-smile/tests src/test/data/serde-smile
+    env:
+      TOOLDIR: tools/test-data-generator/build/install/test-data-generator
 
   site-build:
     desc: Build site

diff --git a/tools/test-data-generator/.gitignore b/tools/test-data-generator/.gitignore
@@ -0,0 +1,2 @@
+.gradle/
+build/
diff --git a/tools/test-data-generator/.mise-helper.toml b/tools/test-data-generator/.mise-helper.toml
@@ -0,0 +1,2 @@
+[constraints]
+java = '^11'
diff --git a/tools/test-data-generator/.mise.toml b/tools/test-data-generator/.mise.toml
@@ -0,0 +1,3 @@
+[tools]
+task = "3.38.0"
+java = "temurin-11.0.23+9"
diff --git a/tools/test-data-generator/Taskfile.yml b/tools/test-data-generator/Taskfile.yml
@@ -0,0 +1,12 @@
+version: 3
+
+tasks:
+  clean:
+    desc: Clean
+    cmds:
+      - ./gradlew clean
+
+  build:
+    desc: Build
+    cmds:
+      - ./gradlew installDist
diff --git a/build.gradle.kts → tools/test-data-generator/build.gradle.kts b/build.gradle.kts → tools/test-data-generator/build.gradle.kts
diff --git a/gradle/wrapper/gradle-wrapper.jar → ...nerator/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar → ...nerator/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew → tools/test-data-generator/gradlew b/gradlew → tools/test-data-generator/gradlew
diff --git a/gradlew.bat → tools/test-data-generator/gradlew.bat b/gradlew.bat → tools/test-data-generator/gradlew.bat
diff --git a/src/main/java/GenerateTestData.java → ...rator/src/main/java/GenerateTestData.java b/src/main/java/GenerateTestData.java → ...rator/src/main/java/GenerateTestData.java
diff --git a/src/main/java/Main.java → ...st-data-generator/src/main/java/Main.java b/src/main/java/Main.java → ...st-data-generator/src/main/java/Main.java