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
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import java.util.Properties

plugins {
Expand All @@ -20,14 +19,14 @@ val properties = Properties().apply {

android {
namespace = "org.sopt.pingle"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "org.sopt.pingle"
minSdk = 28
targetSdk = 34
versionCode = 18
versionName = "2.0.1"
targetSdk = 35
versionCode = 19
versionName = "2.0.2"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
buildConfigField(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class AuthInterceptor @Inject constructor(
CODE_TOKEN_EXPIRE -> {
response.close()
val refreshTokenRequest = originalRequest.newBuilder().get()
.url("${BuildConfig.BASE_URL}/v1/auth/reissue")
.url("${BuildConfig.BASE_URL}v1/auth/reissue")
.post("".toRequestBody(null))
.addHeader(AUTHORIZATION, localStorage.refreshToken)
.build()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import retrofit2.http.POST
interface AuthService {
@POST("$VERSION/$AUTH/$LOGIN")
suspend fun postLogin(
@Header("$X_PROVIDER_TOKEN") header: String,
@Header(X_PROVIDER_TOKEN) header: String,
@Body body: RequestAuthDto
): BaseResponse<ResponseAuthDto>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import retrofit2.http.Query
interface MapService {
@GET("$VERSION/$TEAMS/{$TEAM_ID}/$PINS")
suspend fun getPinListWithoutFiltering(
@Path("$TEAM_ID") teamId: Long,
@Path(TEAM_ID) teamId: Long,
@Query(CATEGORY) category: String?,
@Query(SEARCH_WORD) searchWord: String?
): BaseResponse<List<ResponsePinDto>>

@GET("$VERSION/$TEAMS/{$TEAM_ID}/$PINS/{$PIN_ID}/$MEETINGS")
suspend fun getMapPingleList(
@Path("$TEAM_ID") teamId: Long,
@Path("$PIN_ID") pinId: Long,
@Path(TEAM_ID) teamId: Long,
@Path(PIN_ID) pinId: Long,
@Query(CATEGORY) category: String?
): BaseResponse<List<ResponsePingleDto>>

Expand Down
36 changes: 18 additions & 18 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
[versions]

# Gradle
agp = "8.1.3"
kotlin = "1.9.10"
agp = "8.7.3"
kotlin = "1.9.23"

# AndroidX
core-ktx = "1.12.0"
appcompat = "1.6.1"
constraintlayout = "2.1.4"
activity = "1.8.2"
fragment = "1.6.2"
lifecycle = "2.7.0"
core-ktx = "1.15.0"
appcompat = "1.7.0"
constraintlayout = "2.2.0"
activity = "1.9.3"
fragment = "1.8.5"
lifecycle = "2.8.7"
security = "1.1.0-alpha06"
splash = "1.0.1"

# Google
material = "1.11.0"
google-services = "4.4.1"
firebase-crashlytics = "2.9.9"
firebase-bom = "32.7.4"
material = "1.12.0"
google-services = "4.4.2"
firebase-crashlytics = "3.0.2"
firebase-bom = "33.7.0"

# Test
junit = "4.13.2"
androidx-test-ext-junit = "1.1.5"
espresso-core = "3.5.1"
androidx-test-ext-junit = "1.2.1"
espresso-core = "3.6.1"

# Dagger-Hilt
dagger-hilt = "2.50"
dagger-hilt = "2.52"

# Third Party
ktlint = "11.5.1"
coil = "2.4.0"
coil = "2.6.0"
timber = "5.0.1"
okhttp = "4.11.0"
retrofit = "2.9.0"
retrofit-kotlin-serialization-converter = "1.0.0"
kotlin-serialization-json = "1.5.1"
sentry = "4.1.1"
naver-maps = "3.17.0"
play-services-location = "21.2.0"
play-services-location = "21.3.0"
progress-bar = "1.1.3"
kakao = "2.15.0"
kakao = "2.20.3"
amplitude = "1.+"

[libraries]
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Dec 26 20:31:57 KST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 2 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ dependencyResolutionManagement {
repositories {
google()
mavenCentral()
maven { setUrl("https://naver.jfrog.io/artifactory/maven/") }
// NaverMapSDK
maven(url = "https://repository.map.naver.com/archive/maven")

// KakaoSDK repository
maven(url = "https://devrepo.kakao.com/nexus/content/groups/public/")
Expand Down
Loading