diff --git a/buildSrc/src/main/kotlin/DepExtensions.kt b/buildSrc/src/main/kotlin/DepExtensions.kt index dd56d8883..d5e44b1a9 100644 --- a/buildSrc/src/main/kotlin/DepExtensions.kt +++ b/buildSrc/src/main/kotlin/DepExtensions.kt @@ -89,5 +89,11 @@ fun DependencyHandler.addTestDependencies() { testImplementation(TestDependencies.coroutinesTest) androidTestImplementation(TestDependencies.coreTesting) testImplementation(TestDependencies.coreTesting) +} +fun DependencyHandler.addOnlyTestDependencies() { + testImplementation(TestDependencies.jUnit) + implementation(TestDependencies.mockito) + testImplementation(TestDependencies.coroutinesTest) + testImplementation(TestDependencies.coreTesting) } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 05ab2871a..3e8d8b1ef 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -39,13 +39,12 @@ object Versions { const val protoBuf = "3.18.0" const val roomVersion = "2.4.2" const val paging = "3.1.1" - val javaVersion = JavaVersion.VERSION_17 const val mockitoCoreVersion = "2.28.2" const val mockitoAndroidVersion = "2.24.5" const val googleServiceVersion = "4.3.15" - const val firebasePlatformVersion = "32.1.1" + const val firebasePlatformVersion = "32.2.0" const val firebaseCrashlyticsGradleVersion = "2.9.5" const val kakaoVersion = "2.12.1" const val dotsIndicator = "4.3" diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 2f306694a..3f58c243f 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -1,38 +1,13 @@ plugins { - id("com.android.library") - id("org.jetbrains.kotlin.android") - id("kotlin-kapt") + kotlin("jvm") } -android { - namespace = "com.mument_android.core" - compileSdk = DefaultConfig.COMPILE_SDK - - defaultConfig { - minSdk = DefaultConfig.MIN_SDK - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") - } - - buildTypes { - release { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } - compileOptions { - sourceCompatibility = Versions.javaVersion - targetCompatibility = Versions.javaVersion - } - kotlinOptions { - jvmTarget = DefaultConfig.JVM_TARGET - } +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } dependencies { - addTestDependencies() -} \ No newline at end of file + addOnlyTestDependencies() +} diff --git a/core/src/androidTest/java/com/mument_android/core/ExampleInstrumentedTest.kt b/core/src/androidTest/java/com/mument_android/core/ExampleInstrumentedTest.kt deleted file mode 100644 index a842739d8..000000000 --- a/core/src/androidTest/java/com/mument_android/core/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.mument_android.core - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import org.junit.Assert.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * 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.mument_android.core.test", appContext.packageName) - } -} \ No newline at end of file diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml deleted file mode 100644 index 4408e9ca1..000000000 --- a/core/src/main/AndroidManifest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/core/src/main/java/com/mument_android/core/util/Constants.kt b/core/src/main/java/com/mument_android/core/util/Constants.kt index 33f2998b4..964fdd144 100644 --- a/core/src/main/java/com/mument_android/core/util/Constants.kt +++ b/core/src/main/java/com/mument_android/core/util/Constants.kt @@ -5,8 +5,6 @@ object Constants { const val TO_MUSIC_DETAIL = "TO_MUSIC_DETAIL" const val MUMENT_ID = "MUMENT_ID" const val MUSIC_INFO_ENTITY = "MUSIC_INFO_ENTITY" - - const val START_NAV_KEY = "NAV_FROM_KEY" const val FROM_SEARCH = "FROM_SEARCH" const val FROM_HISTORY = "FROM_HISTORY" diff --git a/core/src/main/java/com/mument_android/core/util/DateFormatter.kt b/core/src/main/java/com/mument_android/core/util/DateFormatter.kt index c0091b1c7..d54d4ad8a 100644 --- a/core/src/main/java/com/mument_android/core/util/DateFormatter.kt +++ b/core/src/main/java/com/mument_android/core/util/DateFormatter.kt @@ -2,10 +2,11 @@ package com.mument_android.core.util import java.text.SimpleDateFormat import java.util.Date +import java.util.Locale class DateFormatter { fun parseDate(date: String): Date? { - return SimpleDateFormat(DATE_FORMAT).parse(date) + return SimpleDateFormat(DATE_FORMAT, Locale.KOREA).parse(date) } companion object { diff --git a/core/src/main/java/com/mument_android/core/util/SideEffect.kt b/core/src/main/java/com/mument_android/core/util/SideEffect.kt index b1d486a6a..9519483ee 100644 --- a/core/src/main/java/com/mument_android/core/util/SideEffect.kt +++ b/core/src/main/java/com/mument_android/core/util/SideEffect.kt @@ -1,7 +1,4 @@ package com.mument_android.core.util -import android.os.Bundle -interface SideEffect { - data class PopBackStack(val bundle: Bundle?): SideEffect -} \ No newline at end of file +interface SideEffect {} \ No newline at end of file diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml deleted file mode 100644 index 73862c416..000000000 --- a/core/src/main/res/values/strings.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core_dependent/build.gradle.kts b/core_dependent/build.gradle.kts index 2331a581e..679e44af6 100644 --- a/core_dependent/build.gradle.kts +++ b/core_dependent/build.gradle.kts @@ -1,8 +1,8 @@ plugins { id("com.android.library") - id("org.jetbrains.kotlin.android") id("kotlin-parcelize") id("kotlin-kapt") + id("org.jetbrains.kotlin.android") } android { diff --git a/core_dependent/src/main/java/com/mument_android/core_dependent/network/ResponseRefreshToken.kt b/core_dependent/src/main/java/com/mument_android/core_dependent/network/ResponseRefreshToken.kt index ef6b23244..cc8b4a2f0 100644 --- a/core_dependent/src/main/java/com/mument_android/core_dependent/network/ResponseRefreshToken.kt +++ b/core_dependent/src/main/java/com/mument_android/core_dependent/network/ResponseRefreshToken.kt @@ -1,5 +1,8 @@ package com.mument_android.core_dependent.network +import androidx.annotation.Keep + +@Keep data class ResponseRefreshToken( val status: Int, val message: String, diff --git a/core_dependent/src/main/java/com/mument_android/core_dependent/util/FirebaseAnalyticsUtil.kt b/core_dependent/src/main/java/com/mument_android/core_dependent/util/FirebaseAnalyticsUtil.kt index 69a7cfd71..45f325079 100644 --- a/core_dependent/src/main/java/com/mument_android/core_dependent/util/FirebaseAnalyticsUtil.kt +++ b/core_dependent/src/main/java/com/mument_android/core_dependent/util/FirebaseAnalyticsUtil.kt @@ -8,30 +8,30 @@ import com.google.firebase.ktx.Firebase object FirebaseAnalyticsUtil { - private val firebaseAnalytics: FirebaseAnalytics? + private val firebaseAnalytics: FirebaseAnalytics get() = Firebase.analytics fun firebaseLog(event: String, paramKey: String, paramVal: String) { - firebaseAnalytics?.logEvent(event) { + firebaseAnalytics.logEvent(event) { param(paramKey, paramVal) } } fun firebaseMumentDetailLog(paramVal : String) { - firebaseAnalytics?.logEvent("mument_detail_page") { + firebaseAnalytics.logEvent("mument_detail_page") { param("type", paramVal) } } //글쓰기 플로팅 버튼 클릭 시 있는 뷰 fun firebaseWritePathLog(paramVal: String) { - firebaseAnalytics?.logEvent("write_path") { + firebaseAnalytics.logEvent("write_path") { param("type", paramVal) } } //뮤멘트 앱에 진입하자마자 나타는 뷰 GA fun firebaseFirstVisitLog(paramVal : String) { - firebaseAnalytics?.logEvent("first_visit_page") { + firebaseAnalytics.logEvent("first_visit_page") { param("choice", paramVal) } } @@ -42,12 +42,12 @@ object FirebaseAnalyticsUtil { for(i in paramVal){ bundle.putString(paramKey, i) } - firebaseAnalytics?.logEvent(event,bundle) + firebaseAnalytics.logEvent(event,bundle) } //글쓰기 취소 fun writeProcessGA(paramVal : String) { - firebaseAnalytics?.logEvent("write_process") { + firebaseAnalytics.logEvent("write_process") { param("journey", paramVal) } } diff --git a/core/src/main/res/drawable/mument_share.xml b/feature/detail/src/main/res/drawable/mument_share.xml similarity index 100% rename from core/src/main/res/drawable/mument_share.xml rename to feature/detail/src/main/res/drawable/mument_share.xml