Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#290 [FEAT] core 모듈 코틀린 라이브러리 모듈로 변경 #295

Merged
merged 1 commit into from
Jul 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions buildSrc/src/main/kotlin/DepExtensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
3 changes: 1 addition & 2 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
37 changes: 6 additions & 31 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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()
}
addOnlyTestDependencies()
}

This file was deleted.

9 changes: 0 additions & 9 deletions core/src/main/AndroidManifest.xml

This file was deleted.

2 changes: 0 additions & 2 deletions core/src/main/java/com/mument_android/core/util/Constants.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
package com.mument_android.core.util

import android.os.Bundle

interface SideEffect {
data class PopBackStack(val bundle: Bundle?): SideEffect
}
interface SideEffect {}
1 change: 0 additions & 1 deletion core/src/main/res/values/strings.xml

This file was deleted.

2 changes: 1 addition & 1 deletion core_dependent/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand All @@ -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)
}
}
Expand Down
Loading