Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/release -> develop #29

Merged
merged 7 commits into from
Aug 20, 2024
Merged

Release/release -> develop #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3c169ca
Merge pull request #18 from MONEYMONG/feature/moneymong-500-ci-cd-구축
Heonbyeong Aug 7, 2024
e8f5e19
chore: version up
Heonbyeong Aug 13, 2024
745634a
INCREMENT VERSION CODE
Aug 13, 2024
ad204a3
Update Fastfile
Heonbyeong Aug 18, 2024
b58912b
fix: 회원가입 화면 text 수정
eunseo0105 Aug 19, 2024
84ad945
INCREMENT VERSION CODE
Aug 19, 2024
62a9e63
Merge pull request #28 from MONEYMONG/release/release-1.2.0
eunseo0105 Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ keystore.properties

# Keystore Files
*.jks
*.keystore
*.keystore

*.json
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ android {
applicationId = "com.moneymong.moneymong"
minSdk = 24
targetSdk = 34
versionCode = 13
versionName = "1.1.0"
versionCode = 15
versionName = "1.2.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
Expand Down
8 changes: 3 additions & 5 deletions fastlane/Fastfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -97,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"]}",
Expand Down
4 changes: 2 additions & 2 deletions feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/view/SignUpTitleView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading