Merge pull request #708 from Daily-DAYO/enhancement/issue-699

Clean up unused resources and update project configuration

Author: DongJun-H

README.md

@@ -27,7 +27,7 @@ git clone git@github.com:Daily-DAYO/DAYO_Android.git
 
 ## Application Version
 - minSdkVersion : 26<br>
-- targetSdkVersion : 35
+- targetSdkVersion : 36
 
 ## Git Convention
 - Create issue<br>

app/build.gradle

@@ -1,11 +1,12 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
-    id 'io.sentry.android.gradle'
 }
 
 Properties properties = new Properties()
@@ -14,16 +15,11 @@ def NATIVE_APP_KEY = properties.getProperty('NATIVE_APP_KEY')
 def ADS_APPLICATION_ID = properties.getProperty('ADS_APPLICATION_ID')
 def keystorePropertiesFile = rootProject.file("app/keystore-release.properties")
 
-sentry {
-    setIncludeProguardMapping(true)
-    setAutoUploadProguardMapping(true)
-    setUploadNativeSymbols(false)
-    setIncludeNativeSources(false)
-    setAutoUpload(true)
-}
-
 kotlin {
     jvmToolchain(17)
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
 }
 
 android {
@@ -87,12 +83,6 @@ android {
             buildConfigField("String", "BASE_URL", properties['BASE_URL_PROD'])
         }
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-    buildFeatures {
-        dataBinding true
-    }
     namespace 'com.daily.dayo'
 }
 
@@ -102,26 +92,22 @@ dependencies {
     implementation project(':domain')
     implementation project(':data')
 
-    def sentry_version = "8.24.0"
-    def glide_version = "4.15.1"
+    def glide_version = "5.0.5"
 
     // Hilt
-    implementation "com.google.dagger:hilt-android:2.44"
-    kapt "com.google.dagger:hilt-android-compiler:2.44"
+    implementation "com.google.dagger:hilt-android:2.57.2"
+    kapt "com.google.dagger:hilt-android-compiler:2.57.2"
     // Kakao sdk
     implementation "com.kakao.sdk:v2-user:2.9.0"
     // Glide
     implementation "com.github.bumptech.glide:glide:$glide_version"
-    kapt "com.github.bumptech.glide:compiler:$glide_version"
     // Sentry
-    implementation platform("io.sentry:sentry-bom:$sentry_version")
-    implementation('io.sentry:sentry-android')
-    implementation('io.sentry:sentry-android-fragment')
     implementation 'org.slf4j:slf4j-nop:2.0.17'
     // Firebase
-    implementation 'com.google.firebase:firebase-crashlytics-ktx'
-    implementation 'com.google.firebase:firebase-analytics-ktx'
+    implementation platform('com.google.firebase:firebase-bom:34.6.0')
+    implementation "com.google.firebase:firebase-crashlytics"
+    implementation "com.google.firebase:firebase-analytics"
 
     // Google Ads
-    implementation 'com.google.android.gms:play-services-ads:23.6.0'
+    implementation 'com.google.android.gms:play-services-ads:24.7.0'
 }

app/src/androidTest/java/com/daily/dayo/ExampleInstrumentedTest.kt

@@ -1,24 +1,10 @@
 package com.daily.dayo
 
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
-@RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.daily.dayo", appContext.packageName)
-    }
+
 }

app/src/main/AndroidManifest.xml

@@ -20,13 +20,6 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.DAYO"
         android:enableOnBackInvokedCallback="true">
-        <meta-data android:name="io.sentry.dsn" android:value="https://7f03a2b5d1c24582bfca11c28231a45f@o4504230448136192.ingest.sentry.io/4504230448988160" />
-        <!-- Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.
-           We recommend adjusting this value in production. -->
-        <meta-data android:name="io.sentry.traces.sample-rate" android:value="1.0" />
-        <!-- Enable user interaction tracing to capture transactions for various UI events (such as clicks or scrolls). -->
-        <meta-data android:name="io.sentry.traces.user-interaction.enable" android:value="true" />
-
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
             android:resource="@drawable/ic_dayo_logo" />

app/src/main/java/com/daily/dayo/DayoApplication.kt

@@ -3,9 +3,9 @@ package com.daily.dayo
 import android.app.Application
 import com.bumptech.glide.Glide
 import com.google.android.gms.ads.MobileAds
+import com.google.firebase.Firebase
 import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.analytics.ktx.analytics
-import com.google.firebase.ktx.Firebase
+import com.google.firebase.analytics.analytics
 import com.kakao.sdk.common.KakaoSdk
 import dagger.hilt.android.HiltAndroidApp
 

app/src/main/res/xml/network_security_config.xml

@@ -1,17 +1,10 @@
 package com.daily.dayo
 
-import org.junit.Test
-
-import org.junit.Assert.*
 
 /**
  * Example local unit test, which will execute on the development machine (host).
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
 }

app/src/test/java/com/daily/dayo/ExampleUnitTest.kt

@@ -2,26 +2,25 @@
 buildscript {
     ext {
         javaInjectVersion = '1'
-        kotlin_version = '1.8.20'
-        compose_version = '1.4.6'
-        nav_version = '2.6.0'
-        paging_version = "3.2.0"
-        targetSdkVersion = 35
-        compileSdkVersion = 35
+        kotlin_version = '2.2.21'
+        nav_version = '2.9.6'
+        paging_version = "3.3.6"
+        targetSdkVersion = 36
+        compileSdkVersion = 36
         minSdkVersion = 26
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.13.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version")
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44'
-        classpath 'com.google.gms:google-services:4.3.15'
-        classpath 'io.sentry:sentry-android-gradle-plugin:4.13.0'
-        classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.9"
+        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.57.2'
+        classpath 'com.google.gms:google-services:4.4.4'
+        classpath "com.google.firebase:firebase-crashlytics-gradle:3.0.6"
+        classpath "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.2.21"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
@@ -7,6 +9,9 @@ plugins {
 
 kotlin {
     jvmToolchain(17)
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
 }
 
 Properties properties = new Properties()
@@ -49,46 +54,41 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
 }
 
 dependencies {
     // multiModule
     implementation project(':domain')
 
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.core:core-ktx:1.17.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'com.google.android.material:material:1.13.0'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
 
     // Hilt
-    implementation "com.google.dagger:hilt-android:2.44"
-    kapt "com.google.dagger:hilt-android-compiler:2.44"
-    kapt 'androidx.hilt:hilt-compiler:1.0.0'
+    implementation "com.google.dagger:hilt-android:2.57.2"
+    kapt "com.google.dagger:hilt-android-compiler:2.57.2"
+    kapt 'androidx.hilt:hilt-compiler:1.3.0'
 
     // retrofit2
-    implementation group: 'com.squareup.retrofit2', name: 'retrofit', version: '2.9.0'
-    implementation group: 'com.squareup.retrofit2', name: 'converter-gson', version: '2.9.0'
-    implementation group: 'com.squareup.retrofit2', name: 'converter-scalars', version: '2.9.0'
+    implementation group: 'com.squareup.retrofit2', name: 'retrofit', version: '3.0.0'
+    implementation group: 'com.squareup.retrofit2', name: 'converter-gson', version: '3.0.0'
+    implementation group: 'com.squareup.retrofit2', name: 'converter-scalars', version: '3.0.0'
     // JSON을 직렬화
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.13.2'
     // 직렬화된 JSON을 객체로 역직렬화
 
     // OKHttp
-    implementation "com.squareup.okhttp3:okhttp:4.9.2"
-    implementation "com.squareup.okhttp3:okhttp-urlconnection:4.9.2"
+    implementation "com.squareup.okhttp3:okhttp:5.3.0"
+    implementation "com.squareup.okhttp3:okhttp-urlconnection:5.3.0"
     // Use for HttpLoggingInterceptor
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.2"
+    implementation "com.squareup.okhttp3:logging-interceptor:5.3.0"
 
     // Preference
-    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
 
     // paging
     implementation "androidx.paging:paging-runtime-ktx:$paging_version"
-    // optional - Jetpack Compose integration
-    implementation "androidx.paging:paging-compose:3.2.0"
 }

data/build.gradle

@@ -1,17 +1,10 @@
 package daily.dayo.data
 
-import org.junit.Test
-
-import org.junit.Assert.*
 
 /**
  * Example local unit test, which will execute on the development machine (host).
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
 }