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

Step1: GitHub(모듈 분리) #97

Merged
merged 3 commits into from
Aug 27, 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
10 changes: 6 additions & 4 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

plugins {
id("com.android.application")
id("kotlin-android")
id("kotlin-kapt")
kotlin("android")
kotlin("kapt")
id("org.jlleitschuh.gradle.ktlint") version "11.5.0"
}

android {
Expand All @@ -20,7 +21,7 @@ android {
}

buildTypes {
getByName("release") {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
Expand Down Expand Up @@ -48,9 +49,10 @@ dependencies {
implementation("com.google.android.material:material:1.7.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.fragment:fragment-ktx:1.5.5")
implementation(project(":core:data"))

testImplementation("junit:junit:4.13.2")
testImplementation("com.google.truth:truth:1.1.3")
testImplementation("com.google.truth:truth:1.1.4")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
}

This file was deleted.

4 changes: 2 additions & 2 deletions app/src/main/java/camp/nextstep/edu/github/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package camp.nextstep.edu.github

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity

class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
}
}
}
17 changes: 0 additions & 17 deletions app/src/test/java/camp/nextstep/edu/github/ExampleUnitTest.kt

This file was deleted.

3 changes: 2 additions & 1 deletion buildSrc/src/main/kotlin/Configs.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
object Version {
const val androidGradlePlugin = "7.4.0"
const val kotlin = "1.8.0"
const val kotlin = "1.9.0"
const val compileSdk = 33
const val minSdk = 26
const val targetSdk = 33
const val retrofit = "2.9.0"
}
1 change: 1 addition & 0 deletions core/data/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
21 changes: 21 additions & 0 deletions core/data/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
plugins {
id("kotlin")
id("org.jlleitschuh.gradle.ktlint") version "11.5.0"
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib:${Version.kotlin}")
implementation("com.squareup.retrofit2:retrofit:${Version.retrofit}")
implementation("com.squareup.retrofit2:converter-gson:${Version.retrofit}")
implementation(project(":core:domain"))

testImplementation("junit:junit:4.13.2")
testImplementation("com.google.truth:truth:1.1.4")
testImplementation("com.squareup.okhttp3:mockwebserver:4.11.0")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1")
}
1 change: 1 addition & 0 deletions core/domain/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
15 changes: 15 additions & 0 deletions core/domain/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
plugins {
id("kotlin")
id("org.jlleitschuh.gradle.ktlint") version "11.5.0"
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
dependencies {
implementation("com.google.code.gson:gson:2.10.1")

testImplementation("junit:junit:4.13.2")
testImplementation("com.google.truth:truth:1.1.4")
}
4 changes: 3 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
include(":app")
rootProject.name = "android-github"
include(":app")
include(":core:domain")
include(":core:data")