diff --git a/app/build.gradle b/app/build.gradle index 168c3709..575c8c1b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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'] } } @@ -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 { @@ -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 diff --git a/app/src/debug/java/com/runnect/runnect/developer/di/DebugServiceModule.kt b/app/src/debug/java/com/runnect/runnect/developer/di/DebugServiceModule.kt index dfd5f54f..8e1f6d1c 100644 --- a/app/src/debug/java/com/runnect/runnect/developer/di/DebugServiceModule.kt +++ b/app/src/debug/java/com/runnect/runnect/developer/di/DebugServiceModule.kt @@ -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 @@ -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) = diff --git a/app/src/main/java/com/runnect/runnect/di/ServiceModule.kt b/app/src/main/java/com/runnect/runnect/di/ServiceModule.kt index 5048d86c..0b1de2cf 100644 --- a/app/src/main/java/com/runnect/runnect/di/ServiceModule.kt +++ b/app/src/main/java/com/runnect/runnect/di/ServiceModule.kt @@ -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 @@ -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 } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 92a28bdb..30e356c3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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/'} } }