Skip to content

Commit dd73b4b

Browse files
authored
v2.0.5 (#415)
2 parents 6fda9ae + 5747f90 commit dd73b4b

File tree

48 files changed

+600
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+600
-145
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @kdomo @uwoobeat @uiurihappy
1+
* @kdomo @uwoobeat @char-yb

.github/workflows/develop_build_deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
# test 돌릴때 레디스 필요
3333
- name: Start containers
34-
run: docker-compose -f ./docker-compose-test.yaml up -d
34+
run: docker compose -f ./docker-compose-test.yaml up -d
3535

3636
# Gradlew 실행 허용
3737
- name: Run chmod to make gradlew executable

.github/workflows/develop_pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
distribution: 'adopt'
2121

2222
- name: Start containers # test 돌릴때 레디스 필요
23-
run: docker-compose -f ./docker-compose-test.yaml up -d
23+
run: docker compose -f ./docker-compose-test.yaml up -d
2424

2525
- name: Grant execute permission for gradlew
2626
run: chmod +x ./gradlew

.github/workflows/production_build_deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
# test 돌릴때 레디스 필요
3434
- name: Start containers
35-
run: docker-compose -f ./docker-compose-test.yaml up -d
35+
run: docker compose -f ./docker-compose-test.yaml up -d
3636

3737
# Gradlew 실행 허용
3838
- name: Run chmod to make gradlew executable

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
## 📝 직접 사용해보기
4343
- [iOS](https://apps.apple.com/kr/app/10%EB%B6%84%EB%A7%8C-10mm-10%EB%B6%84%EC%9C%BC%EB%A1%9C-%EC%8B%9C%EC%9E%91%ED%95%98%EB%8A%94-%EC%8A%B5%EA%B4%80-%ED%98%95%EC%84%B1/id6475635740)
4444
- [AOS](https://play.google.com/store/apps/details?id=com.tenminuteapp)
45-
- [WEB](https://10mm.today/)
45+
- [WEB](https://10mm.site/)
4646
</br></br>
4747

4848
# 🖥️ Tech
@@ -77,4 +77,4 @@
7777
## 🧑🏻‍💻 Developers
7878
| ![](https://avatars.githubusercontent.com/u/64088250?v=4) | ![](https://avatars.githubusercontent.com/u/91878695?v=4) |![](https://avatars.githubusercontent.com/u/68099546?v=4) |
7979
| :--: | :--: | :--: |
80-
| [김동호](https://github.com/kdomo) | [안재현](https://github.com/uwoobeat) | [차윤범](https://github.com/uiurihappy) |
80+
| [김동호](https://github.com/kdomo) | [안재현](https://github.com/uwoobeat) | [차윤범](https://github.com/char-yb) |

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ spotless {
191191

192192
// pre-commit spotless check script
193193
tasks.register('updateGitHooks', Copy) {
194-
from './scripts/pre-commit'
195-
into './.git/hooks'
194+
from 'scripts/pre-commit'
195+
into '.git/hooks'
196196
}
197197
compileJava.dependsOn updateGitHooks

nginx/default.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
server {
22
listen 80;
3-
server_name 10mm.today;
3+
server_name 10mm.site;
44

55
location / {
66
proxy_pass http://localhost:8080/;

scripts/pre-commit

100644100755
Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
#!/bin/bash
2-
echo "Running spotless check"
3-
./gradlew spotlessCheck
4-
if [ \$? -eq 0 ]
5-
then
6-
echo "Spotless check succeed"
7-
else
8-
echo "Spotless check failed" >&2
9-
exit 1
10-
fi
1+
#!/bin/sh
2+
3+
targetFiles=$(git diff --staged --name-only)
4+
5+
echo "Apply Spotless.."
6+
./gradlew spotlessApply
7+
8+
# Add files to stage spotless applied
9+
for file in $targetFiles; do
10+
if test -f "$file"; then
11+
git add $file
12+
fi
13+
done

src/main/java/com/depromeet/domain/comment/api/CommentController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.springframework.http.ResponseEntity;
1313
import org.springframework.web.bind.annotation.*;
1414

15-
@Tag(name = "8. [댓글]", description = "댓글 관련 API")
15+
@Tag(name = "9. [댓글]", description = "댓글 관련 API")
1616
@RestController
1717
@RequestMapping("/comments")
1818
@RequiredArgsConstructor

src/main/java/com/depromeet/domain/feed/dto/response/FeedOneByProfileResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public record FeedOneByProfileResponse(
1212
@Schema(description = "미션 이름", defaultValue = "default name") String name,
1313
@Schema(
1414
description = "미션 기록 인증 사진 Url",
15-
defaultValue = "https://image.10mm.today/default.png")
15+
defaultValue = "https://image.10mm.site/default.png")
1616
String recordImageUrl,
1717
@Schema(description = "미션 수행한 시간", defaultValue = "21") long duration,
1818
@Schema(description = "미션 시작한 지 N일차", defaultValue = "3") long sinceDay,

0 commit comments

Comments
 (0)