From 45e8a53678c2ff93f5c81fa53268ccbe37b6cf29 Mon Sep 17 00:00:00 2001 From: syncended Date: Mon, 27 Apr 2026 02:30:46 +0300 Subject: [PATCH] Flatten project layout: move Gradle project to repo root Move the inner yapi/ Gradle project up one level so the repo root is the project root. Drop the inner .gitignore (root .gitignore covers it) and update the build workflow to drop working-directory: yapi. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/build.yml | 3 -- yapi/build.gradle.kts => build.gradle.kts | 0 {yapi/cli => cli}/build.gradle.kts | 0 .../team/dedinside/yapi/application/Main.kt | 0 .../team/dedinside/yapi/command/Test.kt | 0 .../team/dedinside/yapi/command/Yapi.kt | 0 yapi/gradle.properties => gradle.properties | 0 {yapi/gradle => gradle}/libs.versions.toml | 0 .../wrapper/gradle-wrapper.jar | Bin .../wrapper/gradle-wrapper.properties | 0 yapi/gradlew => gradlew | 0 yapi/gradlew.bat => gradlew.bat | 0 ...settings.gradle.kts => settings.gradle.kts | 0 yapi/.gitignore | 45 ------------------ 14 files changed, 48 deletions(-) rename yapi/build.gradle.kts => build.gradle.kts (100%) rename {yapi/cli => cli}/build.gradle.kts (100%) rename {yapi/cli => cli}/src/main/kotlin/team/dedinside/yapi/application/Main.kt (100%) rename {yapi/cli => cli}/src/main/kotlin/team/dedinside/yapi/command/Test.kt (100%) rename {yapi/cli => cli}/src/main/kotlin/team/dedinside/yapi/command/Yapi.kt (100%) rename yapi/gradle.properties => gradle.properties (100%) rename {yapi/gradle => gradle}/libs.versions.toml (100%) rename {yapi/gradle => gradle}/wrapper/gradle-wrapper.jar (100%) rename {yapi/gradle => gradle}/wrapper/gradle-wrapper.properties (100%) rename yapi/gradlew => gradlew (100%) rename yapi/gradlew.bat => gradlew.bat (100%) rename yapi/settings.gradle.kts => settings.gradle.kts (100%) delete mode 100644 yapi/.gitignore diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5a38ea..9223a1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,9 +7,6 @@ on: jobs: build: runs-on: ubuntu-latest - defaults: - run: - working-directory: yapi steps: - uses: actions/checkout@v4 diff --git a/yapi/build.gradle.kts b/build.gradle.kts similarity index 100% rename from yapi/build.gradle.kts rename to build.gradle.kts diff --git a/yapi/cli/build.gradle.kts b/cli/build.gradle.kts similarity index 100% rename from yapi/cli/build.gradle.kts rename to cli/build.gradle.kts diff --git a/yapi/cli/src/main/kotlin/team/dedinside/yapi/application/Main.kt b/cli/src/main/kotlin/team/dedinside/yapi/application/Main.kt similarity index 100% rename from yapi/cli/src/main/kotlin/team/dedinside/yapi/application/Main.kt rename to cli/src/main/kotlin/team/dedinside/yapi/application/Main.kt diff --git a/yapi/cli/src/main/kotlin/team/dedinside/yapi/command/Test.kt b/cli/src/main/kotlin/team/dedinside/yapi/command/Test.kt similarity index 100% rename from yapi/cli/src/main/kotlin/team/dedinside/yapi/command/Test.kt rename to cli/src/main/kotlin/team/dedinside/yapi/command/Test.kt diff --git a/yapi/cli/src/main/kotlin/team/dedinside/yapi/command/Yapi.kt b/cli/src/main/kotlin/team/dedinside/yapi/command/Yapi.kt similarity index 100% rename from yapi/cli/src/main/kotlin/team/dedinside/yapi/command/Yapi.kt rename to cli/src/main/kotlin/team/dedinside/yapi/command/Yapi.kt diff --git a/yapi/gradle.properties b/gradle.properties similarity index 100% rename from yapi/gradle.properties rename to gradle.properties diff --git a/yapi/gradle/libs.versions.toml b/gradle/libs.versions.toml similarity index 100% rename from yapi/gradle/libs.versions.toml rename to gradle/libs.versions.toml diff --git a/yapi/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from yapi/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/yapi/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from yapi/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/yapi/gradlew b/gradlew similarity index 100% rename from yapi/gradlew rename to gradlew diff --git a/yapi/gradlew.bat b/gradlew.bat similarity index 100% rename from yapi/gradlew.bat rename to gradlew.bat diff --git a/yapi/settings.gradle.kts b/settings.gradle.kts similarity index 100% rename from yapi/settings.gradle.kts rename to settings.gradle.kts diff --git a/yapi/.gitignore b/yapi/.gitignore deleted file mode 100644 index b1dff0d..0000000 --- a/yapi/.gitignore +++ /dev/null @@ -1,45 +0,0 @@ -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### Kotlin ### -.kotlin - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file