Skip to content

Commit df64f45

Browse files
nakamura-toclaude
andcommitted
Consolidate project structure and update CI workflows
- Remove redundant settings.gradle.kts files from test projects - Remove duplicate gradle wrapper from compile directory - Update CI workflows to use Gradle setup action and build from root - Update CLAUDE.md command documentation for new project structure 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
1 parent 1222003 commit df64f45

File tree

10 files changed

+17
-323
lines changed

10 files changed

+17
-323
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,10 @@ jobs:
2020
distribution: 'zulu'
2121
java-version: 21
2222

23-
- name: Grant execute permission for compile/gradlew
24-
working-directory: ./compile
25-
run: chmod +x gradlew
23+
- name: Set up Gradle
24+
uses: gradle/actions/[email protected]
2625

27-
- name: Build compile-plugin
28-
working-directory: ./compile
29-
run: ./gradlew build
30-
31-
- name: Test
26+
- name: Build plugin
3227
run: ./gradlew build
3328

3429
- name: Set version
@@ -39,6 +34,5 @@ jobs:
3934
run: echo ${{ steps.set-version.outputs.version }}
4035

4136
- name: Publish plugin
42-
working-directory: ./compile
4337
if: github.event_name == 'push' && endsWith(steps.set-version.outputs.version, 'SNAPSHOT') == false
44-
run: ./gradlew publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}
38+
run: ./gradlew :compile:publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}

.github/workflows/release.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,8 @@ jobs:
4848
with:
4949
token: ${{ secrets.REPO_ACCESS_TOKEN }}
5050

51-
- name: Grant execute permission for gradlew
52-
run: chmod +x gradlew
53-
54-
- name: Cache Gradle
55-
uses: actions/cache@v4
56-
with:
57-
path: |
58-
~/.gradle/caches
59-
~/.gradle/wrapper
60-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
61-
restore-keys: |
62-
${{ runner.os }}-gradle-
51+
- name: Set up Gradle
52+
uses: gradle/actions/[email protected]
6353

6454
- name: Release ${{ env.RELEASE_VERSION }}
6555
run: |

CLAUDE.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,19 @@ The Doma Compile Plugin is a Gradle plugin that allows annotation processors to
1010

1111
### Building the Plugin
1212
```bash
13-
cd compile && ./gradlew build && cd ..
13+
./gradlew build
1414
```
1515

1616
### Running Tests
17-
The plugin has three test suites:
1817
```bash
19-
# Build the all test projects
20-
./gradlew build
18+
# Run all tests
19+
./gradlew test
20+
21+
# Run specific module tests
22+
./gradlew :compile:test
23+
./gradlew :compile-java-test:test
24+
./gradlew :compile-kotlin-test:test
25+
./gradlew :compile-mix-test:test
2126
```
2227

2328
### Code Formatting
@@ -26,19 +31,13 @@ The plugin has three test suites:
2631
./gradlew spotlessApply
2732
```
2833

29-
### Running a Single Test
30-
```bash
31-
# With any test project (compile-java-test, compile-kotlin-test, or compile-mix-test)
32-
./gradlew :compile-java-test:test --tests "example.GenerationTest"
33-
```
34-
3534
### Publishing (for maintainers)
3635
```bash
3736
# Release a new version (from master branch only)
38-
cd compile && ./gradlew release && cd ..
37+
./gradlew release
3938

4039
# Publish to Gradle Plugin Portal (handled by CI for non-SNAPSHOT versions)
41-
cd compile && ./gradlew publishPlugins -Pgradle.publish.key=<key> -Pgradle.publish.secret=<secret> && cd..
40+
./gradlew :compile:publishPlugins -Pgradle.publish.key=<key> -Pgradle.publish.secret=<secret>
4241
```
4342

4443
## Architecture

compile-java-test/settings.gradle.kts

Lines changed: 0 additions & 9 deletions
This file was deleted.

compile-kotlin-test/settings.gradle.kts

Lines changed: 0 additions & 9 deletions
This file was deleted.

compile-mix-test/settings.gradle.kts

Lines changed: 0 additions & 9 deletions
This file was deleted.
-53.9 KB
Binary file not shown.

compile/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 6 deletions
This file was deleted.

compile/gradlew

Lines changed: 0 additions & 172 deletions
This file was deleted.

compile/gradlew.bat

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)