diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 63a038c8..35d63b94 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,13 +1,13 @@ import java.io.File import java.io.FileInputStream -import java.util.* +import java.util.Properties plugins { id("nohjunh.android.application") id("nohjunh.android.application.compose") + id("nohjunh.android.hilt") id("com.google.gms.google-services") id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin") - id("nohjunh.android.hilt") } val keystoreProperties = Properties() @@ -79,21 +79,10 @@ android { ) } } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } buildFeatures { compose = true buildConfig = true } - composeOptions { - kotlinCompilerExtensionVersion = Configurations.COMPOSE - } kapt { correctErrorTypes = true } diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index 8af60d94..dd377f95 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -1,6 +1,6 @@ import java.io.File import java.io.FileInputStream -import java.util.* +import java.util.Properties plugins { id("nohjunh.android.library") diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts index 6637983e..284640a1 100644 --- a/core/data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -26,10 +26,6 @@ dependencies { implementation(libs.kotlinx.coroutines.android) implementation(libs.kotlinx.serialization.json) - implementation(libs.hilt.android) - implementation(libs.androidx.hilt.navigation.compose) - kapt(libs.hilt.compiler) - implementation(libs.google.location) testImplementation(project(":core:testing")) diff --git a/core/ui/src/main/java/online/partyrun/partyrunapplication/core/ui/SnackbarBox.kt b/core/ui/src/main/java/online/partyrun/partyrunapplication/core/ui/SnackbarBox.kt index 8540aa3b..2c815f0f 100644 --- a/core/ui/src/main/java/online/partyrun/partyrunapplication/core/ui/SnackbarBox.kt +++ b/core/ui/src/main/java/online/partyrun/partyrunapplication/core/ui/SnackbarBox.kt @@ -18,6 +18,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @Composable @@ -59,11 +60,11 @@ fun SnackbarBox( ) { Text( modifier = Modifier.clickable { dismiss() }, - text = "확인", + text = stringResource(id = R.string.confirm_btn), style = MaterialTheme.typography.titleMedium, color = MaterialTheme.colorScheme.onPrimaryContainer ) } } } -} \ No newline at end of file +} diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml index ca29b0a2..33c57112 100644 --- a/core/ui/src/main/res/values/strings.xml +++ b/core/ui/src/main/res/values/strings.xml @@ -6,6 +6,7 @@ 앞으로 가기 구글 로그인 + 확인 설정