fix : target sdk update and library version update

app/build.gradle.kts

@@ -14,7 +14,6 @@ plugins {
     id("com.google.firebase.crashlytics")
     id("dagger.hilt.android.plugin")
     kotlin("android")
-    kotlin("android.extensions")
     kotlin("kapt")
     id("androidx.navigation.safeargs.kotlin")
     id("com.google.android.gms.oss-licenses-plugin")
@@ -90,10 +89,8 @@ android {
             multiDexEnabled = true
         }
     }
+    namespace = "com.ddd4.synesthesia.beer"
 
-    androidExtensions {
-        isExperimental = true
-    }
     hilt {
         enableAggregatingTask = ENABLE_AGGREGATING_TASK
     }
@@ -110,7 +107,7 @@ dependencies {
     implementation(Libs.TIMBER)
     implementation(Libs.HILT)
     kapt(Libs.HILT_ANNOTATION)
-    implementation(Libs.HILT_VIEWMODEL)
+//    implementation(Libs.HILT_VIEWMODEL)
     kapt(Libs.HILT_COMPILER)
 
     implementation(Libs.KAKAO)

app/src/dev/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.ddd4.synesthesia.beer">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:networkSecurityConfig="@xml/network_security_config"

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.ddd4.synesthesia.beer">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

build.gradle.kts

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -19,7 +19,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { setUrl("https://devrepo.kakao.com/nexus/content/groups/public/") }
         maven { setUrl("https://jitpack.io") }
     }

buildSrc/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }

buildSrc/src/main/kotlin/AndroidConfig.kt

@@ -1,16 +1,16 @@
 import org.gradle.api.JavaVersion
 
 object AndroidConfig {
-    const val COMPILE_SDK_VERSION = 31
+    const val COMPILE_SDK_VERSION = 35
     const val MIN_SDK_VERSION = 23
-    const val TARGET_SDK_VERSION = 30
+    const val TARGET_SDK_VERSION = 35
 
     const val VERSION_CODE = 11
     const val VERSION_NAME = "2.0.0"
 
-    const val BUILD_TOOLS_VERSION = "30.0.3"
+    const val BUILD_TOOLS_VERSION = "34.0.0"
     const val APPLICATION_ID = "com.ddd4.synesthesia.beer"
     const val TEST_INSTRUMENTATION_RUNNER = "androidx.test.runner.AndroidJUnitRunner"
-    val JAVA_VERSION = JavaVersion.VERSION_11
+    val JAVA_VERSION = JavaVersion.VERSION_17
 
 }

buildSrc/src/main/kotlin/Dependencies.kt

