Skip to content

Commit 5aaeb78

Browse files
authored
Merge pull request #361 from Runnect/feature/fix-build-error
빌드 최신화
2 parents a6e37c3 + 82b17b2 commit 5aaeb78

File tree

4 files changed

+16
-20
lines changed

4 files changed

+16
-20
lines changed

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ android {
5454

5555
keyAlias localProperties['KEY_ALIAS']
5656
keyPassword localProperties['KEY_PASSWORD']
57-
storeFile file('app/RunnectKeystore.jks') //app/ 경로 생략
57+
storeFile file('RunnectKeystore.jks')
5858
storePassword localProperties['KEYSTORE_PASSWORD']
5959
}
6060
}
@@ -76,12 +76,12 @@ android {
7676
}
7777

7878
compileOptions {
79-
sourceCompatibility JavaVersion.VERSION_1_8
80-
targetCompatibility JavaVersion.VERSION_1_8
79+
sourceCompatibility JavaVersion.VERSION_17
80+
targetCompatibility JavaVersion.VERSION_17
8181
}
8282

8383
kotlinOptions {
84-
jvmTarget = '1.8'
84+
jvmTarget = '17'
8585
}
8686

8787
buildFeatures {
@@ -135,7 +135,7 @@ dependencies {
135135
implementation("io.coil-kt:coil:2.2.2")
136136

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

141141
// Ted Permission - RxJava3

app/src/debug/java/com/runnect/runnect/developer/di/DebugServiceModule.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
package com.runnect.runnect.developer.di
22

3-
import com.google.firebase.firestore.ktx.firestore
4-
import com.google.firebase.ktx.Firebase
5-
import com.runnect.runnect.data.repository.*
6-
import com.runnect.runnect.data.service.*
7-
import com.runnect.runnect.data.source.remote.*
83
import com.runnect.runnect.developer.data.service.ServerStatusService
94
import com.runnect.runnect.di.RetrofitModule
10-
import com.runnect.runnect.domain.*
115
import dagger.Module
126
import dagger.Provides
137
import dagger.hilt.InstallIn
@@ -19,10 +13,6 @@ import javax.inject.Singleton
1913
@InstallIn(SingletonComponent::class)
2014
object DebugServiceModule {
2115

22-
@Singleton
23-
@Provides
24-
fun provideBannerService() = Firebase.firestore
25-
2616
@Singleton
2717
@Provides
2818
fun provideServerStatusService(@RetrofitModule.RetrofitV2 retrofitV2: Retrofit) =

app/src/main/java/com/runnect/runnect/di/ServiceModule.kt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.runnect.runnect.di
22

3+
import com.google.firebase.firestore.FirebaseFirestore
34
import com.google.firebase.firestore.ktx.firestore
45
import com.google.firebase.ktx.Firebase
5-
import com.runnect.runnect.data.repository.*
6-
import com.runnect.runnect.data.service.*
7-
import com.runnect.runnect.data.source.remote.*
8-
import com.runnect.runnect.domain.*
6+
import com.runnect.runnect.data.service.CourseService
7+
import com.runnect.runnect.data.service.LoginService
8+
import com.runnect.runnect.data.service.ReverseGeocodingService
9+
import com.runnect.runnect.data.service.SearchService
10+
import com.runnect.runnect.data.service.UserService
911
import dagger.Module
1012
import dagger.Provides
1113
import dagger.hilt.InstallIn
@@ -41,4 +43,8 @@ object ServiceModule {
4143
@Provides
4244
fun provideReverseGeocodingService(@RetrofitModule.Tmap tmapRetrofit: Retrofit) =
4345
tmapRetrofit.create(ReverseGeocodingService::class.java)
46+
47+
@Singleton
48+
@Provides
49+
fun provideFirebaseFirestore(): FirebaseFirestore = Firebase.firestore
4450
}

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencyResolutionManagement {
1010
repositories {
1111
google()
1212
mavenCentral()
13-
maven { url "https://naver.jfrog.io/artifactory/maven/" }
13+
maven { url 'https://repository.map.naver.com/archive/maven' }
1414
maven { url 'https://devrepo.kakao.com/nexus/content/groups/public/'}
1515
}
1616
}

0 commit comments

Comments
 (0)