From e8f5e193264eb10e6b411919dc29c2ddb5f659c5 Mon Sep 17 00:00:00 2001 From: Heon Date: Tue, 13 Aug 2024 21:58:24 +0900 Subject: [PATCH 1/5] chore: version up --- .gitignore | 4 +++- app/build.gradle.kts | 2 +- fastlane/Fastfile | 6 ++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4960cd83..2aaba2fb 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,6 @@ keystore.properties # Keystore Files *.jks -*.keystore \ No newline at end of file +*.keystore + +*.json \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index de1dda7b..ce98c70e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,7 +22,7 @@ android { minSdk = 24 targetSdk = 34 versionCode = 13 - versionName = "1.1.0" + versionName = "1.2.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e6d5a8c4..9b78da63 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -23,12 +23,10 @@ platform :android do version_code: options[:new_version_code] ) - git_add( - path: ["./app/build.gradle.kts"] - ) git_commit( path: ["./app/build.gradle.kts"], - message: "INCREMENT VERSION CODE" + message: "INCREMENT VERSION CODE", + allow_nothing_to_commit: true ) push_to_git_remote From 745634af0731b1458b6cfbee46d9d08d0d01053a Mon Sep 17 00:00:00 2001 From: Anka Date: Tue, 13 Aug 2024 13:00:55 +0000 Subject: [PATCH 2/5] INCREMENT VERSION CODE --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ce98c70e..14585c04 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -21,7 +21,7 @@ android { applicationId = "com.moneymong.moneymong" minSdk = 24 targetSdk = 34 - versionCode = 13 + versionCode = 14 versionName = "1.2.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" From ad204a35d758c3879da96efc5fe8a010086fdbda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=88=EB=B3=91=ED=97=8C?= <64366488+Heonbyeong@users.noreply.github.com> Date: Sun, 18 Aug 2024 21:24:15 +0900 Subject: [PATCH 3/5] Update Fastfile --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 9b78da63..3dc6c53b 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -95,7 +95,7 @@ platform :android do gradle( task: 'clean assemble', flavor: "tb", - build_type: 'Release' + build_type: 'Debug' ) firebase_app_distribution( service_credentials_file: "#{ENV["FIREBASE_CREDENTIALS"]}", From b58912b97f9d1bb6203dcfe7f2a3ceacb6b1b00d Mon Sep 17 00:00:00 2001 From: eunseo Date: Mon, 19 Aug 2024 22:20:02 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?= =?UTF-8?q?=20=ED=99=94=EB=A9=B4=20text=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moneymong/moneymong/feature/sign/view/SignUpTitleView.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/view/SignUpTitleView.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/view/SignUpTitleView.kt index 0546e5c9..dad5d7e5 100644 --- a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/view/SignUpTitleView.kt +++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/view/SignUpTitleView.kt @@ -21,13 +21,13 @@ fun SignUpTitleView(modifier: Modifier = Modifier, subTitleState: Boolean) { horizontalAlignment = Alignment.Start ) { Text( - text = "회원가입을 진행해주세요", + text = "대학정보를 알려주세요!", style = Heading2, color = Black ) Text( modifier = Modifier.padding(top= 8.dp), - text = "아래 항목들을 정확히 채워주세요", + text = "학교 이름과 학년을 선택해주세요.", style = Body3, color = if (!subTitleState) Gray06.copy(alpha = 0.4f) else Gray06 From 84ad94511f60289c34920e8323aa280844bf226f Mon Sep 17 00:00:00 2001 From: Anka Date: Mon, 19 Aug 2024 13:23:13 +0000 Subject: [PATCH 5/5] INCREMENT VERSION CODE --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 14585c04..92d6ee8d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -21,7 +21,7 @@ android { applicationId = "com.moneymong.moneymong" minSdk = 24 targetSdk = 34 - versionCode = 14 + versionCode = 15 versionName = "1.2.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"