라이브러리 버전 다운 그레이드

.gitignore

@@ -25,3 +25,4 @@ output-metadata.json
 **/output-metadata.json
 *.zip
 *.apk
+.java-version

app/build.gradle.kts

@@ -5,7 +5,6 @@ import java.util.Properties
 plugins {
     alias(libs.plugins.com.android.application)
     alias(libs.plugins.org.jetbrains.kotlin.android)
-    alias(libs.plugins.compose.compiler)
 }
 
 apply(from = project.rootProject.file("gradle-scripts/base.gradle"))
@@ -53,9 +52,6 @@ android {
             )
         }
     }
-    buildFeatures {
-        buildConfig = true
-    }
 }
 
 dependencies {

build.gradle.kts

@@ -4,7 +4,8 @@ buildscript {
         classpath(libs.classpath.protobuf)
     }
 }
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+// Top-level build file where you can add configuration options common
+// to all sub-projects/modules.
 @Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     alias(libs.plugins.com.android.application) apply false
@@ -22,6 +23,5 @@ plugins {
     alias(libs.plugins.google.services) apply false
     alias(libs.plugins.firebase.crashlytics) apply false
     alias(libs.plugins.firebase.performance) apply false
-    alias(libs.plugins.compose.compiler) apply false
 }
 true

data/build.gradle.kts

