Skip to content

Commit ee8dbb0

Browse files
committed
Merge remote-tracking branch 'origin/develop' into fix/#350-fix-job-filtering-button
2 parents 4c9f87f + 2d5040d commit ee8dbb0

4 files changed

Lines changed: 16 additions & 0 deletions

File tree

app/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ plugins {
66
alias(libs.plugins.terning.application)
77
alias(libs.plugins.baselineprofile)
88
alias(libs.plugins.kotlin.serialization)
9+
alias(libs.plugins.google.service)
910
}
1011

1112
val properties = Properties().apply {
@@ -98,4 +99,7 @@ dependencies {
9899
implementation(libs.timber)
99100
implementation(libs.kakao.user)
100101
implementation(libs.kotlinx.serialization.json)
102+
implementation(platform(libs.firebase.bom))
103+
implementation(libs.firebase.analytics)
104+
implementation(libs.firebase.messaging)
101105
}

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<uses-permission android:name="android.permission.INTERNET" />
66
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
77
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
8+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
89

910
<application
1011
android:name=".MyApp"

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ plugins {
1313
alias(libs.plugins.dokka) apply false
1414
alias(libs.plugins.baselineprofile) apply false
1515
alias(libs.plugins.compose.compiler) apply false
16+
alias(libs.plugins.google.service) apply false
1617
}
1718

1819
buildscript {

gradle/libs.versions.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ benchmarkMacroJunit4 = "1.3.3"
104104
baselineprofile = "1.3.3"
105105
profileinstaller = "1.4.1"
106106

107+
# Google
108+
google-services = "4.4.2"
109+
firebaseBom = "33.10.0"
110+
firebaseMessaging = "24.1.0"
111+
107112
[libraries]
108113
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
109114
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" }
@@ -194,6 +199,10 @@ paging-common = { group = "androidx.paging", name = "paging-common", version.ref
194199
paging-compose = { group = "androidx.paging", name = "paging-compose", version.ref = "paging" }
195200
androidx-paging-common-android = { group = "androidx.paging", name = "paging-common-android", version.ref = "pagingCommonAndroid" }
196201

202+
firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
203+
firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
204+
firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging-ktx", version.ref = "firebaseMessaging" }
205+
197206
[bundles]
198207
retrofit =[
199208
"retrofit-core",
@@ -218,6 +227,7 @@ kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref =
218227
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
219228
baselineprofile = { id = "androidx.baselineprofile", version.ref = "baselineprofile" }
220229
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
230+
google-service = {id = "com.google.gms.google-services", version.ref = "google-services"}
221231

222232
terning-application = { id = "terning.android.application", version = "unspecified" }
223233
terning-compose = { id = "terning.android.compose", version = "unspecified" }

0 commit comments

Comments
 (0)