Skip to content

Commit 33d8404

Browse files
committed
[feat/#36] 강업 API 요청에 현재 앱버전네임 BuildConfig에서 가져와서 보내도록 수정
1 parent 2b4ae80 commit 33d8404

File tree

5 files changed

+26
-10
lines changed

5 files changed

+26
-10
lines changed

build-logic/convention/src/main/java/com/nexters/misik/convention/BuildConfig.kt

+19
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,37 @@ package com.nexters.misik.convention
22

33
import com.android.build.api.dsl.CommonExtension
44
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
5+
import com.nexters.misik.convention.extension.getVersion
6+
import com.nexters.misik.convention.extension.libs
57
import org.gradle.api.Project
68

79
internal fun Project.configureBuildConfig(
810
commonExtension: CommonExtension<*, *, *, *, *, *>,
911
) {
1012
commonExtension.apply {
1113
defaultConfig {
14+
// BASE_URL
1215
buildConfigField(
1316
"String",
1417
"BASE_URL",
1518
gradleLocalProperties(rootDir, providers).getProperty("base.url"),
1619
)
20+
21+
// VERSION_CODE, VERSION_NAME
22+
val versionCode = libs.getVersion("versionCode").requiredVersion.toInt()
23+
val versionName = libs.getVersion("versionName").requiredVersion
24+
25+
buildConfigField(
26+
"int",
27+
"VERSION_CODE",
28+
versionCode.toString(),
29+
)
30+
31+
buildConfigField(
32+
"String",
33+
"VERSION_NAME",
34+
"\"$versionName\"",
35+
)
1736
}
1837

1938
buildFeatures {

feature/webview/build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ plugins {
22
alias(libs.plugins.misik.android.library)
33
alias(libs.plugins.misik.feature)
44
alias(libs.plugins.misik.android.hilt)
5+
alias(libs.plugins.misik.plugin.build.config)
56
}
67

78
android {
89
namespace = "com.nexters.misik.feature.webview"
10+
911
}
1012

1113
dependencies {

feature/webview/src/main/java/com/nexters/misik/webview/WebViewViewModel.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.nexters.misik.webview
33
import androidx.lifecycle.ViewModel
44
import androidx.lifecycle.viewModelScope
55
import com.nexters.misik.domain.ReviewRepository
6+
import com.nexters.misik.feature.webview.BuildConfig
67
import com.nexters.misik.webview.util.JsResponseUtil
78
import dagger.hilt.android.lifecycle.HiltViewModel
89
import kotlinx.coroutines.flow.MutableStateFlow
@@ -85,7 +86,7 @@ class WebViewViewModel @Inject constructor(
8586
fun getVersionUpdateStatus() {
8687
viewModelScope.launch {
8788
_state.value = WebViewState.PageLoading
88-
reviewRepository.getVersionUpdateStatus(appVersion = "1.0.0", appPlatform = "ANDROID")
89+
reviewRepository.getVersionUpdateStatus(appVersion = BuildConfig.VERSION_NAME, appPlatform = "ANDROID")
8990
.onSuccess { data ->
9091
if (data != null) {
9192
val url = data.url

network/build.gradle.kts

+2-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@ plugins {
88
}
99

1010
android {
11-
namespace = "com.hyeseon.misik.network"
12-
buildFeatures {
13-
buildConfig = true
14-
}
15-
defaultConfig {
16-
buildConfigField("String", "NETWORK_BASE_URL", "\"https://api.misik.me/\"")
17-
}
11+
namespace = "com.nexters.misik.network"
12+
1813
}
1914

2015
dependencies {

network/src/main/java/com/nexters/misik/network/NetworkModule.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.nexters.misik.network
22

3-
import com.hyeseon.misik.network.BuildConfig
43
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
54
import dagger.Module
65
import dagger.Provides
@@ -85,7 +84,7 @@ object NetworkModule {
8584
@Logging client: OkHttpClient,
8685
converterFactory: Converter.Factory,
8786
): Retrofit = Retrofit.Builder()
88-
.baseUrl(BuildConfig.NETWORK_BASE_URL)
87+
.baseUrl(BuildConfig.BASE_URL)
8988
.client(client)
9089
.addConverterFactory(converterFactory)
9190
.build()

0 commit comments

Comments
 (0)