diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f60b97b5..dc7d7cc4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,4 +1,3 @@ -import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties import java.util.Properties plugins { diff --git a/feature/build.gradle.kts b/feature/build.gradle.kts index 781cf168..02180fd6 100644 --- a/feature/build.gradle.kts +++ b/feature/build.gradle.kts @@ -16,6 +16,8 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") + + buildConfigField("String", "VERSION_NAME", "\"${libs.versions.versionName.get()}\"") } buildTypes { @@ -92,8 +94,8 @@ dependencies { implementation(libs.lottie) implementation(libs.process.phoenix) implementation(libs.accompanist.systemuicontroller) - implementation (libs.androidx.core.splashscreen) - implementation (libs.androidx.browser) + implementation(libs.androidx.core.splashscreen) + implementation(libs.androidx.browser) // Compose Preview implementation(libs.compose.ui.tooling) diff --git a/feature/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt b/feature/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt index 15c76c8a..ca7d283f 100644 --- a/feature/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt +++ b/feature/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt @@ -47,6 +47,7 @@ import com.terning.core.designsystem.theme.White import com.terning.core.extension.noRippleClickable import com.terning.core.extension.toast import com.terning.core.state.UiState +import com.terning.feature.BuildConfig import com.terning.feature.R import com.terning.feature.main.MainActivity import com.terning.feature.mypage.component.MyPageProfile @@ -55,7 +56,6 @@ import com.terning.feature.mypage.mypage.util.MyPageDefaults.NOTICE_URL import com.terning.feature.mypage.mypage.util.MyPageDefaults.OPINION_URL import com.terning.feature.mypage.mypage.util.MyPageDefaults.PERSONAL_URL import com.terning.feature.mypage.mypage.util.MyPageDefaults.SERVICE_URL -import com.terning.feature.mypage.mypage.util.MyPageDefaults.VERSION @Composable fun MyPageRoute( @@ -386,7 +386,7 @@ fun ServiceInfo( ) MyPageItem( text = stringResource(id = R.string.my_page_version), - version = VERSION, + version = BuildConfig.VERSION_NAME, icon = R.drawable.ic_my_page_version ) } diff --git a/feature/src/main/java/com/terning/feature/mypage/mypage/util/MyPageDefaults.kt b/feature/src/main/java/com/terning/feature/mypage/mypage/util/MyPageDefaults.kt index 27900ee2..b90a4197 100644 --- a/feature/src/main/java/com/terning/feature/mypage/mypage/util/MyPageDefaults.kt +++ b/feature/src/main/java/com/terning/feature/mypage/mypage/util/MyPageDefaults.kt @@ -1,7 +1,6 @@ package com.terning.feature.mypage.mypage.util object MyPageDefaults { - const val VERSION = "1.1.0" const val NOTICE_URL = "https://abundant-quiver-13f.notion.site/Android-49b3cc2390ee4dc389e25a5097736944" const val OPINION_URL = "https://forms.gle/AaLpVptfg6cATYWa7"