@@ -53,8 +53,8 @@ object Libs {
         "com.google.android.gms:play-services-oss-licenses:${Versions.OSS_LICENSES}"
 
     //
-    const val SNAP_RECYCLERVIEW =
-        "com.yarolegovich:discrete-scrollview:${Versions.SNAP_RECYCLERVIEW}"
+//    const val SNAP_RECYCLERVIEW =
+//        "com.yarolegovich:discrete-scrollview:${Versions.SNAP_RECYCLERVIEW}"
     const val LOTTIE = "com.airbnb.android:lottie:${Versions.LOTTIE}"
 
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -1,7 +1,7 @@
 object Versions {
     // Kotlin
-    const val GRADLE = "7.1.1"
-    const val KOTLIN = "1.4.10"
+    const val GRADLE = "8.4.0"
+    const val KOTLIN = "1.9.0"
     const val COROUTINES = "1.3.7"
 
     // Android Framework
@@ -10,30 +10,30 @@ object Versions {
     const val COORDINATOR_LAYOUT = "1.1.0"
     const val RECYCLER_VIEW = "1.1.0"
     const val MATERIAL = "1.2.0"
-    const val BILLING = "5.0.0"
+    const val BILLING = "7.0.0"
 
     const val CORE_KTX = "1.3.0"
     const val ACTIVITY_KTX = "1.1.0"
     const val FRAGMENT_KTX = "1.2.4"
     const val LIFECYCLE = "2.4.0"
-    const val NAVIGATION_VERSION = "2.3.5"
-    const val GOOGLE_SERVIER = "4.3.4"
+    const val NAVIGATION_VERSION = "2.7.7"
+    const val GOOGLE_SERVIER = "4.4.2"
 
     // ThirdParty Libraries
     const val RETROFIT = "2.8.2"
     const val GLIDE = "4.11.0"
     const val OK_HTTP = "4.7.2"
     const val GSON = "2.8.6"
-    const val HILT = "2.40.5"
+    const val HILT = "2.51.1"
     const val HILT_EXTENSION = "1.0.0-alpha03"
     const val TIMBER = "4.7.1"
     const val KAKAO = "2.0.3"
     const val RANGE_SEEK_BAR = "3.0.0"
     const val GOOGLE_BOM = "26.3.0"
-    const val GOOGLE_CRASHLYTICS = "2.3.0"
+    const val GOOGLE_CRASHLYTICS = "3.0.2"
     const val FIREBASE_ANALYTICS = "17.5.0"
     const val FIREBASE_CRASHLYTICS = "17.2.1"
-    const val OSS_LICENSES_PLUGIN = "0.10.4"
+    const val OSS_LICENSES_PLUGIN = "0.10.6"
     const val OSS_LICENSES = "17.0.0"
 
     //

core/build.gradle.kts

@@ -44,6 +44,7 @@ android {
     buildFeatures {
         dataBinding = true
     }
+    namespace = "com.hjiee.core"
     hilt {
         enableAggregatingTask = ENABLE_AGGREGATING_TASK
     }
@@ -58,7 +59,7 @@ dependencies {
     implementation(Libs.TIMBER)
     implementation(Libs.HILT)
     kapt(Libs.HILT_ANNOTATION)
-    implementation(Libs.HILT_VIEWMODEL)
+//    implementation(Libs.HILT_VIEWMODEL)
     kapt(Libs.HILT_COMPILER)
 
     implementation(platform(Libs.FIREBASE))

core/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.hjiee.core">
+<manifest>
 
 </manifest>

core/src/main/java/com/hjiee/core/event/SingleContentEvent.kt

@@ -42,19 +42,4 @@ open class SingleContentEvent<out T>(private val content: T) {
      * Returns the content, even if it's already been handled.
      */
     fun peekContent(): T = content
-}
-
-/**
- * An [Observer] for [SingleContentEvent]s, simplifying the pattern of checking if the [SingleContentEvent]'s content has
- * already been handled.
- *
- * [onEventUnhandledContent] is *only* called if the [SingleContentEvent]'s contents has not been handled.
- */
-class EventObserver<T>(private val onEventUnhandledContent: (T) -> Unit) :
-    Observer<SingleContentEvent<T>> {
-    override fun onChanged(singleContentEvent: SingleContentEvent<T>?) {
-        singleContentEvent?.getContentIfNotHandled()?.let {
-            onEventUnhandledContent(it)
-        }
-    }
 }

core/src/main/java/com/hjiee/core/ext/Extensions.kt

@@ -44,8 +44,4 @@ fun Boolean?.toggle(): Boolean = this?.not() ?: false
 /**
  * string
  */
-fun String?.orDefault(default: String): String = if (this.isNullOrEmpty()) {
-    default
-} else {
-    this
-}
+fun String?.orDefault(default: String): String = this ?: default

core/src/main/java/com/hjiee/core/manager/VersionManager.kt

@@ -17,7 +17,7 @@ class VersionManager @Inject constructor(
 
     val version: String
         get() = try {
-            context.packageManager.getPackageInfo(context.packageName, 0).versionName
+            context.packageManager.getPackageInfo(context.packageName, 0).versionName.orEmpty()
         } catch (e: Exception) {
             L.e(e)
             ""

core/src/main/java/com/hjiee/core/util/log/CrashlyticsLog.kt

@@ -1,8 +1,8 @@
 package com.hjiee.core.util.log
 
 import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.ktx.BuildConfig
 import com.google.firebase.ktx.Firebase
-import com.hjiee.core.BuildConfig
 
 object CrashlyticsLog {
 

core/src/main/java/com/hjiee/core/util/log/L.kt

@@ -1,6 +1,6 @@
 package com.hjiee.core.util.log
 
-import com.hjiee.core.BuildConfig
+import com.google.firebase.ktx.BuildConfig
 import com.hjiee.core.util.log.timber.CrashlyticsTree
 import timber.log.Timber
 

data/build.gradle.kts

@@ -40,6 +40,7 @@ android {
             dimension = "mode"
         }
     }
+    namespace = "com.hjiee.data"
     hilt {
         enableAggregatingTask = ENABLE_AGGREGATING_TASK
     }
@@ -63,7 +64,7 @@ dependencies {
 
     implementation(Libs.HILT)
     kapt(Libs.HILT_ANNOTATION)
-    implementation(Libs.HILT_VIEWMODEL)
+//    implementation(Libs.HILT_VIEWMODEL)
     kapt(Libs.HILT_COMPILER)
 
     implementation(Libs.KAKAO)

data/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.hjiee.data">
+<manifest>
 
 </manifest>

data/src/main/java/com/hjiee/data/di/AuthenticatorModule.kt

@@ -56,7 +56,7 @@ object AuthenticatorModule {
         @Named(PROVIDE_NAME_AUTHENTICATOR_OKHTTP) okHttp: OkHttpClient
     ): BeerApi {
         return Retrofit.Builder()
-            .baseUrl(stringProvider.getStringRes(R.string.base_url))
+            .baseUrl(stringProvider.getStringRes(com.hjiee.domain.R.string.base_url))
             .addConverterFactory(GsonConverterFactory.create())
             .client(okHttp)
             .build()

data/src/main/java/com/hjiee/data/di/InterceptorModule.kt

@@ -1,9 +1,9 @@
 package com.hjiee.data.di
 
-import com.hjiee.core.BuildConfig
 import com.hjiee.core.manager.VersionManager
 import com.hjiee.core.provider.SharedPreferenceProvider
 import com.hjiee.data.authentication.AuthenticationInterceptor
+import com.kakao.sdk.auth.BuildConfig
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

data/src/main/java/com/hjiee/data/di/NetworkModule.kt

@@ -56,7 +56,7 @@ object NetworkModule {
         @Named(PROVIDE_NAME_OKHTTP) okHttp: OkHttpClient
     ): Retrofit {
         return Retrofit.Builder()
-            .baseUrl(stringProvider.getStringRes(R.string.base_url))
+            .baseUrl(stringProvider.getStringRes(com.hjiee.domain.R.string.base_url))
             .addConverterFactory(GsonConverterFactory.create())
             .client(okHttp)
             .build()

domain/build.gradle.kts

@@ -44,6 +44,7 @@ android {
             dimension = "mode"
         }
     }
+    namespace = "com.hjiee.domain"
     hilt {
         enableAggregatingTask = ENABLE_AGGREGATING_TASK
     }
@@ -57,7 +58,7 @@ dependencies {
     implementation(Libs.GSON)
     implementation(Libs.HILT)
     kapt(Libs.HILT_ANNOTATION)
-    implementation(Libs.HILT_VIEWMODEL)
+//    implementation(Libs.HILT_VIEWMODEL)
     kapt(Libs.HILT_COMPILER)
 
 //    implementation("androidx.core:core-ktx:1.3.2")

domain/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hjiee.domain">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest>

gradle.properties

@@ -18,4 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+android.suppressUnsupportedCompileSdk=35

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Nov 16 20:13:08 KST 2020
+#Fri Jul 26 22:19:31 KST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

presentation/build.gradle.kts

@@ -5,7 +5,6 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
     id("dagger.hilt.android.plugin")
-    kotlin("android.extensions")
     kotlin("kapt")
     id("androidx.navigation.safeargs.kotlin")
 }
@@ -15,7 +14,7 @@ android {
 
     defaultConfig {
         minSdk = AndroidConfig.MIN_SDK_VERSION
-        targetSdk = AndroidConfig.TARGET_SDK_VERSION
+        testOptions.targetSdk = AndroidConfig.TARGET_SDK_VERSION
 
         manifestPlaceholders[KAKAO] = getKakaoKey()
 
@@ -57,6 +56,7 @@ android {
     kotlinOptions {
         jvmTarget = AndroidConfig.JAVA_VERSION.toString()
     }
+    namespace = "com.hjiee.presentation"
 }
 
 dependencies {
@@ -95,14 +95,14 @@ dependencies {
     implementation(Libs.TIMBER)
     implementation(Libs.HILT)
     kapt(Libs.HILT_ANNOTATION)
-    implementation(Libs.HILT_VIEWMODEL)
+//    implementation(Libs.HILT_VIEWMODEL)
     kapt(Libs.HILT_COMPILER)
     implementation(Libs.KAKAO)
     implementation(Libs.RANGE_SEEK_BAR)
 
     implementation(Libs.LICENSES)
 
-    implementation(Libs.SNAP_RECYCLERVIEW)
+//    implementation(Libs.SNAP_RECYCLERVIEW)
     implementation(Libs.LOTTIE)
 
     testImplementation(TestLibs.JUNIT)

presentation/src/main/AndroidManifest.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.hjiee.presentation">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application>
         <activity
             android:name="com.hjiee.presentation.ui.splash.view.SplashActivity"
             android:screenOrientation="portrait"
+            android:exported="true"
             tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

presentation/src/main/java/com/hjiee/presentation/ui/common/filter/AromaProvider.kt

@@ -44,7 +44,7 @@ class AromaProvider @Inject constructor(
         value: List<AromaItemViewModel>?
     ) {
         preference.setValue(KEY_EXTRA_FILTER_AROMA, Gson().toJson(value))
-        channel.offer(value)
+        channel.trySend(value)
     }
 
     override fun getValue(