diff --git a/smeem-api/src/main/java/com/smeem/api/version/service/dto/response/ClientVersionGetServiceResponse.java b/smeem-api/src/main/java/com/smeem/api/version/service/dto/response/ClientVersionGetServiceResponse.java index ee654630..7a2398e0 100644 --- a/smeem-api/src/main/java/com/smeem/api/version/service/dto/response/ClientVersionGetServiceResponse.java +++ b/smeem-api/src/main/java/com/smeem/api/version/service/dto/response/ClientVersionGetServiceResponse.java @@ -10,7 +10,9 @@ public record ClientVersionGetServiceResponse( String title, String content, String iosVersion, - String iosForceVersion + String iosForceVersion, + String androidVersion, + String androidForceVersion ) { public static ClientVersionGetServiceResponse of(ValueConfig valueConfig) { @@ -19,6 +21,8 @@ public static ClientVersionGetServiceResponse of(ValueConfig valueConfig) { .content(valueConfig.getCLIENT_VERSION_UPDATE_CONTENT()) .iosVersion(valueConfig.getCLIENT_VERSION_IOS_VERSION()) .iosForceVersion(valueConfig.getCLIENT_VERSION_IOS_FORCE_VERSION()) + .androidVersion(valueConfig.getCLIENT_VERSION_ANDROID_VERSION()) + .androidVersion(valueConfig.getCLIENT_VERSION_ANDROID_FORCE_VERSION()) .build(); } } diff --git a/smeem-api/src/main/resources/application-dev.yml b/smeem-api/src/main/resources/application-dev.yml index 983a50b9..584de91d 100644 --- a/smeem-api/src/main/resources/application-dev.yml +++ b/smeem-api/src/main/resources/application-dev.yml @@ -47,6 +47,9 @@ smeem: ios: app: 2.0.0 force: 2.0.0 + android: + app: 2.0.0 + force: 2.0.0 notification: title: "오늘의 영어 훈련, 딱 5분 걸려요!" body: "지금 눌러서 일기 쓰기 ✍️" @@ -63,4 +66,4 @@ sentry: dsn: ${SENTRY.DSN} environment: dev enable-tracing: true - exception-resolver-order: -2147483647 \ No newline at end of file + exception-resolver-order: -2147483647 diff --git a/smeem-api/src/main/resources/application-prod.yml b/smeem-api/src/main/resources/application-prod.yml index 004c6164..3d185bfd 100644 --- a/smeem-api/src/main/resources/application-prod.yml +++ b/smeem-api/src/main/resources/application-prod.yml @@ -48,6 +48,9 @@ smeem: ios: app: 2.0.1 force: 2.0.0 # 심사 통과 후 3.0.0 업데이트 필요 + android: + app: 2.0.0 + force: 2.0.0 notification: title: "오늘의 영어 훈련, 딱 5분 걸려요!" body: "지금 눌러서 일기 쓰기 ✍️" @@ -64,4 +67,4 @@ sentry: dsn: ${SENTRY.DSN} environment: prod enable-tracing: true - exception-resolver-order: -2147483647 \ No newline at end of file + exception-resolver-order: -2147483647 diff --git a/smeem-api/src/test/resources/application-test.yml b/smeem-api/src/test/resources/application-test.yml index bc659272..71885402 100644 --- a/smeem-api/src/test/resources/application-test.yml +++ b/smeem-api/src/test/resources/application-test.yml @@ -54,6 +54,9 @@ smeem: ios: app: 2.0.0 force: 2.0.0 + android: + app: 2.0.0 + force: 2.0.0 notification: title: "오늘의 영어 훈련, 딱 5분 걸려요!" body: "지금 눌러서 일기 쓰기 ✍️" @@ -64,4 +67,4 @@ smeem: discord: webhook: error-url: ${DISCORD.WEBHOOK_ERROR_URL} - info-url: ${DISCORD.WEBHOOK_INFO_URL} \ No newline at end of file + info-url: ${DISCORD.WEBHOOK_INFO_URL} diff --git a/smeem-common/src/main/java/com/smeem/common/config/ValueConfig.java b/smeem-common/src/main/java/com/smeem/common/config/ValueConfig.java index ec40fb4f..65700986 100644 --- a/smeem-common/src/main/java/com/smeem/common/config/ValueConfig.java +++ b/smeem-common/src/main/java/com/smeem/common/config/ValueConfig.java @@ -63,6 +63,12 @@ public class ValueConfig { @Value("${smeem.client.version.ios.force}") private String CLIENT_VERSION_IOS_FORCE_VERSION; + @Value("${smeem.client.version.android.app}") + private String CLIENT_VERSION_ANDROID_VERSION; + + @Value("${smeem.client.version.android.force}") + private String CLIENT_VERSION_ANDROID_FORCE_VERSION; + public static final String SIGN_IN_MESSAGE = "새로운 유저 %s 가 가입했습니다! ✍️ \n 현재 회원 수: %d 명"; public static final boolean DEFAULT_IS_PUBLIC_VALUE = true;