Skip to content

Commit

Permalink
Merge pull request #48 from AdultOfNineteen/chore/issue-47
Browse files Browse the repository at this point in the history
[Chore] 버전 카탈로그
  • Loading branch information
DongChyeon authored Feb 17, 2024
2 parents ea3fd5a + 9bbf5c3 commit 715448e
Show file tree
Hide file tree
Showing 29 changed files with 312 additions and 493 deletions.
79 changes: 31 additions & 48 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import java.util.Properties

@Suppress("DSL_SCOPE_VIOLATION")
plugins {
with(Plugins) {
id(ANDROID_APPLICATION)
id(JETBRAINS_KOTLIN_ANDROID)
id(DAGGER_HILT_ANDROID)
id(KOTLIN_KAPT)
id(GOOGLE_SERVICES)
id(FIREBASE_CRASHLYTICS)
}
id(libs.plugins.android.application.get().pluginId)
id(libs.plugins.jetbrains.kotlin.android.get().pluginId)
id(libs.plugins.dagger.hilt.android.get().pluginId)
id(libs.plugins.kotlin.kapt.get().pluginId)
id(libs.plugins.google.services.get().pluginId)
id(libs.plugins.firebase.crashlytics.get().pluginId)
}

val properties = Properties().apply {
Expand Down Expand Up @@ -102,44 +101,28 @@ dependencies {
implementation(project(":feature:map"))
implementation(project(":feature:note"))
implementation(project(":feature:mypage"))
implementation("com.kakao.sdk:v2-user:2.15.0") // 카카오 로그인
implementation("com.google.android.gms:play-services-auth:20.6.0")
implementation("io.github.fornewid:naver-map-compose:1.3.3")

with(Dependency) {
implementation(ANDROID_CORE_KTX)
implementation(APPCOMPAT)
implementation(ACTIVITY_COMPOSE)
implementation(NAVIGATION_COMPOSE)
implementation(COMPOSE_BOM)
implementation(COMPOSE_MATERIAL)
implementation(COMPOSE_MATERIAL3)
implementation(COMPOSE_UI)
implementation(LIFECYCLE_RUNTIME_KTX)
implementation(LIFECYCLE_RUNTIME_COMPOSE)
implementation(COROUTINES_ANDROID)
implementation(KOTLIN_BOM)
implementation(COMPOSE_BOM)

implementation(platform(FIREBASE_BOM))
implementation(FIREBASE_ANALYTICS)
implementation(FIREBASE_CRASHLYTICS)
implementation(FIREBASE_MESSAGING)

implementation(HILT_NAVIGATION_COMPOSE)
implementation(HILT_ANDROID)
implementation(DAGGER)
implementation(DATASTORE)
kapt(DAGGER_COMPILER)
kapt(HILT_ANDROID_COMPILER)
androidTestImplementation(COMPOSE_UI_TEST_JUNIT4)
androidTestImplementation(TEST_EXT_JUNIT)
androidTestImplementation(TEST_ESPRESSO_CORE)
androidTestImplementation(COMPOSE_BOM)

testImplementation(JUNIT)

debugImplementation(COMPOSE_UI_TOOLING)
debugImplementation(COMPOSE_UI_TEST_MANIFEST)
}

implementation(libs.android.core.ktx)
implementation(libs.appcompat)
implementation(libs.activity.compose)
implementation(libs.navigation.compose)
implementation(libs.bundles.compose.ui)
implementation(libs.lifecycle.runtime.ktx)
implementation(libs.lifecycle.runtime.compose)
implementation(libs.coroutines.android)
implementation(libs.kotlin.bom)

implementation(libs.kakao.sdk.user)
implementation(libs.play.services.auth)
implementation(libs.naver.map.compose)

implementation(platform(libs.firebase.bom))
implementation(libs.firebase.analytics)
implementation(libs.firebase.crashlytics)
implementation(libs.firebase.messaing)

implementation(libs.bundles.hilt.navigation)
implementation(libs.dagger)
implementation(libs.datastore)
kapt(libs.hilt.android.compiler)
}
26 changes: 14 additions & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

buildscript {
dependencies {
classpath(Dependency.HILT_ANDROID_GRADLE_PLUGIN)
classpath(Dependency.KOTLIN_GRADLE_PLUGIN)
classpath(Dependency.TOOLS_BUILD_GRADLE_PULGIN)
classpath(libs.hilt.android.gradle.plugin)
classpath(libs.kotlin.gradle.plugin)
classpath(libs.tools.build.gradle.plugin)
}
}

// 모든 하위 프로젝트/모듈에 공통적인 구성 옵션을 추가하는 최상위 빌드
plugins {
with(Plugins) {
id(ANDROID_APPLICATION) version Versions.AGP apply false
id(ANDROID_LIBRARY) version Versions.AGP apply false
id(JETBRAINS_KOTLIN_ANDROID) version Versions.KOTLIN apply false
id(DAGGER_HILT_PLUGIN) version Versions.HILT apply false
id(GOOGLE_SERVICES) version Versions.GOOGLE_SERVICES apply false
id(FIREBASE_CRASHLYTICS) version Versions.FIREBASE_CRASHLYTICS apply false
}
}
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.jetbrains.kotlin.android) apply false
alias(libs.plugins.dagger.hilt.android) apply false
alias(libs.plugins.google.services) apply false
alias(libs.plugins.firebase.crashlytics) apply false
}

