Skip to content

Commit

Permalink
[fix] #91 kotlin serialization 디펜던시 코드 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
leeeha committed Aug 1, 2023
1 parent ebd9809 commit a4ecc5d
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 21 deletions.
14 changes: 7 additions & 7 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties

plugins {
id(Plugins.androidApplication)
id(Plugins.kotlinAndroid)
id(Plugins.kotlinParcelize)
id(Plugins.kotlinKapt)
id(Plugins.kotlinSerialization)
id(Plugins.hilt)
id(Plugins.oss)
id(ModulePlugins.androidApplication)
id(ModulePlugins.kotlinAndroid)
id(ModulePlugins.kotlinParcelize)
id(ModulePlugins.kotlinKapt)
id(ModulePlugins.kotlinSerialization)
id(ModulePlugins.hilt)
id(ModulePlugins.oss)
}

android {
Expand Down
7 changes: 4 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,20 @@ buildscript {
dependencies {
classpath(ClassPathPlugins.gradle)
classpath(ClassPathPlugins.kotlinGradlePlugin)
classpath(ClassPathPlugins.kotlinSerialization)
// classpath(ClassPathPlugins.kotlinSerialization)
classpath(ClassPathPlugins.hilt)
classpath(ClassPathPlugins.oss)
}
}

plugins {
id(Plugins.ktlint) version Versions.ktlintVersion
id(ProjectPlugins.ktlint) version Versions.ktlintVersion
id(ProjectPlugins.kotlinSerialization) version Versions.kotlinVersion
}

allprojects {
apply {
plugin(Plugins.ktlint)
plugin(ProjectPlugins.ktlint)
}
}

Expand Down
8 changes: 0 additions & 8 deletions buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,6 @@ object ThirdPartyDependencies {
const val circleImageView = "de.hdodenhof:circleimageview:${Versions.circleImageViewVersion}"
}

object ClassPathPlugins {
const val gradle = "com.android.tools.build:gradle:${Versions.gradleVersion}"
const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlinVersion}"
const val kotlinSerialization = "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlinVersion}"
const val hilt = "com.google.dagger:hilt-android-gradle-plugin:${Versions.hiltVersion}"
const val oss = "com.google.android.gms:oss-licenses-plugin:${Versions.ossPluginVersion}"
}

object FirebaseDependencies {
const val bom = "com.google.firebase:firebase-bom:30.1.0"
const val messaging = "com.google.firebase:firebase-messaging-ktx"
Expand Down
18 changes: 15 additions & 3 deletions buildSrc/src/main/java/Plugins.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
object Plugins {
object ClassPathPlugins {
const val gradle = "com.android.tools.build:gradle:${Versions.gradleVersion}"
const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlinVersion}"
// const val kotlinSerialization = "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlinVersion}"
const val hilt = "com.google.dagger:hilt-android-gradle-plugin:${Versions.hiltVersion}"
const val oss = "com.google.android.gms:oss-licenses-plugin:${Versions.ossPluginVersion}"
}

object ProjectPlugins {
const val ktlint = "org.jlleitschuh.gradle.ktlint"
const val kotlinSerialization = "org.jetbrains.kotlin.plugin.serialization"
}

object ModulePlugins {
const val androidApplication = "com.android.application"
const val kotlinAndroid = "org.jetbrains.kotlin.android"
const val kotlinKapt = "kotlin-kapt"
const val kotlinParcelize = "kotlin-parcelize"
const val kotlinSerialization = "kotlinx-serialization"
const val hilt = "dagger.hilt.android.plugin"
const val oss = "com.google.android.gms.oss-licenses-plugin"
const val ktlint = "org.jlleitschuh.gradle.ktlint"
}
}

0 comments on commit a4ecc5d

Please sign in to comment.