Skip to content

Commit

Permalink
Merge pull request #6 from eshc123/feature/#1-package-dependency
Browse files Browse the repository at this point in the history
[FEATURE] #1 의존성 추가 수정 및 패키지 구성
  • Loading branch information
eshc123 committed Sep 13, 2022
2 parents 70265a5 + c539302 commit 6eae3dd
Show file tree
Hide file tree
Showing 19 changed files with 77 additions and 99 deletions.
23 changes: 16 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'kotlin-kapt'
id 'dagger.hilt.android.plugin'
}

android {
Expand Down Expand Up @@ -32,12 +34,19 @@ android {
}

dependencies {
implementation(project(":core-ui"))
implementation(project(":data"))
implementation(project(":domain"))
implementation(project(":feature-login"))
implementation(project(":feature-issue"))
implementation(project(":feature-notification"))
implementation(project(":feature-profile"))
implementation(project(":feature-repository"))

implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.5.0'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
implementation Google.HILT_ANDROID
kapt Google.HILT_ANDROID_COMPILER

testImplementation UnitTest.JUNIT
androidTestImplementation AndroidTest.ANDROID_JUNIT
androidTestImplementation AndroidTest.ESPRESSO_CORE
}
4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package="com.eshc.mygithubrepoapp">

<application
android:name=".RepoApplication"
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
Expand All @@ -13,8 +14,9 @@
android:supportsRtl="true"
android:theme="@style/Theme.MyGithubRepoApp"
tools:targetApi="31">

<activity
android:name=".MainActivity"
android:name="com.eshc.feature.login.LoginActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/java/com/eshc/mygithubrepoapp/RepoApplication.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.eshc.mygithubrepoapp

import android.app.Application
import dagger.hilt.android.HiltAndroidApp

@HiltAndroidApp
class RepoApplication : Application() {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.eshc.mygithubrepoapp.di

class DataSourceModule {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.eshc.mygithubrepoapp.di

class NetworkModule {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.eshc.mygithubrepoapp.di

class RepositoryModule {
}
18 changes: 0 additions & 18 deletions app/src/main/res/layout/activity_main.xml

This file was deleted.

16 changes: 0 additions & 16 deletions app/src/main/res/values-night/themes.xml

This file was deleted.

10 changes: 0 additions & 10 deletions app/src/main/res/values/colors.xml

This file was deleted.

3 changes: 0 additions & 3 deletions app/src/main/res/values/strings.xml

This file was deleted.

16 changes: 0 additions & 16 deletions app/src/main/res/values/themes.xml

This file was deleted.

5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
buildscript {
dependencies {
classpath("com.google.dagger:hilt-android-gradle-plugin:2.42")
}
}
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '7.2.1' apply false
Expand Down
7 changes: 3 additions & 4 deletions core-ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ android {

dependencies {

implementation 'com.android.support:appcompat-v7:28.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
testImplementation UnitTest.JUNIT
androidTestImplementation AndroidTest.ANDROID_JUNIT
androidTestImplementation AndroidTest.ESPRESSO_CORE
}
8 changes: 4 additions & 4 deletions data/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ android {

dependencies {

implementation 'com.android.support:appcompat-v7:28.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

testImplementation UnitTest.JUNIT
androidTestImplementation AndroidTest.ANDROID_JUNIT
androidTestImplementation AndroidTest.ESPRESSO_CORE
}
8 changes: 4 additions & 4 deletions feature-issue/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ android {

dependencies {

implementation 'com.android.support:appcompat-v7:28.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

testImplementation UnitTest.JUNIT
androidTestImplementation AndroidTest.ANDROID_JUNIT
androidTestImplementation AndroidTest.ESPRESSO_CORE
}
14 changes: 10 additions & 4 deletions feature-login/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,18 @@ android {
kotlinOptions {
jvmTarget = '1.8'
}
buildFeatures {
dataBinding = true
}
}

dependencies {

implementation 'com.android.support:appcompat-v7:28.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation AndroidX.CONSTRAINT

implementation Google.MATERIAL

testImplementation UnitTest.JUNIT
androidTestImplementation AndroidTest.ANDROID_JUNIT
androidTestImplementation AndroidTest.ESPRESSO_CORE
}
8 changes: 4 additions & 4 deletions feature-notification/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ android {

dependencies {

implementation 'com.android.support:appcompat-v7:28.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

testImplementation UnitTest.JUNIT
androidTestImplementation AndroidTest.ANDROID_JUNIT
androidTestImplementation AndroidTest.ESPRESSO_CORE
}
8 changes: 4 additions & 4 deletions feature-profile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ android {

dependencies {

implementation 'com.android.support:appcompat-v7:28.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

testImplementation UnitTest.JUNIT
androidTestImplementation AndroidTest.ANDROID_JUNIT
androidTestImplementation AndroidTest.ESPRESSO_CORE
}
8 changes: 4 additions & 4 deletions feature-repository/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ android {

dependencies {

implementation 'com.android.support:appcompat-v7:28.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

testImplementation UnitTest.JUNIT
androidTestImplementation AndroidTest.ANDROID_JUNIT
androidTestImplementation AndroidTest.ESPRESSO_CORE
}

0 comments on commit 6eae3dd

Please sign in to comment.