diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f7e7799..a6c05d6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,7 +11,7 @@ android { defaultConfig { versionCode = 1 versionName = "1.0.0" - targetSdk = 34 + targetSdk = 35 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" @@ -21,8 +21,6 @@ android { buildConfigField("String", "KAKAO_APP_KEY", "\"${localProperties["KAKAO_APP_KEY"]}\"") } - packaging { resources { excludes += "/META-INF/*" } } - buildTypes { release { signingConfig = signingConfigs.getByName("debug") diff --git a/build-logic/src/main/java/com/puzzle/build/logic/KotlinAndroid.kt b/build-logic/src/main/java/com/puzzle/build/logic/KotlinAndroid.kt index 5dd6dfb..b4a87bb 100644 --- a/build-logic/src/main/java/com/puzzle/build/logic/KotlinAndroid.kt +++ b/build-logic/src/main/java/com/puzzle/build/logic/KotlinAndroid.kt @@ -39,8 +39,6 @@ internal fun Project.configureKotlinAndroid() { // add("implementation", libs.findLibrary("firebase-analytics").get()) // add("implementation", libs.findLibrary("firebase-crashlytics").get()) // } - - packaging { resources.excludes.add("META-INF/*") } } configureKotlin() diff --git a/feature/auth/src/main/java/com/puzzle/auth/graph/registration/ui/RegistrationDetailScreen.kt b/feature/auth/src/main/java/com/puzzle/auth/graph/registration/ui/RegistrationDetailScreen.kt index 4edf754..1d54837 100644 --- a/feature/auth/src/main/java/com/puzzle/auth/graph/registration/ui/RegistrationDetailScreen.kt +++ b/feature/auth/src/main/java/com/puzzle/auth/graph/registration/ui/RegistrationDetailScreen.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.puzzle.designsystem.R @@ -37,7 +38,8 @@ internal fun RegistrationDetailScreen( url = term.content, modifier = Modifier .fillMaxWidth() - .weight(1f), + .weight(1f) + .clipToBounds(), ) PieceSolidButton(