Skip to content

[feature] 빌드로직, 예외처리 개선, 멀티모듈 적용 #179

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

Open
wants to merge 68 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
c51c2ef
[feature] core 모듈 추가
miller198 Jan 27, 2025
8a3832d
Merge branch 'feature/module' into feature/#51-module
miller198 Feb 1, 2025
b11d5e2
[style] 코드위치조정, 필요없는 변수 삭제
miller198 Feb 1, 2025
a827dc7
Merge branch 'feature/module' into feature/#51-module
miller198 Feb 1, 2025
0bb1ed6
[refactor] firebase repository 기능별 분리
miller198 Feb 1, 2025
b3a48f8
Merge branch 'develop' into feature/#51-module
miller198 Feb 11, 2025
bceff1a
[refactor] develop merge 후 정리
miller198 Feb 11, 2025
b88c729
[chore] 패키지 정리
miller198 Feb 11, 2025
84767e9
[refactor] datasource 정리 중
miller198 Feb 11, 2025
7122fbd
[refactor] Firebase Datasource 분리
miller198 Feb 11, 2025
2c9c873
[refactor] Local Datasource, Repository 분리
miller198 Feb 13, 2025
1a3fa89
[chore] 모듈화 이전 패키지 정리, di 분리, mapper 분리
miller198 Feb 14, 2025
a330dc2
[feature] core.firebase 모듈 추가
miller198 Feb 14, 2025
55a3f5a
[chore] 필요없는 파일 삭제
miller198 Feb 14, 2025
f6045e7
[chore] data, domain 모듈 분리 중
miller198 Feb 18, 2025
5aac499
[chore] data 모듈 분리
miller198 Feb 18, 2025
876c37a
[chore] core musicvideo, 패키지 수정
miller198 Feb 21, 2025
da598e3
[build] 버전 카탈로그 정리
miller198 Feb 23, 2025
7ce538e
[chore] account 모듈, feature 모듈
miller198 Feb 23, 2025
91d5da0
[build] libs.version 정리, 번들 추가
miller198 Feb 27, 2025
2d6c69d
[chore] 패키지명 변경
miller198 Feb 27, 2025
ae0b00b
[feature] build login 모듈
miller198 Feb 27, 2025
d2769ad
[chore] gitignore 누락 추가
miller198 Feb 27, 2025
4722fec
[build] version 카탈로그
miller198 Mar 2, 2025
f73dacc
[fix] build-logic 모듈 빌드 에러 수정
miller198 Mar 2, 2025
6d4ead7
[feature] build config ¸ðµâ Ã߰¡
miller198 Mar 2, 2025
32568ad
[refactor] core.localproperties -> core.buildconfig
miller198 Mar 2, 2025
c015f8d
[build] 자바 버전 수정
miller198 Mar 2, 2025
454b729
[refactor] buildconfig 모듈 적용
miller198 Mar 2, 2025
cd2d358
[refactor] buildconfig 모듈 적용
miller198 Mar 2, 2025
88d3a15
[refactor] build logic 적용
miller198 Mar 2, 2025
35c5f2b
[fix] material 의존성 누락 수정
miller198 Mar 4, 2025
a3117ea
[refactor] 의존성 플러그인 코드 정리
miller198 Mar 4, 2025
458926b
[feature] feature 플러그인 추가
miller198 Mar 4, 2025
b5765d0
[refactor] compose, feature 플러그인 사용
miller198 Mar 4, 2025
d7f9bb1
[refactor] 이름변경, 함수삭제
miller198 Mar 4, 2025
b1b807e
[refactor] 예외처리 개선
miller198 Mar 7, 2025
d945e7e
[feature] feature/favorite 모듈
miller198 Mar 7, 2025
c0318c7
Merge branch 'develop' into feature/#51-module
miller198 Mar 7, 2025
04135bd
[fix] merge 후 정리
miller198 Mar 7, 2025
24e1da7
[refactor] user 예외처리 수정
miller198 Mar 8, 2025
05aca56
[refactor] userId -> uid
miller198 Mar 26, 2025
4b1e2ba
[refactor] datasource 인터페이스 위치 조정
miller198 Mar 26, 2025
45d131e
[feature] :feature:search 모듈 추가
miller198 Mar 26, 2025
6532939
[feature] :feature:userinfo 모듈 추가
miller198 Mar 26, 2025
e389485
[refactor] userid -> uid 수정
miller198 Mar 26, 2025
6ca2121
[feature] :feature:mypick 모듈 추가
miller198 Mar 26, 2025
6f93973
[refactor] Domain, Data 모듈 적용
miller198 Apr 22, 2025
af6b1e0
[refactor] core:navigation 적용
miller198 Apr 22, 2025
5430285
[refactor] core:common 적용
miller198 Apr 22, 2025
073ab0f
[refactor] 필요없는 코드 삭제
miller198 Apr 22, 2025
6cbd050
[refactor] core:account 적용
miller198 Apr 22, 2025
1d9b469
[refactor] feature:userinfo 적용
miller198 Apr 22, 2025
ea3891f
[refactor] feature:search 적용
miller198 Apr 22, 2025
e91027a
[refactor] feature:favorite 적용
miller198 Apr 22, 2025
5ebf440
[refactor] feature:mypick 적용
miller198 Apr 22, 2025
f894d9f
[refactor] feature:detail 적용
miller198 Apr 22, 2025
dc8a7cf
[refactor] feature:map 적용
miller198 Apr 22, 2025
3808a84
[refactor] feature:main 적용
miller198 Apr 23, 2025
47919be
Merge branch 'develop' into feature/#51-module
miller198 Apr 23, 2025
530e475
[refactor] mediaservice 모듈 삭제
miller198 Apr 23, 2025
4e8c644
[chore] 패키지 수정
miller198 Apr 23, 2025
3e69c9d
[chore] android namespace 변경
miller198 Apr 23, 2025
6fd560b
[chore] 필요없는 resource 삭제
miller198 Apr 23, 2025
9afe83c
[fix] mapper change
miller198 Apr 27, 2025
8b53a32
[merge] #173-real-time-pick 반영
miller198 Apr 28, 2025
968cdc5
Merge branch 'develop' into feature/#51-module
miller198 Apr 28, 2025
eaa197a
[chore] consumer-rules.pro 삭제
miller198 Apr 28, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
102 changes: 18 additions & 84 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,18 @@ val keystoreProperties = Properties()
keystoreProperties.load(FileInputStream(rootProject.file("app/keystore.properties")))

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.jetbrains.kotlin.android)
alias(libs.plugins.musicroad.android.application)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
alias(libs.plugins.google.services)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.firebase.crashlytics)
}