@@ -14,9 +14,6 @@ android {
     defaultConfig {
         buildConfigField("String", "API_URL", "\"https://jrq7w2orw3.execute-api.ap-northeast-2.amazonaws.com\"")
     }
-    buildFeatures {
-        buildConfig = true
-    }
 }
 
 dependencies {

data/src/main/java/com/dkin/chevit/data/di/AuthModule.kt

@@ -10,7 +10,6 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 internal class AuthModule {
-    @Singleton
     @Provides
     fun provideFirebaseAuth(): FirebaseAuth {
         return FirebaseAuth.getInstance()

data/src/main/java/com/dkin/chevit/data/di/usecase/AuthUseCaseModule.kt

@@ -13,10 +13,11 @@ import com.dkin.chevit.domain.usecase.auth.WithDrawUserUseCase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
 import dagger.hilt.components.SingletonComponent
 
 @Module
-@InstallIn(SingletonComponent::class)
+@InstallIn(ViewModelComponent::class)
 internal object AuthUseCaseModule {
     @Provides
     fun provideGetUserStateUseCase(

data/src/main/java/com/dkin/chevit/data/di/usecase/NotificationUseCaseModule.kt

@@ -15,7 +15,7 @@ import dagger.hilt.android.components.ViewModelComponent
 import dagger.hilt.components.SingletonComponent
 
 @Module
-@InstallIn(SingletonComponent::class)
+@InstallIn(ViewModelComponent::class)
 internal object NotificationUseCaseModule {
     @Provides
     fun provideGetNotificationSettingUseCase(

data/src/main/java/com/dkin/chevit/data/di/usecase/PlanUseCaseModule.kt

@@ -27,10 +27,11 @@ import com.dkin.chevit.domain.usecase.plan.UpdateTemplateUseCase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
 import dagger.hilt.components.SingletonComponent
 
 @Module
-@InstallIn(SingletonComponent::class)
+@InstallIn(ViewModelComponent::class)
 internal object PlanUseCaseModule {
     @Provides
     fun provideCopyTemplateUseCase(

data/src/main/java/com/dkin/chevit/data/di/usecase/ServiceUseCaseModule.kt

@@ -6,10 +6,11 @@ import com.dkin.chevit.domain.usecase.service.GetAppInfoUseCase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
 import dagger.hilt.components.SingletonComponent
 
 @Module
-@InstallIn(SingletonComponent::class)
+@InstallIn(ViewModelComponent::class)
 internal object ServiceUseCaseModule {
     @Provides
     fun provideGetAppInfoUseCase(

domain/src/main/java/com/dkin/chevit/domain/model/UserState.kt

@@ -3,9 +3,9 @@ package com.dkin.chevit.domain.model
 import com.dkin.chevit.domain.base.DomainModel
 
 sealed interface UserState : DomainModel {
-    data object Guest : UserState
+    object Guest : UserState
 
-    data object NotRegister : UserState
+    object NotRegister : UserState
 
     data class User(
         val id: String,

gradle-scripts/base.gradle

@@ -15,6 +15,10 @@ android {
         release {
             debuggable false
             minifyEnabled true
+            consumerProguardFiles 'consumer-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
+                    'proguard-rules.pro',
+                    'proguard-fixed-r8.pro'
         }
     }
 

gradle-scripts/compose.gradle

@@ -2,6 +2,9 @@ android {
     buildFeatures {
         compose = true
     }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.3"
+    }
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.toString()
     }
@@ -15,3 +18,4 @@ dependencies {
     implementation(libs.compose.uiToolingPreview)
     implementation(libs.compose.material3)
 }
+

gradle-scripts/dagger.gradle

@@ -1,6 +1,6 @@
-apply plugin: "com.google.devtools.ksp"
+apply plugin: "kotlin-kapt"
 
 dependencies {
     implementation libs.dagger.core
-    ksp libs.dagger.compiler
+    kapt libs.dagger.compiler
 }

gradle-scripts/hilt.gradle

@@ -1,5 +1,5 @@
 apply plugin: "dagger.hilt.android.plugin"
-apply plugin: "com.google.devtools.ksp"
+apply plugin: "kotlin-kapt"
 
 android {
     hilt {
@@ -9,24 +9,8 @@ android {
 
 dependencies {
     implementation libs.hilt.android
-    ksp libs.hilt.compiler
+    kapt libs.hilt.compiler
 
     testImplementation libs.hilt.android.testing
-    kspTest libs.hilt.compiler
+    kaptTest libs.hilt.compiler
 }
-
-androidComponents {
-    onVariants(selector().all(), { variant ->
-        afterEvaluate {
-            def capName = variant.name.capitalize()
-            def kspTask = tasks.findByName("ksp${capName}Kotlin")
-            if (kspTask != null) {
-                def protoTask = tasks.findByName("generate${capName}Proto")
-                if (protoTask != null) {
-                    kspTask.setSource(protoTask.outputs)
-                }
-            }
-        }
-    })
-}
-

gradle.properties

@@ -25,4 +25,5 @@ android.nonTransitiveRClass=true
 compileSdk = 34
 minSdk = 26
 targetSdk = 34
+android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false

gradle/libs.versions.toml

@@ -1,60 +1,60 @@
 [versions]
 # Plugin
-ksp = "2.0.21-1.0.26"
-androidGradlePlugin = "8.6.0"
+ksp = "1.9.0-1.0.13"
+androidGradlePlugin = "8.0.2"
 
 # Kotlin
-kotlin = "2.0.21"
-coroutines = "1.9.0"
+kotlin = "1.8.10"
+coroutines = "1.7.3"
 
 # AndroidX
-ktx = "1.13.1"
-lifecycle = "2.8.6"
-appCompat = "1.7.0"
-activity = "1.9.3"
-fragment = "1.8.4"
-recyclerView = "1.3.2"
-navigation = "2.8.0"
+ktx = "1.9.0"
+lifecycle = "2.5.1"
+appCompat = "1.6.1"
+activity = "1.6.1"
+fragment = "1.5.5"
+recyclerView = "1.2.1"
+navigation = "2.5.3"
 startup = "1.1.1"
-play-services-auth = "21.2.0"
-data-store = "1.1.1"
-material = "1.12.0"
-protobuf-plugin = "0.9.4"
-protobuf = "3.25.1"
-browser = "1.8.0"
+play-services-auth = "20.6.0"
+data-store = "1.0.0"
+material = "1.9.0"
+protobuf-plugin = "0.9.1"
+protobuf = "3.18.0"
+browser = "1.4.0"
 lifecycleProcess = "2.8.6"
 
 # Firebase
-google-services = "4.4.2"
-firebase-crashlytics = "3.0.2"
+google-services = "4.3.15"
+firebase-crashlytics = "2.9.4"
 firebase-performance = "1.4.2"
-firebase-bom = "33.3.0"
+firebase-bom = "32.1.1"
 
 # Compose
-compose-bom = "2024.10.00"
-compose-hilt-navigation = "1.2.0"
+compose-bom = "2023.04.01"
 
 # DI
-hilt = "2.52"
-dagger = "2.52"
+hilt = "2.47"
+hiltExt = "1.0.0"
+dagger = "2.47"
 
 # Network
-okhttp = "4.12.0"
-retrofit = "2.11.0"
-chucker = "4.0.0"
+okhttp = "4.11.0"
+retrofit = "2.9.0"
+chucker = "3.5.2"
 
 # Coil
-coil = "2.7.0"
-coil-compose = "2.7.0"
+coil = "2.4.0"
+coil-compose = "2.4.0"
 
 # Lottie
-lottie-compose = "6.5.2"
+lottie-compose = "6.1.0"
 
 # Logger
 timber = "5.0.1"
 junit = "4.13.2"
-androidx-test-ext-junit = "1.2.1"
-espresso-core = "3.6.1"
+androidx-test-ext-junit = "1.1.5"
+espresso-core = "3.5.1"
 
 [libraries]
 #Kotlin
@@ -63,7 +63,7 @@ kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core",
 kotlin-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlin-coroutines-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core-jvm", version.ref = "coroutines" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
-kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.2" }
+kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.5.1" }
 
 #AndroidX
 androidx-ktx = { module = "androidx.core:core-ktx", version.ref = "ktx" }
@@ -83,14 +83,14 @@ compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-
 compose-ui = { group = "androidx.compose.ui", name = "ui" }
 compose-activity = { group = "androidx.activity", name = "activity-compose", version.ref = "activity" }
 compose-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
-compose-material3 = { group = "androidx.compose.material3", name = "material3", version = "1.3.0" }
+compose-material3 = { group = "androidx.compose.material3", name = "material3", version = "1.1.0-alpha07" }
 compose-uiGraphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 compose-uiTooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 compose-uiToolingPreview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 compose-test-uiManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 compose-test-ui = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 compose-viewModel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
-compose-hiltViewModel = { group = "androidx.hilt", name = "hilt-navigation-compose", version = "1.2.0" }
+compose-hiltViewModel = { group = "androidx.hilt", name = "hilt-navigation-compose", version = "1.0.0" }
 
 # Firebase
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
@@ -132,6 +132,8 @@ dagger-compiler = { group = "com.google.dagger", name = "dagger-compiler", versi
 hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
 hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" }
 hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }
+hilt-ext-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "hiltExt" }
+hilt-ext-work = { group = "androidx.hilt", name = "hilt-work", version.ref = "hiltExt" }
 
 #Coil
 coil-core = { group = "io.coil-kt", name = "coil", version.ref = "coil" }
@@ -161,7 +163,6 @@ com-android-library = { id = "com.android.library", version.ref = "androidGradle
 com-android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
 com-google-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 com-google-protobuf = { id = "com.google.protobuf", version.ref = "protobuf-plugin" }
-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Jul 01 00:45:52 KST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

presentation/auth/build.gradle.kts

@@ -2,7 +2,6 @@
 plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
-    alias(libs.plugins.compose.compiler)
 }
 
 apply(from = project.rootProject.file("gradle-scripts/base.gradle"))

presentation/checklist/build.gradle.kts

@@ -2,7 +2,6 @@
 plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
-    alias(libs.plugins.compose.compiler)
 }
 
 apply(from = project.rootProject.file("gradle-scripts/base.gradle"))

presentation/checklist/src/main/java/com/dkin/chevit/presentation/checklist/main/component/CountryInfo.kt

@@ -68,7 +68,7 @@ fun CountryInfo(
             Spacer(modifier = Modifier.height(16.dp))
         }
         if (weathers.isNotEmpty()) {
-            val pagerState = rememberPagerState(initialPage = 0){ weathers.size }
+            val pagerState = rememberPagerState(initialPage = 0)
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -89,7 +89,8 @@ fun CountryInfo(
                     modifier = Modifier,
                     state = pagerState,
                     pageSpacing = 22.dp,
-                    pageSize = PageSize.Fixed(50.dp)
+                    pageSize = PageSize.Fixed(50.dp),
+                    pageCount = weathers.size
                 ) {
                     Weather(weathers[it])
                 }
@@ -156,4 +157,4 @@ private fun Weather(weather: ChecklistState.Available.Weather) {
             style = ChevitTheme.typhography.bodyMedium.copy(color = ChevitTheme.colors.textSecondary)
         )
     }
-}
+}

presentation/home/build.gradle.kts

@@ -2,7 +2,6 @@
 plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
-    alias(libs.plugins.compose.compiler)
 }
 
 apply(from = project.rootProject.file("gradle-scripts/base.gradle"))