Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/#166-refac…
Browse files Browse the repository at this point in the history
…toring-card-size
  • Loading branch information
pump9918 committed Mar 8, 2024
2 parents 98ce710 + a45acaf commit dc40b5a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/softie_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ jobs:
java-version: '17'
distribution: 'temurin'
cache: gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Access GOOGLE SERVICES JSON
run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json

- name: Create Local Properties
run: touch local.properties
Expand All @@ -44,7 +47,7 @@ jobs:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_TITLE: 'Sofite/PR Check SUCCESS💚'
MSG_MINIMAL: true
SLACK_USERNAME: Sofite-AOS
SLACK_USERNAME: Sofite-Android
SLACK_MESSAGE: 'PR이 완료되었습니다'

- name: On Failed, Notify in Slack
Expand All @@ -55,5 +58,5 @@ jobs:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_TITLE: 'Sofite/Android Debug build Fail❌'
MSG_MINIMAL: true
SLACK_USERNAME: Sofite-AOS
SLACK_USERNAME: Sofite-Android
SLACK_MESSAGE: '에러를 확인해주세요'
8 changes: 6 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ plugins {
id("kotlin-parcelize")
id("org.jlleitschuh.gradle.ktlint")
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.0"
id("com.google.gms.google-services")
id("com.google.firebase.crashlytics")
}

android {
Expand All @@ -33,6 +35,7 @@ android {
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
signingConfig = signingConfigs.getByName("debug")
}
}

Expand Down Expand Up @@ -108,8 +111,9 @@ dependencies {
implementation("androidx.exifinterface:exifinterface:1.3.7")

// Firebase
implementation(platform("com.google.firebase:firebase-bom:29.0.0"))
implementation("com.google.firebase:firebase-analytics-ktx")
implementation(platform("com.google.firebase:firebase-bom:32.7.3"))
implementation("com.google.firebase:firebase-analytics")
implementation("com.google.firebase:firebase-crashlytics")
implementation("com.google.android.gms:play-services-tagmanager:18.0.4")

// viewPager2
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ plugins {
id("org.jlleitschuh.gradle.ktlint") version "11.0.0" apply false
id("androidx.navigation.safeargs.kotlin") version "2.5.1" apply false
id("com.google.firebase.crashlytics") version "2.9.9" apply false
id("com.google.gms.google-services") version "4.4.1" apply false
}

tasks.register("clean", Delete::class) {
Expand Down

0 comments on commit dc40b5a

Please sign in to comment.