7 changes: 0 additions & 7 deletions buildSrc/build.gradle.kts

This file was deleted.

58 changes: 0 additions & 58 deletions buildSrc/src/main/java/Dependency.kt

This file was deleted.

10 changes: 0 additions & 10 deletions buildSrc/src/main/java/Plugins.kt

This file was deleted.

32 changes: 0 additions & 32 deletions buildSrc/src/main/java/Versions.kt

This file was deleted.

30 changes: 12 additions & 18 deletions core/common/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import java.util.Properties

@Suppress("DSL_SCOPE_VIOLATION")
plugins {
with(Plugins) {
id(ANDROID_LIBRARY)
id(JETBRAINS_KOTLIN_ANDROID)
}
id(libs.plugins.android.library.get().pluginId)
id(libs.plugins.jetbrains.kotlin.android.get().pluginId)
}

val properties = Properties().apply {
Expand Down Expand Up @@ -54,18 +53,13 @@ android {
dependencies {
implementation(project(":core:design"))

implementation("io.github.fornewid:naver-map-compose:1.3.3")
with(Dependency) {
implementation(ANDROID_CORE_KTX)
implementation(COMPOSE_UI)
implementation(NAVIGATION_COMPOSE)
implementation(COMPOSE_MATERIAL)
implementation(COROUTINES_ANDROID)
implementation(LIFECYCLE_RUNTIME_VIEWMODEL)
implementation(CONVERTER_GSON)
implementation(DATASTORE)
testImplementation(JUNIT)
androidTestImplementation(TEST_EXT_JUNIT)
androidTestImplementation(TEST_ESPRESSO_CORE)
}
implementation(libs.naver.map.compose)
implementation(libs.android.core.ktx)
implementation(libs.compose.ui)
implementation(libs.navigation.compose)
implementation(libs.compose.material)
implementation(libs.coroutines.android)
implementation(libs.lifecycle.runtime.viewmodel)
implementation(libs.converter.gson)
implementation(libs.datastore)
}
28 changes: 9 additions & 19 deletions core/design/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@Suppress("DSL_SCOPE_VIOLATION")
plugins {
with(Plugins) {
id(ANDROID_LIBRARY)
id(JETBRAINS_KOTLIN_ANDROID)
}
id(libs.plugins.android.library.get().pluginId)
id(libs.plugins.jetbrains.kotlin.android.get().pluginId)
}

android {
Expand Down Expand Up @@ -43,19 +42,10 @@ android {
}

dependencies {
with(Dependency) {
implementation(COMPOSE_GLIDE)
implementation(ANDROID_CORE_KTX)
implementation(ACTIVITY_COMPOSE)
implementation(LIFECYCLE_RUNTIME_VIEWMODEL_COMPOSE)
implementation(COMPOSE_MATERIAL3)
implementation(COMPOSE_MATERIAL)
implementation(COMPOSE_UI)
implementation(COMPOSE_UI_TOOLING)
implementation(COMPOSE_UI_PREVIEW)
}

implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
implementation(libs.android.core.ktx)
implementation(libs.activity.compose)
implementation(libs.lifecycle.runtime.viewmodel.compose)
implementation(libs.compose.coil)
implementation(libs.bundles.compose.ui)
implementation(platform(libs.kotlin.bom))
}
Loading

0 comments on commit 715448e

Please sign in to comment.