android {
namespace = "com.squirtles.musicroad"
compileSdk = 34

defaultConfig {
applicationId = "com.squirtles.musicroad"
minSdk = 26
targetSdk = 34
versionCode = 10100
versionName = "1.1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary = true
}

addManifestPlaceholders(mapOf("NAVERMAP_CLIENT_ID" to properties.getProperty("NAVERMAP_CLIENT_ID")))

buildConfigField(
"String",
"GOOGLE_CLIENT_ID",
"\"${properties.getProperty("GOOGLE_CLIENT_ID")}\""
)
}

signingConfigs {
Expand Down Expand Up @@ -75,20 +55,9 @@ android {
signingConfig = signingConfigs.getByName("signedRelease")
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
}
buildFeatures {
viewBinding = true
buildConfig = true
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.1"
}
packaging {
resources {
Expand All @@ -98,73 +67,38 @@ android {
}

dependencies {
implementation(projects.domain)
implementation(projects.data)
implementation(projects.mediaservice)
implementation(projects.core.navigation)
implementation(projects.data.applemusic)
implementation(projects.data.firebase)
implementation(projects.data.user)
implementation(projects.data.pick)
implementation(projects.data.favorite)
implementation(projects.data.location)
implementation(projects.data.order)
implementation(projects.feature.main)
implementation(projects.feature.userinfo)
implementation(projects.feature.search)
implementation(projects.feature.create)
implementation(projects.feature.favorite)
implementation(projects.feature.mypick)
implementation(projects.feature.detail)
implementation(projects.feature.map)

implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)
implementation(libs.androidx.material.icons.extended)
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.ui.viewbinding)
implementation(libs.androidx.navigation.compose)
implementation(libs.androidx.core.splashscreen)
implementation(libs.androidx.compose.material)
implementation(libs.androidx.animation)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.ui.test.junit4)
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
implementation(libs.kotlinx.immutable)

// Hilt
implementation(libs.hilt.android)
ksp(libs.hilt.android.compiler)
androidTestImplementation(libs.hilt.android.testing)
ksp(libs.hilt.android.compiler)
kspAndroidTest(libs.hilt.android.compiler)
implementation(libs.androidx.hilt.navigation.compose)
implementation(libs.androidx.hilt.navigation.fragment)

// Firebase
implementation(platform(libs.firebase.bom))
implementation(libs.firebase.analytics)
implementation(libs.firebase.auth.ktx)
implementation(libs.google.firebase.dynamic.module.support)
implementation(libs.firebase.crashlytics)

// Map
implementation(libs.map.sdk)
implementation(libs.play.services.location)

// Coil
implementation(libs.coil)
implementation(libs.coil.compose)
implementation(libs.coil.network.okhttp)

// ExoPlayer
implementation(libs.androidx.media3.exoplayer)
implementation(libs.androidx.media3.exoplayer.dash)
implementation(libs.androidx.media3.ui)
implementation(libs.androidx.media3.session)

// Paging
implementation(libs.androidx.paging.runtime)
implementation(libs.androidx.paging.compose.android)

// Serialization
implementation(libs.kotlinx.serialization.json)

// Credentials
implementation(libs.androidx.credentials)
implementation(libs.androidx.credentials.play.services.auth)
implementation(libs.googleid)
}
20 changes: 10 additions & 10 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
tools:targetApi="31">

<service
android:name="com.squirtles.mediaservice.MediaPlayerService"
android:name="com.squirtles.core.mediaservice.MediaPlayerService"
android:foregroundServiceType="mediaPlayback"
android:exported="true">
<intent-filter>
Expand All @@ -35,16 +35,16 @@
android:name="com.naver.maps.map.CLIENT_ID"
android:value="${NAVERMAP_CLIENT_ID}" />

<activity
android:name=".main.MainActivity"
android:exported="true"
android:theme="@style/Theme.MusicRoad.Splash">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<!-- <activity-->
<!-- android:name=".main.MainActivity"-->
<!-- android:exported="true"-->
<!-- android:theme="@style/Theme.MusicRoad.Splash">-->
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
<!-- </activity>-->
</application>

</manifest>

This file was deleted.

This file was deleted.

Loading