Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ android {

keyAlias localProperties['KEY_ALIAS']
keyPassword localProperties['KEY_PASSWORD']
storeFile file('app/RunnectKeystore.jks') //app/ 경로 생략
storeFile file('RunnectKeystore.jks')
storePassword localProperties['KEYSTORE_PASSWORD']
}
}
Expand All @@ -76,12 +76,12 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}

buildFeatures {
Expand Down Expand Up @@ -135,7 +135,7 @@ dependencies {
implementation("io.coil-kt:coil:2.2.2")

//naver map
implementation 'com.naver.maps:map-sdk:3.16.1'
implementation 'com.naver.maps:map-sdk:3.22.1'
// implementation 'com.google.android.gms:play-services-location:21.0.1'

// Ted Permission - RxJava3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
package com.runnect.runnect.developer.di

import com.google.firebase.firestore.ktx.firestore
import com.google.firebase.ktx.Firebase
import com.runnect.runnect.data.repository.*
import com.runnect.runnect.data.service.*
import com.runnect.runnect.data.source.remote.*
import com.runnect.runnect.developer.data.service.ServerStatusService
import com.runnect.runnect.di.RetrofitModule
import com.runnect.runnect.domain.*
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
Expand All @@ -19,10 +13,6 @@ import javax.inject.Singleton
@InstallIn(SingletonComponent::class)
object DebugServiceModule {

@Singleton
@Provides
fun provideBannerService() = Firebase.firestore

@Singleton
@Provides
fun provideServerStatusService(@RetrofitModule.RetrofitV2 retrofitV2: Retrofit) =
Expand Down
14 changes: 10 additions & 4 deletions app/src/main/java/com/runnect/runnect/di/ServiceModule.kt
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package com.runnect.runnect.di

import com.google.firebase.firestore.FirebaseFirestore
import com.google.firebase.firestore.ktx.firestore
import com.google.firebase.ktx.Firebase
import com.runnect.runnect.data.repository.*
import com.runnect.runnect.data.service.*
import com.runnect.runnect.data.source.remote.*
import com.runnect.runnect.domain.*
import com.runnect.runnect.data.service.CourseService
import com.runnect.runnect.data.service.LoginService
import com.runnect.runnect.data.service.ReverseGeocodingService
import com.runnect.runnect.data.service.SearchService
import com.runnect.runnect.data.service.UserService
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
Expand Down Expand Up @@ -41,4 +43,8 @@ object ServiceModule {
@Provides
fun provideReverseGeocodingService(@RetrofitModule.Tmap tmapRetrofit: Retrofit) =
tmapRetrofit.create(ReverseGeocodingService::class.java)

@Singleton
@Provides
fun provideFirebaseFirestore(): FirebaseFirestore = Firebase.firestore
}
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencyResolutionManagement {
repositories {
google()
mavenCentral()
maven { url "https://naver.jfrog.io/artifactory/maven/" }
maven { url 'https://repository.map.naver.com/archive/maven' }
maven { url 'https://devrepo.kakao.com/nexus/content/groups/public/'}
}
}
Expand Down
Loading